From 5313aa44583e88f9923e5f91cd3cc78e8e4fe88b Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 24 Jun 2014 16:45:06 +0000 Subject: [PATCH] IDEIntf: removed TLFMUnitResourcefileFormat.ResourceDirectiveFilename: git-svn-id: trunk@45645 - --- components/ideintf/unitresources.pas | 1 - ide/lfmunitresource.pas | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/ideintf/unitresources.pas b/components/ideintf/unitresources.pas index d9c17758e1..d98391e684 100644 --- a/components/ideintf/unitresources.pas +++ b/components/ideintf/unitresources.pas @@ -28,7 +28,6 @@ type TUnitResourcefileFormat = class public class function FindResourceDirective(Source: TObject): boolean; virtual; abstract; - class function ResourceDirectiveFilename: string; virtual; abstract; class function GetUnitResourceFilename(AUnitFilename: string; Loading: boolean): string; virtual; abstract; class procedure TextStreamToBinStream(ATxtStream, ABinStream: TExtMemoryStream); virtual; abstract; class procedure BinStreamToTextStream(ABinStream, ATextStream: TExtMemoryStream); virtual; abstract; diff --git a/ide/lfmunitresource.pas b/ide/lfmunitresource.pas index 07e89400c8..10137ec57b 100644 --- a/ide/lfmunitresource.pas +++ b/ide/lfmunitresource.pas @@ -34,7 +34,7 @@ uses // packages LCLMemManager, LResources, Forms, CodeCache, CodeToolManager, // IDEIntf - UnitResources, LazFileCache, LazFileUtils, AvgLvlTree, + UnitResources, SrcEditorIntf, LazFileCache, LazFileUtils, AvgLvlTree, // IDE CheckLFMDlg; @@ -45,7 +45,7 @@ type TLFMUnitResourcefileFormat = class(TUnitResourcefileFormat) public class function FindResourceDirective(Source: TObject): boolean; override; - class function ResourceDirectiveFilename: string; override; + class function ResourceDirectiveFilename: string; class function GetUnitResourceFilename(AUnitFilename: string; {%H-}Loading: boolean): string; override; class procedure TextStreamToBinStream(ATxtStream, ABinStream: TExtMemoryStream); override; class procedure BinStreamToTextStream(ABinStream, ATextStream: TExtMemoryStream); override; @@ -143,7 +143,7 @@ var begin Result := ChangeFileExt(AUnitFilename,'.lfm'); if not FileExistsCached(Result) - // ToDo: search in source editor + and (SourceEditorManagerIntf.SourceEditorIntfWithFilename(Result)=nil) then begin DFMFilename:=ChangeFileExt(AUnitFilename,'.dfm'); if FileExistsCached(DFMFilename) then @@ -179,7 +179,8 @@ class function TLFMUnitResourcefileFormat.QuickCheckResourceBuffer(PascalBuffer, LFMBuffer: TObject; out LFMType, LFMComponentName, LFMClassName: string; out LCLVersion: string; out MissingClasses: TStrings): TModalResult; begin - Result := QuickCheckLFMBuffer(PascalBuffer as TCodeBuffer, LFMBuffer as TCodeBuffer, LFMType, LFMComponentName, LFMClassName, + Result := QuickCheckLFMBuffer(PascalBuffer as TCodeBuffer, + LFMBuffer as TCodeBuffer, LFMType, LFMComponentName, LFMClassName, LCLVersion, MissingClasses); end;