From b5cd38509bf52b29917e45a770d3ad993b8cc4fd Mon Sep 17 00:00:00 2001 From: inoussa Date: Mon, 19 Jan 2015 09:34:01 +0000 Subject: [PATCH] Remove redundant casts, PtrInt -> Integer, IInterface in classes definitions (Thanks Juha) 1 git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3892 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- wst/trunk/type_lib_edtr/ufclassedit.pas | 2 +- wst/trunk/type_lib_edtr/ufpropedit.pas | 2 +- .../type_lib_edtr/uwsttypelibraryedit.pas | 2 +- wst/trunk/type_lib_edtr/view_helper.pas | 10 +++---- wst/trunk/ws_helper/generator.pas | 26 +++++++++---------- wst/trunk/ws_helper/parserutils.pas | 4 +-- wst/trunk/ws_helper/pascal_parser_intf.pas | 6 ++--- wst/trunk/ws_helper/ws_parser_imp.pas | 20 +++++++------- wst/trunk/ws_helper/wsdl_generator.pas | 4 +-- wst/trunk/ws_helper/wsdl_parser.pas | 22 ++++++++-------- wst/trunk/ws_helper/xsd_generator.pas | 10 +++---- wst/trunk/ws_helper/xsd_parser.pas | 10 +++---- 12 files changed, 59 insertions(+), 59 deletions(-) diff --git a/wst/trunk/type_lib_edtr/ufclassedit.pas b/wst/trunk/type_lib_edtr/ufclassedit.pas index 4edac3f45..029ec14f2 100644 --- a/wst/trunk/type_lib_edtr/ufclassedit.pas +++ b/wst/trunk/type_lib_edtr/ufclassedit.pas @@ -349,7 +349,7 @@ end; procedure TfClassEdit.PrepareParentCombo(); var - i : PtrInt; + i : Integer; begin edtParent.Items.BeginUpdate(); try diff --git a/wst/trunk/type_lib_edtr/ufpropedit.pas b/wst/trunk/type_lib_edtr/ufpropedit.pas index 255e56eb7..3c29af8e0 100644 --- a/wst/trunk/type_lib_edtr/ufpropedit.pas +++ b/wst/trunk/type_lib_edtr/ufpropedit.pas @@ -132,7 +132,7 @@ end; procedure TfPropEdit.LoadFromObject(); var - i : PtrInt; + i : Integer; ls : TStrings; begin edtName.Text := ''; diff --git a/wst/trunk/type_lib_edtr/uwsttypelibraryedit.pas b/wst/trunk/type_lib_edtr/uwsttypelibraryedit.pas index 75d2d99cf..1e1690d29 100644 --- a/wst/trunk/type_lib_edtr/uwsttypelibraryedit.pas +++ b/wst/trunk/type_lib_edtr/uwsttypelibraryedit.pas @@ -204,7 +204,7 @@ type procedure trvSchemaSelectionChanged(Sender : TObject); private FSymbolTable : TwstPasTreeContainer; - FStatusMessageTag : PtrInt; + FStatusMessageTag : Integer; FCurrentFileName : string; {$IFDEF WST_IDE} FProjectLibrary : TLazProjectFile; diff --git a/wst/trunk/type_lib_edtr/view_helper.pas b/wst/trunk/type_lib_edtr/view_helper.pas index a42bf8781..181139b79 100644 --- a/wst/trunk/type_lib_edtr/view_helper.pas +++ b/wst/trunk/type_lib_edtr/view_helper.pas @@ -171,7 +171,7 @@ procedure DrawDependencies( function FindNode(AType : TPasType) : TTreeNode; var - k : PtrInt; + k : Integer; nl : TTreeNodes; begin Result := nil; @@ -184,7 +184,7 @@ procedure DrawDependencies( end; var - i : PtrInt; + i : Integer; e : TDependendyInfo; n : TTreeNode; s : string; @@ -257,7 +257,7 @@ var procedure ScanClassType(AItem : TPasClassType); var - k : PtrInt; + k : Integer; pl : TList2; m : TPasElement; p : TPasProperty; @@ -288,7 +288,7 @@ var procedure ScanRecordType(AItem : TPasRecordType); var - k : PtrInt; + k : Integer; pl : TList2; m : TPasElement; p : TPasVariable; @@ -312,7 +312,7 @@ var end; var - i, c : PtrInt; + i, c : Integer; list : TList2; e : TPasType; begin diff --git a/wst/trunk/ws_helper/generator.pas b/wst/trunk/ws_helper/generator.pas index a8ee2172e..8a9881f47 100644 --- a/wst/trunk/ws_helper/generator.pas +++ b/wst/trunk/ws_helper/generator.pas @@ -233,7 +233,7 @@ function DeduceEasyInterfaceForDocStyle( locProcType : TPasProcedureType; locElt : TPasElement; locRawInParam, locRawOutParam : TPasClassType; - k, q : PtrInt; + k, q : Integer; locProp, locResProp : TPasProperty; locArg : TPasArgument; locIsFunction : Boolean; @@ -305,7 +305,7 @@ function DeduceEasyInterfaceForDocStyle( var locRes : TPasClassType; - i, c : PtrInt; + i, c : Integer; g : TGuid; e : TPasElement; procCount : Integer; @@ -691,7 +691,7 @@ Var function HasObjectsArgs() : Boolean; var - k : PtrInt; + k : Integer; prm : TPasArgument; elt : TPasElement; begin @@ -713,7 +713,7 @@ Var procedure AssignArguments(); var - k : PtrInt; + k : Integer; prm : TPasArgument; elt : TPasElement; begin @@ -746,7 +746,7 @@ Var procedure ClearArguments(); var - k : PtrInt; + k : Integer; prm : TPasArgument; elt : TPasElement; begin @@ -1890,7 +1890,7 @@ procedure TInftGenerator.WriteDocumentation(AElement : TPasElement); var pl : TStrings; docString : string; - i : PtrInt; + i : Integer; begin pl := FSymbolTable.Properties.FindList(AElement); if ( pl <> nil ) then begin @@ -2747,7 +2747,7 @@ var procedure WriteDec(); var itm : TPasVariable; - i : PtrInt; + i : Integer; begin SetCurrentStream(FDecStream); NewLine(); @@ -2773,7 +2773,7 @@ var procedure WriteRTTI(); var itm : TPasVariable; - k, c : PtrInt; + k, c : Integer; offsetLine, typeLine : string; begin SetCurrentStream(FRttiFunc); @@ -2821,7 +2821,7 @@ var procedure WriteAttributeProperties(); var itm : TPasVariable; - k, c : PtrInt; + k, c : Integer; begin c := ASymbol.Members.Count; for k := 0 to Pred(c) do begin @@ -2974,7 +2974,7 @@ procedure TInftGenerator.InternalExecute(); procedure SortRecords(AList : TList2); var - j, k : PtrInt; + j, k : Integer; ordr_ls, mbrLs, locLs : TList2; locMemberType : TPasType; rec, locRec : TPasRecordType; @@ -3066,7 +3066,7 @@ procedure TInftGenerator.InternalExecute(); end; var - i,c, j, k : PtrInt; + i, c, j, k : Integer; clssTyp : TPasClassType; gnrClssLst : TObjectList; objLst : TObjectList; @@ -3074,7 +3074,7 @@ var elt : TPasElement; classAncestor : TPasElement; tmpList : TList2; - intfCount : PtrInt; + intfCount : Integer; locBinding : TwstBinding; begin intfCount := 0; @@ -3261,7 +3261,7 @@ end; procedure TInftGenerator.Execute(); var oldCurrent, mdl : TPasModule; - i : PtrInt; + i : Integer; mdlList : TList2; oldCS : Boolean; oldNamesKinds : TElementNameKinds; diff --git a/wst/trunk/ws_helper/parserutils.pas b/wst/trunk/ws_helper/parserutils.pas index 097e65f30..0fe79dcf1 100644 --- a/wst/trunk/ws_helper/parserutils.pas +++ b/wst/trunk/ws_helper/parserutils.pas @@ -434,7 +434,7 @@ end; function AddNameSpace(const AValue: string; ANameSpaceList : TStrings): TStrings; var - i : PtrInt; + i : Integer; s : string; ls : TStringList; begin @@ -487,7 +487,7 @@ end; function TQualifiedNameObjectFilter.Evaluate(const AObject: TObject): Boolean; var locObj : TDOMNodeRttiExposer; - startPos, i : PtrInt; + startPos, i : Integer; shortNameSpace : string; locContinue : Boolean; tmpNode : TDOMNode; diff --git a/wst/trunk/ws_helper/pascal_parser_intf.pas b/wst/trunk/ws_helper/pascal_parser_intf.pas index 737a0f340..b0dbef888 100644 --- a/wst/trunk/ws_helper/pascal_parser_intf.pas +++ b/wst/trunk/ws_helper/pascal_parser_intf.pas @@ -1065,7 +1065,7 @@ procedure TwstPasTreeContainer.FreeProperties(AObject: TPasElement); procedure FreeClassProps(AObj : TPasClassType); var ls : TList2; - k : PtrInt; + k : Integer; begin ls := AObj.Members; for k := 0 to Pred(ls.Count) do begin @@ -1076,7 +1076,7 @@ procedure TwstPasTreeContainer.FreeProperties(AObject: TPasElement); procedure FreeRecordFields(AObj : TPasRecordType); var ls : TList2; - k : PtrInt; + k : Integer; begin ls := AObj.Members; for k := 0 to Pred(ls.Count) do begin @@ -1234,7 +1234,7 @@ end; procedure TPropertyHolder.FreeList(AObject: TObject); var - i : PtrInt; + i : Integer; begin i := FObjects.IndexOf(AObject); if ( i >= 0 ) then begin diff --git a/wst/trunk/ws_helper/ws_parser_imp.pas b/wst/trunk/ws_helper/ws_parser_imp.pas index 1e9485a0d..03ac42cf3 100644 --- a/wst/trunk/ws_helper/ws_parser_imp.pas +++ b/wst/trunk/ws_helper/ws_parser_imp.pas @@ -103,9 +103,9 @@ type constructor Create(); destructor Destroy();override; function Add(AProp : TPasProperty) : TPropInfoReference; - function GetItem(const AIndex : PtrInt) : TPropInfoReference;{$IFDEF USE_INLINE}inline;{$ENDIF} - function IndexOf(const AProp : TPasProperty) : PtrInt; - function GetCount() : PtrInt;{$IFDEF USE_INLINE}inline;{$ENDIF} + function GetItem(const AIndex : Integer) : TPropInfoReference;{$IFDEF USE_INLINE}inline;{$ENDIF} + function IndexOf(const AProp : TPasProperty) : Integer; + function GetCount() : Integer;{$IFDEF USE_INLINE}inline;{$ENDIF} end; { TComplexTypeParser } @@ -379,7 +379,7 @@ var tmpCursor : IObjectCursor; props : TStrings; docString : string; - i : PtrInt; + i : Integer; tempNode : TDOMNode; begin if FTypeNode.HasChildNodes() then begin @@ -546,7 +546,7 @@ procedure TComplexTypeParser.ExtractExtendedMetadata( var ls : TDOMNamedNodeMap; e : TDOMNode; - k, q : PtrInt; + k, q : Integer; ns_short, ns_long, localName, locBuffer, locBufferNS, locBufferNS_long, locBufferLocalName : string; begin if ( ANode.Attributes <> nil ) and ( GetNodeListCount(ANode.Attributes) > 0 ) then begin @@ -1899,7 +1899,7 @@ end; function TPropInfoReferenceList.Add(AProp : TPasProperty) : TPropInfoReference; var - i : PtrInt; + i : Integer; begin i := IndexOf(AProp); if ( i = -1 ) then begin @@ -1911,14 +1911,14 @@ begin end; end; -function TPropInfoReferenceList.GetItem(const AIndex : PtrInt) : TPropInfoReference; +function TPropInfoReferenceList.GetItem(const AIndex: Integer): TPropInfoReference; begin Result := TPropInfoReference(FList[AIndex]); end; -function TPropInfoReferenceList.IndexOf(const AProp : TPasProperty) : PtrInt; +function TPropInfoReferenceList.IndexOf(const AProp: TPasProperty): Integer; var - i : PtrInt; + i : Integer; begin Result := -1; for i := 0 to Pred(FList.Count) do begin @@ -1929,7 +1929,7 @@ begin end; end; -function TPropInfoReferenceList.GetCount() : PtrInt; +function TPropInfoReferenceList.GetCount: Integer; begin Result := FList.Count; end; diff --git a/wst/trunk/ws_helper/wsdl_generator.pas b/wst/trunk/ws_helper/wsdl_generator.pas index a8e8f37bf..0d101232d 100644 --- a/wst/trunk/ws_helper/wsdl_generator.pas +++ b/wst/trunk/ws_helper/wsdl_generator.pas @@ -154,7 +154,7 @@ procedure TWsdlGenerator.GenerateTypes( AModule : TPasModule ); var - i, c : PtrInt; + i, c : Integer; mdl : TPasModule; mdlLs : TList2; g : IGenerator; @@ -505,7 +505,7 @@ procedure TWsdlGenerator.Execute(ASymTable : TwstPasTreeContainer; AModuleName : var locMainModule : TPasModule; decList : TList2; - j, c : PtrInt; + j, c : Integer; sym : TPasElement; ps : TPasClassType; bndg : TwstBinding; diff --git a/wst/trunk/ws_helper/wsdl_parser.pas b/wst/trunk/ws_helper/wsdl_parser.pas index be7867584..e7450eb75 100644 --- a/wst/trunk/ws_helper/wsdl_parser.pas +++ b/wst/trunk/ws_helper/wsdl_parser.pas @@ -137,7 +137,7 @@ end; function TWsdlParser.AddNameSpace(const AValue: string): TStrings; var - i : PtrInt; + i : Integer; s : string; ls : TStringList; begin @@ -197,7 +197,7 @@ destructor TWsdlParser.Destroy(); procedure FreeList(AList : TStrings); var - j : PtrInt; + j : Integer; begin if Assigned(AList) and (AList.Count > 0) then 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; var - i : PtrInt; + i : Integer; ls : TStrings; begin AResult := ''; @@ -279,7 +279,7 @@ end; function TWsdlParser.FindShortNamesForNameSpace(const ANameSpace: string): TStrings; var - i : PtrInt; + i : Integer; begin i := FNameSpaceList.IndexOf(ANameSpace); if ( i >= 0 ) then @@ -434,7 +434,7 @@ procedure TWsdlParser.Execute(const AMode: TParserMode; const AModuleName: strin procedure FixUsesList(); var locPrs : IParserContext; - k : PtrInt; + k : Integer; locModule : TPasModule; locIntfUsesList : TList2; begin @@ -720,10 +720,10 @@ function TWsdlParser.ParseOperation( 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_' ); var - p, q : PtrInt; + p, q : Integer; idx_found : Boolean; resItemName : string; arg : TPasArgument; @@ -759,9 +759,9 @@ function TWsdlParser.ParseOperation( locProcType : TPasProcedureType; locFunc : TPasFunction; locFuncType : TPasFunctionType; - j : PtrInt; + j : Integer; arg_a, arg_b : TPasArgument; - resArgIndex : PtrInt; + resArgIndex : Integer; prmNameColisionWithInputParam : Boolean; prmTypeEntity : TPasType; begin @@ -1333,7 +1333,7 @@ end; procedure TWsdlParser.ParseTypes(); var locPrs : IXsdPaser; - i : PtrInt; + i : Integer; begin for i := 0 to Pred(FXsdParsers.Count) do begin locPrs := (FXsdParsers.Objects[i] as TIntfObjectRef).Intf as IXsdPaser; @@ -1468,7 +1468,7 @@ end; function TWsdlParser.GetParser(const ANamespace: string): IXsdPaser; var - i : PtrInt; + i : Integer; p, p1 : IXsdPaser; begin Result := nil; diff --git a/wst/trunk/ws_helper/xsd_generator.pas b/wst/trunk/ws_helper/xsd_generator.pas index 3cbd3fb6a..d793216ce 100644 --- a/wst/trunk/ws_helper/xsd_generator.pas +++ b/wst/trunk/ws_helper/xsd_generator.pas @@ -618,7 +618,7 @@ const {$ENDIF WST_UNICODESTRING} ); var - i : PtrInt; + i : Integer; locName : string; begin AHelper := nil; @@ -757,7 +757,7 @@ var trueDestType : TPasType; typeHelper : IXsdSpecialTypeHelper; {$IFDEF WST_HANDLE_DOC} - i : PtrInt; + i : Integer; ls : TStrings; {$ENDIF WST_HANDLE_DOC} begin @@ -872,7 +872,7 @@ procedure TClassTypeDefinition_TypeHandler.Generate( function TypeHasSequence(const AClassType : TPasClassType; const ACategory : TTypeCategory) : Boolean; var - k : PtrInt; + k : Integer; p : TPasProperty; begin Result := False; @@ -902,7 +902,7 @@ procedure TClassTypeDefinition_TypeHandler.Generate( var ls : TStrings; line, ns, ns_short, localName, attName, attValue : string; - k, q : PtrInt; + k, q : Integer; begin ls := AContainer.Properties.GetList(AProp); if ( ls <> nil ) and ( ls.Count > 0 ) then begin @@ -1299,7 +1299,7 @@ var unitExternalName : string; typeHelper : IXsdSpecialTypeHelper; {$IFDEF WST_HANDLE_DOC} - i : PtrInt; + i : Integer; ls : TStrings; {$ENDIF WST_HANDLE_DOC} begin diff --git a/wst/trunk/ws_helper/xsd_parser.pas b/wst/trunk/ws_helper/xsd_parser.pas index 7092276bb..41cff4f98 100644 --- a/wst/trunk/ws_helper/xsd_parser.pas +++ b/wst/trunk/ws_helper/xsd_parser.pas @@ -293,7 +293,7 @@ destructor TCustomXsdSchemaParser.Destroy(); procedure FreeList(AList : TStrings); var - j : PtrInt; + j : Integer; begin if Assigned(AList) and (AList.Count > 0) then begin for j := Pred(AList.Count) downto 0 do begin @@ -317,7 +317,7 @@ end; function TCustomXsdSchemaParser.FindParser(const ANamespace : string) : IXsdPaser; var - i : PtrInt; + i : Integer; p, p1 : IXsdPaser; begin Prepare(True); @@ -534,7 +534,7 @@ function TCustomXsdSchemaParser.FindNameSpace( out AResult : string ) : Boolean; var - i : PtrInt; + i : Integer; ls : TStrings; pc : IParserContext; begin @@ -632,7 +632,7 @@ end; function TCustomXsdSchemaParser.FindShortNamesForNameSpaceLocal(const ANameSpace: string): TStrings; var - i : PtrInt; + i : Integer; begin i := FNameSpaceList.IndexOf(ANameSpace); if ( i >= 0 ) then @@ -1045,7 +1045,7 @@ var locAttCursor : IObjectCursor; prntCtx : IParserContext; nd : TDOMNode; - i : PtrInt; + i : Integer; ls : TStrings; ok : Boolean; begin