diff --git a/designer/designermenu.pp b/designer/designermenu.pp index b1296ec6fc..e897e5cb1f 100644 --- a/designer/designermenu.pp +++ b/designer/designermenu.pp @@ -1980,7 +1980,7 @@ begin begin //MenuItem.Remove(MenuItem[index_sequence[Ind]]); temp_menuitem:=MenuItem[index_sequence[Ind]]; - GlobalDesignHook.DeletePersistent(temp_menuitem); + GlobalDesignHook.DeletePersistent(TPersistent(temp_menuitem)); //MenuItem[index_sequence[Ind]].Free; end else UpdateMenu(MenuItem.Items[index_sequence[Ind]], DesignerMenuItem, Ind + 1, TheAction) @@ -1992,7 +1992,7 @@ begin for i := MenuItem[index_sequence[Ind]].Count - 1 downto 0 do begin temp_menuitem:=MenuItem[index_sequence[Ind]].Items[i]; - GlobalDesignHook.DeletePersistent(temp_menuitem); + GlobalDesignHook.DeletePersistent(TPersistent(temp_menuitem)); //MenuItem[index_sequence[Ind]].Delete(i); //MenuItem[index_sequence[Ind]].Items.Free end; diff --git a/ide/applicationbundle.pas b/ide/applicationbundle.pas index 38157884a7..fe0beb3491 100644 --- a/ide/applicationbundle.pas +++ b/ide/applicationbundle.pas @@ -125,7 +125,7 @@ var ContentsDir: String; MacOSDir: String; ResourcesDir: String; - sl: TStringList; + sl: TStrings; begin AppBundleDir := ExtractFileNameWithoutExt(Filename) + ApplicationBundleExt + PathDelim; if not Recreate and DirectoryExistsUTF8(AppBundleDir) then exit(mrOk); diff --git a/ide/codebrowser.pas b/ide/codebrowser.pas index a8fb65ab99..268643e499 100644 --- a/ide/codebrowser.pas +++ b/ide/codebrowser.pas @@ -1667,7 +1667,7 @@ var NewUnit:=List.AddUnit(''); end; //DebugLn(['AddUnits AddUnitNodes ',CurUnit.Filename]); - AddUnitNodes(CurUnit,NewUnit); + AddUnitNodes(CurUnit,TObject(NewUnit)); if (DestParentList=nil) then DestParentList:=NewUnit; end; @@ -1709,7 +1709,7 @@ var end; end; // create nodes for units - AddUnits(SrcList,NewList); + AddUnits(SrcList,TObject(NewList)); // update DestParentList if (DestParentList=nil) then DestParentList:=NewList; diff --git a/ide/codehelp.pas b/ide/codehelp.pas index dfd5a6fa83..d6290ab2e3 100644 --- a/ide/codehelp.pas +++ b/ide/codehelp.pas @@ -676,7 +676,7 @@ procedure TLazFPDocFile.SetChildValue(Node: TDOMNode; const ChildName: string; procedure ReadXMLFragmentFromString(AParentNode: TDOMNode; const s: string); var - MemStream: TMemoryStream; + MemStream: TStream; begin if s='' then exit; try diff --git a/ide/customformeditor.pp b/ide/customformeditor.pp index a996b867db..458ff8ed92 100644 --- a/ide/customformeditor.pp +++ b/ide/customformeditor.pp @@ -346,7 +346,7 @@ function CompareDefPropCacheItems(Item1, Item2: TDefinePropertiesCacheItem): int function ComparePersClassNameAndDefPropCacheItem(Key: Pointer; Item: TDefinePropertiesCacheItem): integer; -function TryFreeComponent(var AComponent: TComponent): boolean; +function TryFreeComponent(var obj): boolean; procedure RegisterStandardClasses; @@ -393,16 +393,17 @@ begin RegisterClasses([TStringList]); end; -function TryFreeComponent(var AComponent: TComponent): boolean; +function TryFreeComponent(var obj): boolean; var OldName, OldClassName: string; + AComponent: TComponent absolute obj; Begin - Result:=false; + Result := False; {$IFNDEF NoCompCatch} try {$ENDIF} - OldName:=AComponent.Name; - OldClassName:=AComponent.ClassName; + OldName := AComponent.Name; + OldClassName := AComponent.ClassName; AComponent.Free; Result := True; {$IFNDEF NoCompCatch} @@ -432,7 +433,7 @@ Begin end; end; end; - AComponent:=nil; + AComponent := nil; end; { TComponentInterface } diff --git a/ide/debugmanager.pas b/ide/debugmanager.pas index 17ea5d210e..65c2e0d2f9 100644 --- a/ide/debugmanager.pas +++ b/ide/debugmanager.pas @@ -45,7 +45,7 @@ uses { for Get/SetForegroundWindow } LCLType, LCLIntf, SynEdit, CodeCache, CodeToolManager, - MenuIntf, IDECommands, LazIDEIntf, ProjectIntf, + SrcEditorIntf, MenuIntf, IDECommands, LazIDEIntf, ProjectIntf, LazConf, CompilerOptions, EditorOptions, EnvironmentOpts, ProjectOpts, KeyMapping, SourceEditor, ProjectDefs, Project, IDEProcs, InputHistory, Debugger, CmdLineDebugger, @@ -2409,7 +2409,7 @@ end; function TDebugManager.DoRunToCursor: TModalResult; var - ActiveSrcEdit: TSourceEditor; + ActiveSrcEdit: TSourceEditorInterface; ActiveUnitInfo: TUnitInfo; UnitFilename: string; begin @@ -2446,7 +2446,7 @@ begin DebugLn('TDebugManager.DoRunToCursor C'); {$endif} FDebugger.RunTo(ExtractFilename(UnitFilename), - ActiveSrcEdit.EditorComponent.CaretY); + TSourceEditor(ActiveSrcEdit).EditorComponent.CaretY); {$ifdef VerboseDebugger} DebugLn('TDebugManager.DoRunToCursor D'); diff --git a/ide/ideprocs.pp b/ide/ideprocs.pp index e44f1d1a34..17f2a98818 100644 --- a/ide/ideprocs.pp +++ b/ide/ideprocs.pp @@ -231,7 +231,6 @@ function ProgramDirectory: string; procedure RaiseException(const Msg: string); // miscellaneous -procedure FreeThenNil(var Obj: TObject); function CompareCaret(const FirstCaret, SecondCaret: TPoint): integer; function CompareBoolean(b1, b2: boolean): integer; procedure CheckList(List: TList; TestListNil, TestDoubles, TestNils: boolean); @@ -1123,12 +1122,6 @@ begin Params:=RightStr(CmdLine,length(CmdLine)-p+1); end; -procedure FreeThenNil(var Obj: TObject); -begin - Obj.Free; - Obj:=nil; -end; - {------------------------------------------------------------------------------- function CompareCaret(const FirstCaret, SecondCaret: TPoint): integer; -------------------------------------------------------------------------------} diff --git a/ide/invertassigntool.pas b/ide/invertassigntool.pas index 39fd314345..6b30e984dc 100644 --- a/ide/invertassigntool.pas +++ b/ide/invertassigntool.pas @@ -178,7 +178,7 @@ Lines: TStringList; PreList, AList, BList, -PostList: TStringList; +PostList: TStrings; Indents: PInteger; X, Y: Integer; EqPos: Integer; diff --git a/ideintf/actionseditor.pas b/ideintf/actionseditor.pas index f3f60a690c..984f83c7cb 100644 --- a/ideintf/actionseditor.pas +++ b/ideintf/actionseditor.pas @@ -749,7 +749,7 @@ begin if Assigned(OldAction) then begin try - FDesigner.PropertyEditorHook.DeletePersistent(OldAction); + FDesigner.PropertyEditorHook.DeletePersistent(TPersistent(OldAction)); OldAction:=nil; except on E: Exception do begin diff --git a/ideintf/componenteditors.pas b/ideintf/componenteditors.pas index 3fa8cb0ae2..3c6113298c 100644 --- a/ideintf/componenteditors.pas +++ b/ideintf/componenteditors.pas @@ -697,12 +697,12 @@ procedure TNotebookComponentEditor.DoDeletePage; var Hook: TPropertyEditorHook; OldIndex: integer; - PageComponent: TComponent; + PageComponent: TPersistent; begin OldIndex:=Notebook.PageIndex; if (OldIndex>=0) and (OldIndex