pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Remove redundant casts, PtrInt -> Integer, IInterface in classes definitions (Thanks Juha) 1

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3892 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2015-01-19 09:34:01 +00:00
parent 8b22dded32
commit b5cd38509b
12 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wst/trunk/type_lib_edtr/ufclassedit.pas
View File

@ -349,7 +349,7 @@ end;
procedure TfClassEdit.PrepareParentCombo(); procedure TfClassEdit.PrepareParentCombo();
var var
i : PtrInt; i : Integer;
begin begin
edtParent.Items.BeginUpdate(); edtParent.Items.BeginUpdate();
try try

2
wst/trunk/type_lib_edtr/ufpropedit.pas
View File

@ -132,7 +132,7 @@ end;
procedure TfPropEdit.LoadFromObject(); procedure TfPropEdit.LoadFromObject();
var var
i : PtrInt; i : Integer;
ls : TStrings; ls : TStrings;
begin begin
edtName.Text := ''; edtName.Text := '';

2
wst/trunk/type_lib_edtr/uwsttypelibraryedit.pas
View File

@ -204,7 +204,7 @@ type
procedure trvSchemaSelectionChanged(Sender : TObject); procedure trvSchemaSelectionChanged(Sender : TObject);
private private
FSymbolTable : TwstPasTreeContainer; FSymbolTable : TwstPasTreeContainer;
FStatusMessageTag : PtrInt; FStatusMessageTag : Integer;
FCurrentFileName : string; FCurrentFileName : string;
{$IFDEF WST_IDE} {$IFDEF WST_IDE}
FProjectLibrary : TLazProjectFile; FProjectLibrary : TLazProjectFile;

10
wst/trunk/type_lib_edtr/view_helper.pas
View File

@ -171,7 +171,7 @@ procedure DrawDependencies(
function FindNode(AType : TPasType) : TTreeNode; function FindNode(AType : TPasType) : TTreeNode;
var var
k : PtrInt; k : Integer;
nl : TTreeNodes; nl : TTreeNodes;
begin begin
Result := nil; Result := nil;
@ -184,7 +184,7 @@ procedure DrawDependencies(
end; end;
var var
i : PtrInt; i : Integer;
e : TDependendyInfo; e : TDependendyInfo;
n : TTreeNode; n : TTreeNode;
s : string; s : string;
@ -257,7 +257,7 @@ var
procedure ScanClassType(AItem : TPasClassType); procedure ScanClassType(AItem : TPasClassType);
var var
k : PtrInt; k : Integer;
pl : TList2; pl : TList2;
m : TPasElement; m : TPasElement;
p : TPasProperty; p : TPasProperty;
@ -288,7 +288,7 @@ var
procedure ScanRecordType(AItem : TPasRecordType); procedure ScanRecordType(AItem : TPasRecordType);
var var
k : PtrInt; k : Integer;
pl : TList2; pl : TList2;
m : TPasElement; m : TPasElement;
p : TPasVariable; p : TPasVariable;
@ -312,7 +312,7 @@ var
end; end;
var var
i, c : PtrInt; i, c : Integer;
list : TList2; list : TList2;
e : TPasType; e : TPasType;
begin begin

26
wst/trunk/ws_helper/generator.pas
View File

@ -233,7 +233,7 @@ function DeduceEasyInterfaceForDocStyle(
locProcType : TPasProcedureType; locProcType : TPasProcedureType;
locElt : TPasElement; locElt : TPasElement;
locRawInParam, locRawOutParam : TPasClassType; locRawInParam, locRawOutParam : TPasClassType;
k, q : PtrInt; k, q : Integer;
locProp, locResProp : TPasProperty; locProp, locResProp : TPasProperty;
locArg : TPasArgument; locArg : TPasArgument;
locIsFunction : Boolean; locIsFunction : Boolean;
@ -305,7 +305,7 @@ function DeduceEasyInterfaceForDocStyle(
var var
locRes : TPasClassType; locRes : TPasClassType;
i, c : PtrInt; i, c : Integer;
g : TGuid; g : TGuid;
e : TPasElement; e : TPasElement;
procCount : Integer; procCount : Integer;
@ -691,7 +691,7 @@ Var
function HasObjectsArgs() : Boolean; function HasObjectsArgs() : Boolean;
var var
k : PtrInt; k : Integer;
prm : TPasArgument; prm : TPasArgument;
elt : TPasElement; elt : TPasElement;
begin begin
@ -713,7 +713,7 @@ Var
procedure AssignArguments(); procedure AssignArguments();
var var
k : PtrInt; k : Integer;
prm : TPasArgument; prm : TPasArgument;
elt : TPasElement; elt : TPasElement;
begin begin
@ -746,7 +746,7 @@ Var
procedure ClearArguments(); procedure ClearArguments();
var var
k : PtrInt; k : Integer;
prm : TPasArgument; prm : TPasArgument;
elt : TPasElement; elt : TPasElement;
begin begin
@ -1890,7 +1890,7 @@ procedure TInftGenerator.WriteDocumentation(AElement : TPasElement);
var var
pl : TStrings; pl : TStrings;
docString : string; docString : string;
i : PtrInt; i : Integer;
begin begin
pl := FSymbolTable.Properties.FindList(AElement); pl := FSymbolTable.Properties.FindList(AElement);
if ( pl <> nil ) then begin if ( pl <> nil ) then begin
@ -2747,7 +2747,7 @@ var
procedure WriteDec(); procedure WriteDec();
var var
itm : TPasVariable; itm : TPasVariable;
i : PtrInt; i : Integer;
begin begin
SetCurrentStream(FDecStream); SetCurrentStream(FDecStream);
NewLine(); NewLine();
@ -2773,7 +2773,7 @@ var
procedure WriteRTTI(); procedure WriteRTTI();
var var
itm : TPasVariable; itm : TPasVariable;
k, c : PtrInt; k, c : Integer;
offsetLine, typeLine : string; offsetLine, typeLine : string;
begin begin
SetCurrentStream(FRttiFunc); SetCurrentStream(FRttiFunc);
@ -2821,7 +2821,7 @@ var
procedure WriteAttributeProperties(); procedure WriteAttributeProperties();
var var
itm : TPasVariable; itm : TPasVariable;
k, c : PtrInt; k, c : Integer;
begin begin
c := ASymbol.Members.Count; c := ASymbol.Members.Count;
for k := 0 to Pred(c) do begin for k := 0 to Pred(c) do begin
@ -2974,7 +2974,7 @@ procedure TInftGenerator.InternalExecute();
procedure SortRecords(AList : TList2); procedure SortRecords(AList : TList2);
var var
j, k : PtrInt; j, k : Integer;
ordr_ls, mbrLs, locLs : TList2; ordr_ls, mbrLs, locLs : TList2;
locMemberType : TPasType; locMemberType : TPasType;
rec, locRec : TPasRecordType; rec, locRec : TPasRecordType;
@ -3066,7 +3066,7 @@ procedure TInftGenerator.InternalExecute();
end; end;
var var
i,c, j, k : PtrInt; i, c, j, k : Integer;
clssTyp : TPasClassType; clssTyp : TPasClassType;
gnrClssLst : TObjectList; gnrClssLst : TObjectList;
objLst : TObjectList; objLst : TObjectList;
@ -3074,7 +3074,7 @@ var
elt : TPasElement; elt : TPasElement;
classAncestor : TPasElement; classAncestor : TPasElement;
tmpList : TList2; tmpList : TList2;
intfCount : PtrInt; intfCount : Integer;
locBinding : TwstBinding; locBinding : TwstBinding;
begin begin
intfCount := 0; intfCount := 0;
@ -3261,7 +3261,7 @@ end;
procedure TInftGenerator.Execute(); procedure TInftGenerator.Execute();
var var
oldCurrent, mdl : TPasModule; oldCurrent, mdl : TPasModule;
i : PtrInt; i : Integer;
mdlList : TList2; mdlList : TList2;
oldCS : Boolean; oldCS : Boolean;
oldNamesKinds : TElementNameKinds; oldNamesKinds : TElementNameKinds;

4
wst/trunk/ws_helper/parserutils.pas
View File

@ -434,7 +434,7 @@ end;
function AddNameSpace(const AValue: string; ANameSpaceList : TStrings): TStrings; function AddNameSpace(const AValue: string; ANameSpaceList : TStrings): TStrings;
var var
i : PtrInt; i : Integer;
s : string; s : string;
ls : TStringList; ls : TStringList;
begin begin
@ -487,7 +487,7 @@ end;
function TQualifiedNameObjectFilter.Evaluate(const AObject: TObject): Boolean; function TQualifiedNameObjectFilter.Evaluate(const AObject: TObject): Boolean;
var var
locObj : TDOMNodeRttiExposer; locObj : TDOMNodeRttiExposer;
startPos, i : PtrInt; startPos, i : Integer;
shortNameSpace : string; shortNameSpace : string;
locContinue : Boolean; locContinue : Boolean;
tmpNode : TDOMNode; tmpNode : TDOMNode;

6
wst/trunk/ws_helper/pascal_parser_intf.pas
View File

@ -1065,7 +1065,7 @@ procedure TwstPasTreeContainer.FreeProperties(AObject: TPasElement);
procedure FreeClassProps(AObj : TPasClassType); procedure FreeClassProps(AObj : TPasClassType);
var var
ls : TList2; ls : TList2;
k : PtrInt; k : Integer;
begin begin
ls := AObj.Members; ls := AObj.Members;
for k := 0 to Pred(ls.Count) do begin for k := 0 to Pred(ls.Count) do begin
@ -1076,7 +1076,7 @@ procedure TwstPasTreeContainer.FreeProperties(AObject: TPasElement);
procedure FreeRecordFields(AObj : TPasRecordType); procedure FreeRecordFields(AObj : TPasRecordType);
var var
ls : TList2; ls : TList2;
k : PtrInt; k : Integer;
begin begin
ls := AObj.Members; ls := AObj.Members;
for k := 0 to Pred(ls.Count) do begin for k := 0 to Pred(ls.Count) do begin
@ -1234,7 +1234,7 @@ end;
procedure TPropertyHolder.FreeList(AObject: TObject); procedure TPropertyHolder.FreeList(AObject: TObject);
var var
i : PtrInt; i : Integer;
begin begin
i := FObjects.IndexOf(AObject); i := FObjects.IndexOf(AObject);
if ( i >= 0 ) then begin if ( i >= 0 ) then begin

20
wst/trunk/ws_helper/ws_parser_imp.pas
View File

@ -103,9 +103,9 @@ type
constructor Create(); constructor Create();
destructor Destroy();override; destructor Destroy();override;
function Add(AProp : TPasProperty) : TPropInfoReference; function Add(AProp : TPasProperty) : TPropInfoReference;
function GetItem(const AIndex : PtrInt) : TPropInfoReference;{$IFDEF USE_INLINE}inline;{$ENDIF} function GetItem(const AIndex : Integer) : TPropInfoReference;{$IFDEF USE_INLINE}inline;{$ENDIF}
function IndexOf(const AProp : TPasProperty) : PtrInt; function IndexOf(const AProp : TPasProperty) : Integer;
function GetCount() : PtrInt;{$IFDEF USE_INLINE}inline;{$ENDIF} function GetCount() : Integer;{$IFDEF USE_INLINE}inline;{$ENDIF}
end; end;
{ TComplexTypeParser } { TComplexTypeParser }
@ -379,7 +379,7 @@ var
tmpCursor : IObjectCursor; tmpCursor : IObjectCursor;
props : TStrings; props : TStrings;
docString : string; docString : string;
i : PtrInt; i : Integer;
tempNode : TDOMNode; tempNode : TDOMNode;
begin begin
if FTypeNode.HasChildNodes() then begin if FTypeNode.HasChildNodes() then begin
@ -546,7 +546,7 @@ procedure TComplexTypeParser.ExtractExtendedMetadata(
var var
ls : TDOMNamedNodeMap; ls : TDOMNamedNodeMap;
e : TDOMNode; e : TDOMNode;
k, q : PtrInt; k, q : Integer;
ns_short, ns_long, localName, locBuffer, locBufferNS, locBufferNS_long, locBufferLocalName : string; ns_short, ns_long, localName, locBuffer, locBufferNS, locBufferNS_long, locBufferLocalName : string;
begin begin
if ( ANode.Attributes <> nil ) and ( GetNodeListCount(ANode.Attributes) > 0 ) then begin if ( ANode.Attributes <> nil ) and ( GetNodeListCount(ANode.Attributes) > 0 ) then begin
@ -1899,7 +1899,7 @@ end;
function TPropInfoReferenceList.Add(AProp : TPasProperty) : TPropInfoReference; function TPropInfoReferenceList.Add(AProp : TPasProperty) : TPropInfoReference;
var var
i : PtrInt; i : Integer;
begin begin
i := IndexOf(AProp); i := IndexOf(AProp);
if ( i = -1 ) then begin if ( i = -1 ) then begin
@ -1911,14 +1911,14 @@ begin
end; end;
end; end;
function TPropInfoReferenceList.GetItem(const AIndex : PtrInt) : TPropInfoReference; function TPropInfoReferenceList.GetItem(const AIndex: Integer): TPropInfoReference;
begin begin
Result := TPropInfoReference(FList[AIndex]); Result := TPropInfoReference(FList[AIndex]);
end; end;
function TPropInfoReferenceList.IndexOf(const AProp : TPasProperty) : PtrInt; function TPropInfoReferenceList.IndexOf(const AProp: TPasProperty): Integer;
var var
i : PtrInt; i : Integer;
begin begin
Result := -1; Result := -1;
for i := 0 to Pred(FList.Count) do begin for i := 0 to Pred(FList.Count) do begin
@ -1929,7 +1929,7 @@ begin
end; end;
end; end;
function TPropInfoReferenceList.GetCount() : PtrInt; function TPropInfoReferenceList.GetCount: Integer;
begin begin
Result := FList.Count; Result := FList.Count;
end; end;

4
wst/trunk/ws_helper/wsdl_generator.pas
View File

@ -154,7 +154,7 @@ procedure TWsdlGenerator.GenerateTypes(
AModule : TPasModule AModule : TPasModule
); );
var var
i, c : PtrInt; i, c : Integer;
mdl : TPasModule; mdl : TPasModule;
mdlLs : TList2; mdlLs : TList2;
g : IGenerator; g : IGenerator;
@ -505,7 +505,7 @@ procedure TWsdlGenerator.Execute(ASymTable : TwstPasTreeContainer; AModuleName :
var var
locMainModule : TPasModule; locMainModule : TPasModule;
decList : TList2; decList : TList2;
j, c : PtrInt; j, c : Integer;
sym : TPasElement; sym : TPasElement;
ps : TPasClassType; ps : TPasClassType;
bndg : TwstBinding; bndg : TwstBinding;

22
wst/trunk/ws_helper/wsdl_parser.pas
View File

@ -137,7 +137,7 @@ end;
function TWsdlParser.AddNameSpace(const AValue: string): TStrings; function TWsdlParser.AddNameSpace(const AValue: string): TStrings;
var var
i : PtrInt; i : Integer;
s : string; s : string;
ls : TStringList; ls : TStringList;
begin begin
@ -197,7 +197,7 @@ destructor TWsdlParser.Destroy();
procedure FreeList(AList : TStrings); procedure FreeList(AList : TStrings);
var var
j : PtrInt; j : Integer;
begin begin
if Assigned(AList) and (AList.Count > 0) then begin if Assigned(AList) and (AList.Count > 0) then begin
for j := Pred(AList.Count) downto 0 do begin for j := Pred(AList.Count) downto 0 do begin
@ -262,7 +262,7 @@ end;
function TWsdlParser.FindNameSpace(const AShortName: string; out AResult: string): Boolean; function TWsdlParser.FindNameSpace(const AShortName: string; out AResult: string): Boolean;
var var
i : PtrInt; i : Integer;
ls : TStrings; ls : TStrings;
begin begin
AResult := ''; AResult := '';
@ -279,7 +279,7 @@ end;
function TWsdlParser.FindShortNamesForNameSpace(const ANameSpace: string): TStrings; function TWsdlParser.FindShortNamesForNameSpace(const ANameSpace: string): TStrings;
var var
i : PtrInt; i : Integer;
begin begin
i := FNameSpaceList.IndexOf(ANameSpace); i := FNameSpaceList.IndexOf(ANameSpace);
if ( i >= 0 ) then if ( i >= 0 ) then
@ -434,7 +434,7 @@ procedure TWsdlParser.Execute(const AMode: TParserMode; const AModuleName: strin
procedure FixUsesList(); procedure FixUsesList();
var var
locPrs : IParserContext; locPrs : IParserContext;
k : PtrInt; k : Integer;
locModule : TPasModule; locModule : TPasModule;
locIntfUsesList : TList2; locIntfUsesList : TList2;
begin begin
@ -720,10 +720,10 @@ function TWsdlParser.ParseOperation(
procedure ParseOutputMessage(); procedure ParseOutputMessage();
function FindIndexOfResultArg(AArgList : TList2) : PtrInt; function FindIndexOfResultArg(AArgList : TList2) : Integer;
const RESULT_ARG_NAMES : array[0..5] of string = ( 'result', 'return', '_result', 'result_', '_return', 'return_' ); const RESULT_ARG_NAMES : array[0..5] of string = ( 'result', 'return', '_result', 'result_', '_return', 'return_' );
var var
p, q : PtrInt; p, q : Integer;
idx_found : Boolean; idx_found : Boolean;
resItemName : string; resItemName : string;
arg : TPasArgument; arg : TPasArgument;
@ -759,9 +759,9 @@ function TWsdlParser.ParseOperation(
locProcType : TPasProcedureType; locProcType : TPasProcedureType;
locFunc : TPasFunction; locFunc : TPasFunction;
locFuncType : TPasFunctionType; locFuncType : TPasFunctionType;
j : PtrInt; j : Integer;
arg_a, arg_b : TPasArgument; arg_a, arg_b : TPasArgument;
resArgIndex : PtrInt; resArgIndex : Integer;
prmNameColisionWithInputParam : Boolean; prmNameColisionWithInputParam : Boolean;
prmTypeEntity : TPasType; prmTypeEntity : TPasType;
begin begin
@ -1333,7 +1333,7 @@ end;
procedure TWsdlParser.ParseTypes(); procedure TWsdlParser.ParseTypes();
var var
locPrs : IXsdPaser; locPrs : IXsdPaser;
i : PtrInt; i : Integer;
begin begin
for i := 0 to Pred(FXsdParsers.Count) do begin for i := 0 to Pred(FXsdParsers.Count) do begin
locPrs := (FXsdParsers.Objects[i] as TIntfObjectRef).Intf as IXsdPaser; locPrs := (FXsdParsers.Objects[i] as TIntfObjectRef).Intf as IXsdPaser;
@ -1468,7 +1468,7 @@ end;
function TWsdlParser.GetParser(const ANamespace: string): IXsdPaser; function TWsdlParser.GetParser(const ANamespace: string): IXsdPaser;
var var
i : PtrInt; i : Integer;
p, p1 : IXsdPaser; p, p1 : IXsdPaser;
begin begin
Result := nil; Result := nil;

10
wst/trunk/ws_helper/xsd_generator.pas
View File

@ -618,7 +618,7 @@ const
{$ENDIF WST_UNICODESTRING} {$ENDIF WST_UNICODESTRING}
); );
var var
i : PtrInt; i : Integer;
locName : string; locName : string;
begin begin
AHelper := nil; AHelper := nil;
@ -757,7 +757,7 @@ var
trueDestType : TPasType; trueDestType : TPasType;
typeHelper : IXsdSpecialTypeHelper; typeHelper : IXsdSpecialTypeHelper;
{$IFDEF WST_HANDLE_DOC} {$IFDEF WST_HANDLE_DOC}
i : PtrInt; i : Integer;
ls : TStrings; ls : TStrings;
{$ENDIF WST_HANDLE_DOC} {$ENDIF WST_HANDLE_DOC}
begin begin
@ -872,7 +872,7 @@ procedure TClassTypeDefinition_TypeHandler.Generate(
function TypeHasSequence(const AClassType : TPasClassType; const ACategory : TTypeCategory) : Boolean; function TypeHasSequence(const AClassType : TPasClassType; const ACategory : TTypeCategory) : Boolean;
var var
k : PtrInt; k : Integer;
p : TPasProperty; p : TPasProperty;
begin begin
Result := False; Result := False;
@ -902,7 +902,7 @@ procedure TClassTypeDefinition_TypeHandler.Generate(
var var
ls : TStrings; ls : TStrings;
line, ns, ns_short, localName, attName, attValue : string; line, ns, ns_short, localName, attName, attValue : string;
k, q : PtrInt; k, q : Integer;
begin begin
ls := AContainer.Properties.GetList(AProp); ls := AContainer.Properties.GetList(AProp);
if ( ls <> nil ) and ( ls.Count > 0 ) then begin if ( ls <> nil ) and ( ls.Count > 0 ) then begin
@ -1299,7 +1299,7 @@ var
unitExternalName : string; unitExternalName : string;
typeHelper : IXsdSpecialTypeHelper; typeHelper : IXsdSpecialTypeHelper;
{$IFDEF WST_HANDLE_DOC} {$IFDEF WST_HANDLE_DOC}
i : PtrInt; i : Integer;
ls : TStrings; ls : TStrings;
{$ENDIF WST_HANDLE_DOC} {$ENDIF WST_HANDLE_DOC}
begin begin

10
wst/trunk/ws_helper/xsd_parser.pas
View File

@ -293,7 +293,7 @@ destructor TCustomXsdSchemaParser.Destroy();
procedure FreeList(AList : TStrings); procedure FreeList(AList : TStrings);
var var
j : PtrInt; j : Integer;
begin begin
if Assigned(AList) and (AList.Count > 0) then begin if Assigned(AList) and (AList.Count > 0) then begin
for j := Pred(AList.Count) downto 0 do begin for j := Pred(AList.Count) downto 0 do begin
@ -317,7 +317,7 @@ end;
function TCustomXsdSchemaParser.FindParser(const ANamespace : string) : IXsdPaser; function TCustomXsdSchemaParser.FindParser(const ANamespace : string) : IXsdPaser;
var var
i : PtrInt; i : Integer;
p, p1 : IXsdPaser; p, p1 : IXsdPaser;
begin begin
Prepare(True); Prepare(True);
@ -534,7 +534,7 @@ function TCustomXsdSchemaParser.FindNameSpace(
out AResult : string out AResult : string
) : Boolean; ) : Boolean;
var var
i : PtrInt; i : Integer;
ls : TStrings; ls : TStrings;
pc : IParserContext; pc : IParserContext;
begin begin
@ -632,7 +632,7 @@ end;
function TCustomXsdSchemaParser.FindShortNamesForNameSpaceLocal(const ANameSpace: string): TStrings; function TCustomXsdSchemaParser.FindShortNamesForNameSpaceLocal(const ANameSpace: string): TStrings;
var var
i : PtrInt; i : Integer;
begin begin
i := FNameSpaceList.IndexOf(ANameSpace); i := FNameSpaceList.IndexOf(ANameSpace);
if ( i >= 0 ) then if ( i >= 0 ) then
@ -1045,7 +1045,7 @@ var
locAttCursor : IObjectCursor; locAttCursor : IObjectCursor;
prntCtx : IParserContext; prntCtx : IParserContext;
nd : TDOMNode; nd : TDOMNode;
i : PtrInt; i : Integer;
ls : TStrings; ls : TStrings;
ok : Boolean; ok : Boolean;
begin begin