paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-21 23:19:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: activated new xml units

Browse Source 
git-svn-id: trunk@32302 -
This commit is contained in:
mattias 2011-09-12 21:12:49 +00:00
parent 671e8b233d
commit 5fec1dbe91
14 changed files with 56 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/codetools/codetools.inc
View File

@ -25,7 +25,7 @@
}
{off $DEFINE NewXMLCfg}
{off $DEFINE OldXMLCfg}
{off $DEFINE MEM_CHECK}

6
components/codetools/codetoolsconfig.pas
View File

@ -50,7 +50,7 @@ interface
uses
Classes, SysUtils, Laz_XMLCfg,
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLRead, Laz2_XMLWrite, Laz2_DOM,
{$ELSE}
Laz_XMLRead, Laz_XMLWrite, Laz_DOM,
@ -421,7 +421,7 @@ begin
try
Buf.SaveToStream(ms);
ms.Position:=0;
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLRead.ReadXMLFile(ADoc, ms, ReadFlags);
{$ELSE}
Laz_XMLRead.ReadXMLFile(ADoc, ms);
@ -454,7 +454,7 @@ begin
fKeepFileAttributes:=true;
ms:=TMemoryStream.Create;
try
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLWrite.WriteXMLFile(ADoc, ms, WriteFlags);
{$ELSE}
Laz_XMLWrite.WriteXMLFile(ADoc, ms);

18
components/codetools/fileprocs.pas
View File

@ -378,6 +378,7 @@ function DbgS(const p: TPoint): string; overload;
function DbgS(const p: pointer): string; overload;
function DbgS(const e: extended; MaxDecimals: integer = 999): string; overload;
function DbgS(const b: boolean): string; overload;
function DbgS(const ms: TCustomMemoryStream; Count: PtrInt = -1): string; overload;
function DbgSName(const p: TObject): string; overload;
function DbgSName(const p: TClass): string; overload;
function dbgMemRange(P: PByte; Count: integer; Width: integer = 0): string; overload;
@ -2921,6 +2922,23 @@ begin
Result:=dbgs(i1)+','+dbgs(i2)+','+dbgs(i3)+','+dbgs(i4);
end;
function DbgS(const ms: TCustomMemoryStream; Count: PtrInt): string;
var
OldPos: Int64;
begin
if Count<0 then
Count:=ms.Size-ms.Position;
if Count=0 then
exit('');
OldPos:=ms.Position;
try
SetLength(Result,Count);
ms.Read(Result[1],length(Result));
finally
ms.Position:=OldPos;
end;
end;
function DbgSName(const p: TObject): string;
begin
if p=nil then

24
components/codetools/laz2_xmlcfg.pas
View File

@ -27,12 +27,10 @@ interface
{off $DEFINE MEM_CHECK}
{$DEFINE NewXMLCfg}
uses
{$IFDEF MEM_CHECK}MemCheck,{$ENDIF}
Classes, sysutils,
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite,
{$ELSE}
Laz_DOM, Laz_XMLRead, Laz_XMLWrite,
@ -51,7 +49,7 @@ type
TXMLConfig = class(TComponent)
private
FFilename: String;
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
FReadFlags: TXMLReaderFlags;
FWriteFlags: TXMLWriterFlags;
{$ENDIF}
@ -109,7 +107,7 @@ type
published
property Filename: String read FFilename write SetFilename;
property Document: TXMLDocument read doc;
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
property ReadFlags: TXMLReaderFlags read FReadFlags write FReadFlags;
property WriteFlags: TXMLWriterFlags read FWriteFlags write FWriteFlags;
{$ENDIF}
@ -140,7 +138,7 @@ implementation
constructor TXMLConfig.Create(const AFilename: String);
begin
//DebugLn(['TXMLConfig.Create ',AFilename]);
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
// for compatibility with old TXMLConfig, which wrote #13 as #13, not as &xD;
FReadFlags:=[xrfAllowLowerThanInAttributeValue,xrfAllowSpecialCharsInAttributeValue];
FWriteFlags:=[xwfSpecialCharsInAttributeValue];
@ -197,7 +195,7 @@ begin
if Modified and (Filename<>'') then
begin
//DebugLn(['TXMLConfig.Flush ',Filename]);
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLWrite.WriteXMLFile(Doc,Filename,WriteFlags);
{$ELSE}
Laz_XMLWrite.WriteXMLFile(Doc,Filename);
@ -210,7 +208,7 @@ end;
procedure TXMLConfig.ReadFromStream(s: TStream);
begin
FreeDoc;
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLRead.ReadXMLFile(Doc,s,ReadFlags);
{$ELSE}
Laz_XMLRead.ReadXMLFile(Doc,s);
@ -221,7 +219,7 @@ end;
procedure TXMLConfig.WriteToStream(s: TStream);
begin
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLWrite.WriteXMLFile(Doc,s,WriteFlags);
{$ELSE}
Laz_XMLWrite.WriteXMLFile(Doc,s);
@ -460,7 +458,7 @@ end;
procedure TXMLConfig.ReadXMLFile(out ADoc: TXMLDocument; const AFilename: String);
begin
InvalidatePathCache;
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLRead.ReadXMLFile(ADoc,AFilename,ReadFlags);
{$ELSE}
Laz_XMLRead.ReadXMLFile(ADoc,AFilename);
@ -469,7 +467,7 @@ end;
procedure TXMLConfig.WriteXMLFile(ADoc: TXMLDocument; const AFileName: String);
begin
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLWrite.WriteXMLFile(ADoc,AFileName,WriteFlags);
{$ELSE}
Laz_XMLWrite.WriteXMLFile(ADoc,AFileName);
@ -605,7 +603,7 @@ begin
doc:=nil;
//debugln(['TXMLConfig.SetFilename Load=',not fDoNotLoadFromFile,' FileExists=',FileExistsCached(Filename),' File=',Filename]);
if (not fDoNotLoadFromFile) and FileExistsCached(Filename) then
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLRead.ReadXMLFile(doc,Filename,ReadFlags)
{$ELSE}
Laz_XMLRead.ReadXMLFile(doc,Filename)
@ -615,7 +613,7 @@ begin
try
ms.Write(fAutoLoadFromSource[1],length(fAutoLoadFromSource));
ms.Position:=0;
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLRead.ReadXMLFile(doc,ms,ReadFlags);
{$ELSE}
Laz_XMLRead.ReadXMLFile(doc,ms);

24
components/codetools/laz_xmlcfg.pas
View File

@ -28,10 +28,12 @@ interface
{off $DEFINE MEM_CHECK}
{off $DEFINE OldXMLCfg}
uses
{$IFDEF MEM_CHECK}MemCheck,{$ENDIF}
Classes, sysutils,
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite,
{$ELSE}
Laz_DOM, Laz_XMLRead, Laz_XMLWrite,
@ -50,7 +52,7 @@ type
TXMLConfig = class(TComponent)
private
FFilename: String;
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
FReadFlags: TXMLReaderFlags;
FWriteFlags: TXMLWriterFlags;
{$ENDIF}
@ -109,7 +111,7 @@ type
published
property Filename: String read FFilename write SetFilename;
property Document: TXMLDocument read doc;
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
property ReadFlags: TXMLReaderFlags read FReadFlags write FReadFlags;
property WriteFlags: TXMLWriterFlags read FWriteFlags write FWriteFlags;
{$ENDIF}
@ -139,7 +141,7 @@ implementation
constructor TXMLConfig.Create(AOwner: TComponent);
begin
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
// for compatibility with old TXMLConfig, which wrote #13 as #13, not as &xD;
FReadFlags:=[xrfAllowLowerThanInAttributeValue,xrfAllowSpecialCharsInAttributeValue];
// for compatibility with old TXMLConfig, which can not read &xD;, but needs #13
@ -202,7 +204,7 @@ begin
if Modified and (Filename<>'') then
begin
//DebugLn(['TXMLConfig.Flush ',Filename]);
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLWrite.WriteXMLFile(Doc,Filename,WriteFlags);
{$ELSE}
Laz_XMLWrite.WriteXMLFile(Doc,Filename);
@ -215,7 +217,7 @@ end;
procedure TXMLConfig.ReadFromStream(s: TStream);
begin
FreeDoc;
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLRead.ReadXMLFile(Doc,s,ReadFlags);
{$ELSE}
Laz_XMLRead.ReadXMLFile(Doc,s);
@ -226,7 +228,7 @@ end;
procedure TXMLConfig.WriteToStream(s: TStream);
begin
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLWrite.WriteXMLFile(Doc,s,WriteFlags);
{$ELSE}
Laz_XMLWrite.WriteXMLFile(Doc,s);
@ -465,7 +467,7 @@ end;
procedure TXMLConfig.ReadXMLFile(out ADoc: TXMLDocument; const AFilename: String);
begin
InvalidatePathCache;
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLRead.ReadXMLFile(ADoc,AFilename,ReadFlags);
{$ELSE}
Laz_XMLRead.ReadXMLFile(ADoc,AFilename);
@ -474,7 +476,7 @@ end;
procedure TXMLConfig.WriteXMLFile(ADoc: TXMLDocument; const AFileName: String);
begin
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLWrite.WriteXMLFile(ADoc,AFileName,WriteFlags);
{$ELSE}
Laz_XMLWrite.WriteXMLFile(ADoc,AFileName);
@ -610,7 +612,7 @@ begin
doc:=nil;
//debugln(['TXMLConfig.SetFilename Load=',not fDoNotLoadFromFile,' FileExists=',FileExistsCached(Filename),' File=',Filename]);
if (not fDoNotLoadFromFile) and FileExistsCached(Filename) then
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLRead.ReadXMLFile(doc,Filename,ReadFlags)
{$ELSE}
Laz_XMLRead.ReadXMLFile(doc,Filename)
@ -620,7 +622,7 @@ begin
try
ms.Write(fAutoLoadFromSource[1],length(fAutoLoadFromSource));
ms.Position:=0;
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLRead.ReadXMLFile(doc,ms,ReadFlags);
{$ELSE}
Laz_XMLRead.ReadXMLFile(doc,ms);

2
components/codetools/laz_xmlstreaming.pas
View File

@ -37,7 +37,7 @@ interface
uses
SysUtils, Classes, TypInfo, FileProcs,
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_DOM, Laz2_XMLWrite
{$ELSE}
Laz_DOM, Laz_XMLWrite

2
converter/lazxmlforms.pas
View File

@ -37,7 +37,7 @@ interface
uses
Classes, SysUtils, LCLProc,
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
laz2_DOM,
{$ELSE}
Laz_DOM,

2
ide/codehelp.pas
View File

@ -45,7 +45,7 @@ uses
CodeAtom, CodeTree, CodeToolManager, FindDeclarationTool, BasicCodeTools,
KeywordFuncLists, PascalParserTool, CodeCache, CacheCodeTools, CustomCodeTool,
FileProcs,
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite,
{$ELSE}
Laz_DOM, Laz_XMLRead, Laz_XMLWrite,

2
ide/compatibilityrestrictions.pas
View File

@ -36,7 +36,7 @@ interface
uses
Classes, SysUtils, Forms, LCLProc, InterfaceBase, StringHashList,
ObjectInspector, OIFavouriteProperties,
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite,
{$ELSE}
Laz_DOM, Laz_XMLRead, Laz_XMLWrite,

2
ide/dialogprocs.pas
View File

@ -38,7 +38,7 @@ interface
uses
Classes, SysUtils, LCLProc, LResources, Forms, Controls, Dialogs, FileProcs,
FileUtil, Laz_XMLCfg,
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_XMLWrite,
{$ELSE}
Laz_XMLWrite,

2
ide/findrenameidentifier.pas
View File

@ -33,7 +33,7 @@ uses
Classes, SysUtils, LCLProc, Forms, Controls, Graphics, Dialogs,
StdCtrls, Buttons, ExtCtrls, AvgLvlTree, ComCtrls,
// codetools
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
laz2_DOM,
{$ELSE}
Laz_DOM,

2
ide/fpdoceditwindow.pas
View File

@ -40,7 +40,7 @@ uses
// codetools
BasicCodeTools, FileProcs, CodeAtom, CodeCache, CodeToolManager,
CTXMLFixFragment,
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite,
{$ELSE}
Laz_DOM, Laz_XMLRead, Laz_XMLWrite,

2
ide/fpdocselectlink.pas
View File

@ -32,7 +32,7 @@ interface
uses
Classes, SysUtils, LCLProc, Forms, Controls, Graphics, Dialogs,
ExtCtrls, StdCtrls, ButtonPanel, FileUtil, LCLType, AvgLvlTree,
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
Laz2_DOM,
{$ELSE}
Laz_DOM,

4
ide/w32versioninfo.pas
View File

@ -39,7 +39,7 @@ interface
uses
Classes, SysUtils, Process, LCLProc, Controls, Forms, FileUtil,
CodeToolManager, LazConf, Laz_XMLCfg,
{$IFDEF NewXMLCfg}
{$IFNDEF OldXMLCfg}
laz2_DOM,
{$ELSE}
Laz_DOM,
@ -449,7 +449,7 @@ begin
if Assigned(Node) then
begin
StringTable.Clear;
for i := 0 to Node.Attributes.{$IFDEF NewXMLCfg}Length{$ELSE}Count{$ENDIF} - 1 do
for i := 0 to Node.Attributes.{$IFNDEF OldXMLCfg}Length{$ELSE}Count{$ENDIF} - 1 do
StringTable[Node.Attributes[i].NodeName] := Node.Attributes[i].NodeValue;
StringTable.AddRequired;
end