RxFPC:fix unneeded typecastings - ID0031435

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5769 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2017-02-27 05:44:48 +00:00
parent 79a60e0bfb
commit eeb56984c3
2 changed files with 54 additions and 45 deletions

View File

@ -55,7 +55,7 @@
<MinVersion Major="1" Release="18" Build="56" Valid="True"/>
</Item5>
</RequiredPackages>
<Units Count="54">
<Units Count="55">
<Unit0>
<Filename Value="RxDBGridDemo.lpr"/>
<IsPartOfProject Value="True"/>
@ -70,9 +70,8 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="RxDBGridMainUnit"/>
<IsVisibleTab Value="True"/>
<TopLine Value="78"/>
<CursorPos X="15" Y="94"/>
<CursorPos X="138" Y="89"/>
<UsageCount Value="119"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
@ -409,8 +408,8 @@
<Unit48>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<EditorIndex Value="1"/>
<TopLine Value="2588"/>
<CursorPos X="38" Y="2591"/>
<TopLine Value="946"/>
<CursorPos X="44" Y="974"/>
<UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit48>
@ -440,7 +439,7 @@
<Unit52>
<Filename Value="../../../../lcl/dbgrids.pas"/>
<UnitName Value="DBGrids"/>
<EditorIndex Value="2"/>
<EditorIndex Value="3"/>
<TopLine Value="458"/>
<CursorPos X="37" Y="473"/>
<UsageCount Value="11"/>
@ -453,126 +452,134 @@
<CursorPos X="14" Y="1822"/>
<UsageCount Value="10"/>
</Unit53>
<Unit54>
<Filename Value="../../rxdb/rxdbgrid_findunit.pas"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="2"/>
<TopLine Value="157"/>
<CursorPos X="20" Y="186"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit54>
</Units>
<JumpHistory Count="30" HistoryIndex="28">
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="105" Column="28" TopLine="89"/>
<Caret Line="207" Column="19" TopLine="185"/>
</Position1>
<Position2>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="207" Column="19" TopLine="185"/>
<Caret Line="199" Column="10" TopLine="185"/>
</Position2>
<Position3>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="199" Column="10" TopLine="185"/>
<Caret Line="1031" Column="15" TopLine="1020"/>
</Position3>
<Position4>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="1031" Column="15" TopLine="1020"/>
<Caret Line="4930" Column="19" TopLine="4930"/>
</Position4>
<Position5>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="4930" Column="19" TopLine="4930"/>
<Caret Line="5000" Column="5" TopLine="4988"/>
</Position5>
<Position6>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="5000" Column="5" TopLine="4988"/>
<Caret Line="1030" Column="3" TopLine="1012"/>
</Position6>
<Position7>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="1030" Column="3" TopLine="1012"/>
<Caret Line="5000" Column="5" TopLine="4976"/>
</Position7>
<Position8>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="5000" Column="5" TopLine="4976"/>
<Caret Line="4943" Column="3" TopLine="4933"/>
</Position8>
<Position9>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="4943" Column="3" TopLine="4933"/>
<Caret Line="5002" Column="10" TopLine="4985"/>
</Position9>
<Position10>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="5002" Column="10" TopLine="4985"/>
<Caret Line="5019" Column="21" TopLine="5001"/>
</Position10>
<Position11>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="5019" Column="21" TopLine="5001"/>
<Caret Line="5021" Column="12" TopLine="5003"/>
</Position11>
<Position12>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="5021" Column="12" TopLine="5003"/>
<Caret Line="5088" Column="18" TopLine="5068"/>
</Position12>
<Position13>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="5088" Column="18" TopLine="5068"/>
<Caret Line="5089" Column="30" TopLine="5068"/>
</Position13>
<Position14>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="5089" Column="30" TopLine="5068"/>
<Caret Line="4968" Column="43" TopLine="4956"/>
</Position14>
<Position15>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="4968" Column="43" TopLine="4956"/>
<Caret Line="625" Column="17" TopLine="607"/>
</Position15>
<Position16>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="625" Column="17" TopLine="607"/>
<Caret Line="2459" Column="42" TopLine="2431"/>
</Position16>
<Position17>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="2459" Column="42" TopLine="2431"/>
<Caret Line="2465" Column="15" TopLine="2437"/>
</Position17>
<Position18>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="2465" Column="15" TopLine="2437"/>
</Position18>
<Position19>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="639" Column="3" TopLine="630"/>
</Position19>
<Position20>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="639" Column="3" TopLine="630"/>
<Caret Line="2505" Column="40" TopLine="2502"/>
</Position20>
<Position21>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="2505" Column="40" TopLine="2502"/>
</Position21>
<Position22>
<Filename Value="../../../../lcl/dbgrids.pas"/>
<Caret Line="473" Column="14" TopLine="456"/>
</Position21>
<Position22>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="2505" Column="40" TopLine="2502"/>
</Position22>
<Position23>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="2505" Column="40" TopLine="2502"/>
<Caret Line="639" Column="24" TopLine="624"/>
</Position23>
<Position24>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="639" Column="24" TopLine="624"/>
<Caret Line="820" Column="55" TopLine="792"/>
</Position24>
<Position25>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="820" Column="55" TopLine="792"/>
<Caret Line="650" Column="15" TopLine="634"/>
</Position25>
<Position26>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="650" Column="15" TopLine="634"/>
<Filename Value="../../../../lcl/dbgrids.pas"/>
<Caret Line="473" Column="14" TopLine="456"/>
</Position26>
<Position27>
<Filename Value="../../../../lcl/dbgrids.pas"/>
<Caret Line="473" Column="14" TopLine="456"/>
<Caret Line="339" Column="15" TopLine="323"/>
</Position27>
<Position28>
<Filename Value="../../../../lcl/dbgrids.pas"/>
<Caret Line="339" Column="15" TopLine="323"/>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="2591" Column="38" TopLine="2588"/>
</Position28>
<Position29>
<Filename Value="../../rxdb/rxdbgrid.pas"/>
<Caret Line="2591" Column="24" TopLine="2588"/>
</Position29>
<Position30>
<Filename Value="../../../../lcl/dbgrids.pas"/>
<Caret Line="473" Column="37" TopLine="458"/>
<Filename Value="../../rxdb/rxdbgrid_findunit.pas"/>
<Caret Line="165" Column="2" TopLine="139"/>
</Position30>
</JumpHistory>
</ProjectOptions>

View File

@ -158,11 +158,11 @@ begin
end;
end;
end;
{
type
THckGrid = class(TCustomDBGrid)
end;
}
procedure TrxDBGridFindForm.SetGrid(AGrid: TRxDBGrid);
var
i:integer;
@ -182,8 +182,10 @@ begin
end;
FDataSet:=nil;
if Assigned(FGrid) and Assigned(THckGrid(FGrid).DataSource) then
FDataSet:=THckGrid(FGrid).DataSource.DataSet;
if Assigned(FGrid) and Assigned(FGrid.DataSource) then
FDataSet:=FGrid.DataSource.DataSet;
{ if Assigned(FGrid) and Assigned(THckGrid(FGrid).DataSource) then
FDataSet:=THckGrid(FGrid).DataSource.DataSet;}
BtnFind.Enabled:=Assigned(FDataSet) and FDataSet.Active
end;