paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-06 22:26:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: reverted patch #42889

Browse Source 
git-svn-id: trunk@42894 -
This commit is contained in:
mattias 2013-09-20 09:05:34 +00:00
parent fbfe792239
commit 0c1f11b7a5
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/ideintf/unitresources.pas
View File

@ -46,9 +46,6 @@ type
TUnitResourcefileFormatClass = class of TUnitResourcefileFormat; TUnitResourcefileFormatClass = class of TUnitResourcefileFormat;
TUnitResourcefileFormatArr = array of TUnitResourcefileFormatClass; TUnitResourcefileFormatArr = array of TUnitResourcefileFormatClass;
var
LFMUnitResourceFileFormat: TUnitResourcefileFormatClass = nil;// set by IDE
procedure RegisterUnitResourcefileFormat(AResourceFileFormat: TUnitResourcefileFormatClass); procedure RegisterUnitResourcefileFormat(AResourceFileFormat: TUnitResourcefileFormatClass);
function GetUnitResourcefileFormats: TUnitResourcefileFormatArr; function GetUnitResourcefileFormats: TUnitResourcefileFormatArr;

11
designer/jitforms.pp
View File

@ -42,10 +42,9 @@ uses
{$IFDEF IDE_MEM_CHECK} {$IFDEF IDE_MEM_CHECK}
MemCheck, MemCheck,
{$ENDIF} {$ENDIF}
Classes, SysUtils, TypInfo, AvgLvlTree, BasicCodeTools, LCLProc, LResources, Classes, SysUtils, AvgLvlTree, BasicCodeTools, TypInfo, LCLProc, LResources,
Forms, Controls, LCLMemManager, LCLIntf, Dialogs, Forms, Controls, LCLMemManager, LCLIntf, Dialogs, PropEditUtils, PropEdits,
PropEditUtils, PropEdits, IDEProcs, PackageDefs, BasePkgManager, UnitResources, lfmUnitResource;
IDEProcs, PackageDefs, BasePkgManager, UnitResources;
type type
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -1149,7 +1148,7 @@ begin
SubReader:=nil; SubReader:=nil;
DestroyDriver:=false; DestroyDriver:=false;
try try
CreateReader(BinStream,LFMUnitResourcefileFormat,SubReader,DestroyDriver); CreateReader(BinStream,TLFMUnitResourcefileFormat,SubReader,DestroyDriver);
// The stream contains only the diff to the Ancestor instance, // The stream contains only the diff to the Ancestor instance,
// => give it the Ancestor instance // => give it the Ancestor instance
SubReader.Ancestor:=Ancestor; SubReader.Ancestor:=Ancestor;
@ -1311,7 +1310,7 @@ begin
try try
DestroyDriver:=false; DestroyDriver:=false;
InitReading; InitReading;
CreateReader(BinStream,LFMUnitResourcefileFormat, Reader,DestroyDriver); CreateReader(BinStream,TLFMUnitResourcefileFormat, Reader,DestroyDriver);
{$IFDEF VerboseJITForms} {$IFDEF VerboseJITForms}
debugln('[TJITComponentList.AddJITChildComponentFromStream] B'); debugln('[TJITComponentList.AddJITChildComponentFromStream] B');
{$ENDIF} {$ENDIF}

14
ide/lfmunitresource.pas
View File

@ -31,10 +31,9 @@ interface
uses uses
Classes, SysUtils, Classes, SysUtils,
LCLMemManager, Forms, LResources, LCLMemManager,
CodeCache, CodeToolManager, LazFileCache, Forms,
UnitResources, UnitResources, LazFileCache;
CheckLFMDlg;
type type
@ -57,6 +56,12 @@ type
implementation implementation
uses
LResources,
CodeCache,
CodeToolManager,
CheckLFMDlg;
{ TLFMUnitResourcefileFormat } { TLFMUnitResourcefileFormat }
class function TLFMUnitResourcefileFormat.FindResourceDirective(Source: TObject): boolean; class function TLFMUnitResourcefileFormat.FindResourceDirective(Source: TObject): boolean;
@ -235,6 +240,5 @@ end;
initialization initialization
RegisterUnitResourcefileFormat(TLFMUnitResourcefileFormat); RegisterUnitResourcefileFormat(TLFMUnitResourcefileFormat);
LFMUnitResourceFileFormat:=TLFMUnitResourcefileFormat;
end. end.

4
ide/project.pp
View File

@ -60,7 +60,7 @@ uses
SynEdit, SynEdit,
// IDE // IDE
CompOptsModes, ProjectResources, LazConf, W32Manifest, ProjectIcon, CompOptsModes, ProjectResources, LazConf, W32Manifest, ProjectIcon,
LazarusIDEStrConsts, CompilerOptions, LazarusIDEStrConsts, CompilerOptions, lfmUnitResource,
TransferMacros, EditorOptions, IDEProcs, RunParamsOpts, ProjectDefs, TransferMacros, EditorOptions, IDEProcs, RunParamsOpts, ProjectDefs,
FileReferenceList, EditDefineTree, ModeMatrixOpts, PackageDefs, PackageSystem, FileReferenceList, EditDefineTree, ModeMatrixOpts, PackageDefs, PackageSystem,
IDEDialogs; IDEDialogs;
@ -2380,7 +2380,7 @@ begin
end; end;
end; end;
end; end;
FUnitResourceFileformat := LFMUnitResourcefileFormat; FUnitResourceFileformat := TLFMUnitResourcefileFormat;
end; end;
Result := FUnitResourceFileformat; Result := FUnitResourceFileformat;
end; end;