paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-14 05:41:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

components: remove ver2_0 code

Browse Source 
git-svn-id: trunk@23396 -
This commit is contained in:
paul 2010-01-06 18:02:16 +00:00
parent 649bb6bc58
commit 4bd228a50a
5 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/codetools/laz_xmlstreaming.pas
View File

@ -23,7 +23,7 @@ unit Laz_XMLStreaming;
{$H+}
{$DEFINE HasReadWriteBuf}
{$IF defined(VER2_2_0) or defined(VER2_0)}
{$IF defined(VER2_2_0)}
{$UNDEF HasReadWriteBuf}
{$ENDIF}

11
components/fpcunit/guitestrunner.pas
View File

@ -30,12 +30,7 @@ interface
uses
Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
ExtCtrls, Buttons, ComCtrls, ActnList, Menus, Clipbrd, StdCtrls,
testdecorator,
{$IFDEF VER2_0}
xmlreporter,
{$ELSE}
xmltestreport,
{$ENDIF}
testdecorator, xmltestreport,
fpcunit, testregistry, SynEdit, SynHighlighterXML;
@ -621,12 +616,8 @@ begin
SkipUncheckedTests(testResult, TestTree.Selected);
skipsCounter := testResult.NumberOfSkippedTests;
testResult.AddListener(self);
{$IFDEF VER2_0}
w := TXMLResultsWriter.Create;
{$ELSE}
w := TXMLResultsWriter.Create(nil);
w.FileName := 'null'; // prevents output to the console
{$ENDIF}
testResult.AddListener(w);
MemoLog('Running ' + TestTree.Selected.Text);

6
components/fpweb/weblazideintf.pp
View File

@ -19,9 +19,9 @@
{$H+}
unit WebLazIDEIntf;
{$IFNDEF VER2_0}{$IFNDEF VER2_2}
{$IFNDEF VER2_2}
{$DEFINE HasFastCGISupport}
{$ENDIF VER2_0}{$ENDIF VER2_2}
{$ENDIF VER2_2}
interface
@ -130,7 +130,7 @@ begin
THTMLSelectProducer,
THTMLDatasetSelectProducer,
THTMLEntityProducer
{$IFNDEF VER2_0}{$IFNDEF VER2_2},THTMLPageProducer{$ENDIF}{$ENDIF}
{$IFNDEF VER2_2},THTMLPageProducer{$ENDIF}
])
end;

8
components/lazreport/source/lr_class.pas
View File

@ -7893,12 +7893,8 @@ procedure TfrReport.LoadFromXMLFile(const Fname: String);
var
XML: TLrXMLConfig;
begin
{$IFDEF ver2_0_0}
XML := TLrXMLConfig.Create(FName);
{$ELSE}
XML := TLrXMLConfig.Create(nil);
XML.Filename := UTF8ToSys(FName);
{$ENDIF}
try
LoadFromXML(XML, 'LazReport/');
FileName := FName;
@ -7955,13 +7951,9 @@ procedure TfrReport.SaveToXMLFile(const FName: String);
var
XML: TLrXMLConfig;
begin
{$IFDEF ver2_0_0}
XML := TLrXMLConfig.CreateClean(FName);
{$ELSE}
XML := TLrXMLConfig.Create(nil);
XML.StartEmpty := True;
XML.Filename := UTF8ToSys(FName);
{$ENDIF}
try
SaveToXML(XML, 'LazReport/');
XML.Flush;

10
components/turbopower_ipro/iputils.pas
View File

@ -2734,10 +2734,6 @@ const MimeTypeExt : Array[0..4] of String = ('.htm','.html','.txt','.jpg','.png'
MimeTypes : Array[0..4] of String = ('text/html','text/html','text/plain','image/jpeg','image/png');
{$endif}
{$IFDEF VER2_0_2}
type
TMyRegistry=Class(TRegistry);
{$ENDIF}
function GetLocalContent(const TheFileName: string): string;
var
Reg : TRegistry;
@ -2762,14 +2758,8 @@ begin
begin
Reg := nil;
try
{$IFDEF VER2_0_2}
Reg := TMyRegistry.Create;
Reg.RootKey := HKEY_CLASSES_ROOT;
TMyRegistry(Reg).SetCurrentKey(Reg.RootKey);
{$ELSE}
Reg := TRegistry.Create;
Reg.RootKey := HKEY_CLASSES_ROOT;
{$ENDIF}
if Reg.OpenKey(Ext, False) then
Result := Reg.ReadString('Content Type');
finally