diff --git a/components/ideintf/componenttreeview.pas b/components/ideintf/componenttreeview.pas index 118a9b115d..74fa38ed8c 100644 --- a/components/ideintf/componenttreeview.pas +++ b/components/ideintf/componenttreeview.pas @@ -861,8 +861,7 @@ end; procedure TComponentTreeView.DeleteComponentNode(APersistent: TPersistent); begin - if not FindAndChange(APersistent, zoDelete) then - DebugLn(['TComponentTreeView.DeleteComponentNode failed.']); + FindAndChange(APersistent, zoDelete); end; procedure TComponentTreeView.UpdateCompNode(ANode: TTreeNode); diff --git a/designer/designer.pp b/designer/designer.pp index 9e933502b7..0a69d76f61 100644 --- a/designer/designer.pp +++ b/designer/designer.pp @@ -63,7 +63,7 @@ type Value: boolean) of object; TOnPasteComponents = procedure(Sender: TObject; LookupRoot: TComponent; TxtCompStream: TStream; Parent: TWinControl; - var NewComponents: TFPList) of object; + NewComponents: TFPList) of object; TOnPastedComponents = procedure(Sender: TObject; LookupRoot: TComponent) of object; TOnPersistentDeleted = procedure(Sender: TObject; APersistent: TPersistent) of object; diff --git a/designer/jitforms.pp b/designer/jitforms.pp index 763ee958e6..78edea17c3 100644 --- a/designer/jitforms.pp +++ b/designer/jitforms.pp @@ -205,7 +205,7 @@ type // child components procedure AddJITChildComponentsFromStream(JITOwnerComponent: TComponent; BinStream: TStream; ComponentClass: TComponentClass; - ParentControl: TWinControl; var NewComponents: TFPList); + ParentControl: TWinControl; NewComponents: TFPList); procedure ReadInlineJITChildComponent(Component: TComponent); public property OnReaderError: TJITReaderErrorEvent @@ -1335,7 +1335,7 @@ end; procedure TJITComponentList.AddJITChildComponentsFromStream( JITOwnerComponent: TComponent; BinStream: TStream; ComponentClass: TComponentClass; ParentControl: TWinControl; - var NewComponents: TFPList); + NewComponents: TFPList); var Reader: TReader; DestroyDriver: Boolean; diff --git a/ide/main.pp b/ide/main.pp index eda54cd37b..31019cebb8 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -553,7 +553,7 @@ type procedure DesignerShowOptions(Sender: TObject); procedure DesignerPasteComponents(Sender: TObject; LookupRoot: TComponent; TxtCompStream: TStream; ParentControl: TWinControl; - var NewComponents: TFPList); + NewComponents: TFPList); procedure DesignerPastedComponents(Sender: TObject; LookupRoot: TComponent); procedure DesignerPropertiesChanged(Sender: TObject); procedure DesignerPersistentDeleted(Sender: TObject; APersistent: TPersistent); @@ -9325,7 +9325,7 @@ end; procedure TMainIDE.DesignerPasteComponents(Sender: TObject; LookupRoot: TComponent; TxtCompStream: TStream; ParentControl: TWinControl; - var NewComponents: TFPList); + NewComponents: TFPList); var NewClassName: String; ARegComp: TRegisteredComponent; @@ -9379,10 +9379,8 @@ begin // create the component FormEditor1.CreateChildComponentsFromStream(BinCompStream, ARegComp.ComponentClass,LookupRoot,ParentControl,NewComponents); - if NewComponents.Count=0 then begin + if NewComponents.Count=0 then DebugLn('Error: (lazarus) TMainIDE.DesignerPasteComponent FAILED FormEditor1.CreateChildComponentFromStream'); - exit; - end; finally BinCompStream.Free;