diff --git a/components/codetools/laz_xmlstreaming.pas b/components/codetools/laz_xmlstreaming.pas index 9744b87841..5288f9663c 100644 --- a/components/codetools/laz_xmlstreaming.pas +++ b/components/codetools/laz_xmlstreaming.pas @@ -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} diff --git a/components/fpcunit/guitestrunner.pas b/components/fpcunit/guitestrunner.pas index b8cd7be630..580886e69d 100644 --- a/components/fpcunit/guitestrunner.pas +++ b/components/fpcunit/guitestrunner.pas @@ -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); diff --git a/components/fpweb/weblazideintf.pp b/components/fpweb/weblazideintf.pp index db2d6205ec..01e33b8ba1 100644 --- a/components/fpweb/weblazideintf.pp +++ b/components/fpweb/weblazideintf.pp @@ -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; diff --git a/components/lazreport/source/lr_class.pas b/components/lazreport/source/lr_class.pas index 892252464e..37ec7a47d2 100644 --- a/components/lazreport/source/lr_class.pas +++ b/components/lazreport/source/lr_class.pas @@ -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; diff --git a/components/turbopower_ipro/iputils.pas b/components/turbopower_ipro/iputils.pas index fd4a570858..c21886fa97 100644 --- a/components/turbopower_ipro/iputils.pas +++ b/components/turbopower_ipro/iputils.pas @@ -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