From 4e49bc99a11e57d6f9c073253356d66cec3439bb Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sat, 31 May 2014 23:20:10 +0000
Subject: [PATCH] IDE: clean up

git-svn-id: trunk@45273 -
---
 ide/sourceeditor.pp | 11 -----------
 ide/sourcemarks.pas | 16 +---------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index 8dc689df07..77b46407c4 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -1141,7 +1141,6 @@ type
     procedure OnWordCompletionGetSource(var Source: TStrings; SourceIndex: integer);
     procedure OnSourceCompletionTimer(Sender: TObject);
     // marks
-    function OnSourceMarksGetFilename(ASourceEditor: TObject): string;
     procedure OnSourceMarksAction(AMark: TSourceMark; AAction: TMarksAction);
     {$IFDEF EnableNewExtTools}
     procedure OnSourceMarksGetSynEdit(Sender: TObject; aFilename: string;
@@ -10394,14 +10393,6 @@ begin
   end;
 end;
 
-function TSourceEditorManager.OnSourceMarksGetFilename(ASourceEditor: TObject
-  ): string;
-begin
-  if (ASourceEditor = nil) or (not (ASourceEditor is TSourceEditor)) then
-    RaiseException('TSourceNotebook.OnSourceMarksGetFilename');
-  Result := TSourceEditor(ASourceEditor).Filename;
-end;
-
 procedure TSourceEditorManager.OnSourceMarksAction(AMark: TSourceMark;
   AAction: TMarksAction);
 var
@@ -10478,7 +10469,6 @@ begin
 
   // marks
   SourceEditorMarks:=TSourceMarks.Create(Self);
-  SourceEditorMarks.OnGetFilename:=@OnSourceMarksGetFilename;
   SourceEditorMarks.OnAction:=@OnSourceMarksAction;
   {$IFDEF EnableNewExtTools}
   SourceEditorMarks.ExtToolsMarks.OnGetSynEditOfFile:=@OnSourceMarksGetSynEdit;
@@ -10513,7 +10503,6 @@ end;
 
 destructor TSourceEditorManager.Destroy;
 begin
-  SourceEditorMarks.OnGetFilename := nil;
   SourceEditorMarks.OnAction := nil;
   Application.RemoveAllHandlersOfObject(Self);
   // aWordCompletion is released in InternalFinal
diff --git a/ide/sourcemarks.pas b/ide/sourcemarks.pas
index 8589d39088..c16b227c0e 100644
--- a/ide/sourcemarks.pas
+++ b/ide/sourcemarks.pas
@@ -201,7 +201,6 @@ type
     fInvalidDisabledBreakPointImg: Integer;
     fItems: TList;// list of TSourceMark
     fMultiBreakPointImg: Integer;
-    FOnGetFilename: TGetFilenameEvent;
     FOnAction: TMarksActionEvent;
     fSortedItems: TAVLTree;// tree of TSourceMark
     fUnknownBreakPointImg: Integer;
@@ -219,7 +218,6 @@ type
     function AddCustomMark(TheOwner: TSourceEditorBase; Data: TObject;
                            MarkClass: TSourceMarkClass): TSourceMark;
     function AddImage(const ResName: string): integer;
-    function GetFilename(AMark: TSourceMark): string;
     procedure Clear;
     procedure Delete(Index: integer);
     procedure Remove(AMark: TSourceMark);
@@ -234,8 +232,6 @@ type
   public
     property ImgList: TImageList read FImgList write FImgList;
     property Items[Index: integer]: TSourceMark read GetItems; default;
-    property OnGetFilename: TGetFilenameEvent read FOnGetFilename
-                                              write FOnGetFilename;
     property OnAction: TMarksActionEvent read FOnAction write FOnAction;
     {$IFDEF EnableNewExtTools}
     property ExtToolsMarks: TETMarks read FExtToolsMarks;
@@ -458,9 +454,7 @@ end;
 
 function TSourceMark.GetFilename: string;
 begin
-  Result:='';
-  if FSourceMarks=nil then exit;
-  Result:=FSourceMarks.GetFilename(Self);
+  Result:=FSourceEditorID.Filename;
 end;
 
 function TSourceMark.GetHint: string;
@@ -827,14 +821,6 @@ begin
   Result := ImgList.AddResourceName(HInstance, Resname);
 end;
 
-function TSourceMarks.GetFilename(AMark: TSourceMark): string;
-begin
-  Result:='';
-  if (AMark=nil) or (not Assigned(OnGetFilename)) then exit;
-  if AMark.SourceEditor=nil then exit;
-  Result:=OnGetFilename(AMark.SourceEditor);
-end;
-
 initialization
   SourceEditorMarks:=nil;