paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-08 20:38:16 +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;
TUnitResourcefileFormatArr = array of TUnitResourcefileFormatClass;
var
LFMUnitResourceFileFormat: TUnitResourcefileFormatClass = nil;// set by IDE
procedure RegisterUnitResourcefileFormat(AResourceFileFormat: TUnitResourcefileFormatClass);
function GetUnitResourcefileFormats: TUnitResourcefileFormatArr;

11
designer/jitforms.pp
View File

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

14
ide/lfmunitresource.pas
View File

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

4
ide/project.pp
View File

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