From 9226386149399627982fc8a72358ed7729781f38 Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Tue, 27 Mar 2012 07:19:59 +0000
Subject: [PATCH] ide, tools, examples: remove ver2_2_x defines

git-svn-id: trunk@36370 -
---
 examples/trayicon/frmtest.pas          | 4 ----
 ide/include/win/lazbaseconf.inc        | 5 -----
 ide/lazarus.pp                         | 4 ++--
 ideintf/propedits.pp                   | 7 ++-----
 tools/lazdatadesktop/dicteditor.pp     | 3 ---
 tools/lazdatadesktop/frmgeneratesql.pp | 5 -----
 tools/lazdatadesktop/frmmain.pp        | 3 ---
 7 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/examples/trayicon/frmtest.pas b/examples/trayicon/frmtest.pas
index 28b057a54c..f7441b1bb1 100644
--- a/examples/trayicon/frmtest.pas
+++ b/examples/trayicon/frmtest.pas
@@ -71,11 +71,7 @@ uses Windows;
 {$endif}
 {$IFDEF Darwin}
 uses
-{$ifdef ver2_2_0}
-  FPCMacOSAll;
-{$else}
   MacOSAll;
-{$endif}
 {$ENDIF}
 
 { TfrmTrayTest }
diff --git a/ide/include/win/lazbaseconf.inc b/ide/include/win/lazbaseconf.inc
index efcb4e1588..05e50df6b7 100644
--- a/ide/include/win/lazbaseconf.inc
+++ b/ide/include/win/lazbaseconf.inc
@@ -145,15 +145,10 @@ begin
   DefaultDrive := ExtractFileDrive(ProgramDirectory);
   DefaultFPCTarget:= GetDefaultTargetCPU + '-' + GetDefaultTargetOS;
   DefaultFPCVersion:= {$I %FPCVERSION%};
-  {$ifndef ver2_2_0}
   // the last part of the path returned by GetAppConfigDir is the application
   // name. Replace that by 'lazarus', to make sure that lazbuild uses
   // the same primary config path
   PrimaryConfigPath:= ExtractFilePath(ChompPathDelim(SysToUTF8(GetAppConfigDir(False)))) + 'lazarus';
-  {$else}
-  // fpc 2.2.0 cannot handle spaces in path in some circumstances
-  PrimaryConfigPath:=ChompPathDelim(ProgramDirectory);
-  {$endif}
   SecondaryConfigPath:=ChompPathDelim(ProgramDirectory);
   DefaultFPCSrcDirs[1] := AppendPathDelim(ProgramDirectory) + 'fpcsrc';
   DefaultLazarusSrcDirs[1] := DefaultDrive + '\lazarus';
diff --git a/ide/lazarus.pp b/ide/lazarus.pp
index f565e1a595..26b345b184 100644
--- a/ide/lazarus.pp
+++ b/ide/lazarus.pp
@@ -44,9 +44,9 @@ uses
   {$IFDEF IDE_MEM_CHECK}
   MemCheck,
   {$ENDIF}
-  {$IF defined(Unix) and not defined(VER2_2_0) and not defined(VER2_2_2)}
+  {$IF defined(Unix)}
   clocale,
-  {$ENDIF}
+  {$IFEND}
   SysUtils,
   Interfaces,
   Forms, LCLProc,
diff --git a/ideintf/propedits.pp b/ideintf/propedits.pp
index 3ef6efb064..4bb398fbf9 100644
--- a/ideintf/propedits.pp
+++ b/ideintf/propedits.pp
@@ -1772,13 +1772,10 @@ const
     TInt64PropertyEditor,      // tkInt64
     TQWordPropertyEditor,      // tkQWord
     nil,                       // tkDynArray
-    nil                        // tkInterfaceRaw,
-{$IF declared(tkUString)}
-// can be replaced by {$IFNDEF VER2_2} later, if grace period of older 2.3.1 ends
-    ,nil,                      // tkProcVar
+    nil,                       // tkInterfaceRaw,
+    nil,                       // tkProcVar
     nil,                       // tkUString
     nil                        // tkUChar
-{$ENDIF}
 {$IF declared(tkHelper)}
     ,nil                       // tkHelper
 {$ENDIF}
diff --git a/tools/lazdatadesktop/dicteditor.pp b/tools/lazdatadesktop/dicteditor.pp
index 2da3dd0b9f..108df06307 100644
--- a/tools/lazdatadesktop/dicteditor.pp
+++ b/tools/lazdatadesktop/dicteditor.pp
@@ -18,9 +18,6 @@
  *                                                                         *
  ***************************************************************************
 }
-{$ifdef ver2_2}
-{$define onlyoldobjects}
-{$endif}
 unit dicteditor;
 
 {$mode objfpc}{$H+}
diff --git a/tools/lazdatadesktop/frmgeneratesql.pp b/tools/lazdatadesktop/frmgeneratesql.pp
index e5e13c1cd8..f0f7bdaa5e 100644
--- a/tools/lazdatadesktop/frmgeneratesql.pp
+++ b/tools/lazdatadesktop/frmgeneratesql.pp
@@ -220,11 +220,9 @@ begin
         CreateInsertSQLStrings(FL,MInsert.Lines);
         CreateUpdateSQLStrings(FL,KL,MUpdate.Lines);
         CreateDeleteSQLStrings(KL,MDelete.Lines);
-{$IFNDEF VER2_2}
         If CBIgnoreSelection.Checked  then
           CreateTableSQLStrings(MCreate.Lines)
         else
-{$ENDIF}
           CreateCreateSQLStrings(FL,KL,MCreate.Lines);
         end;
       FSQLGenerated:=True;
@@ -315,9 +313,6 @@ begin
   CLBOptions.Link.TIObject:=FGenerator;
   SEIndent.Link.TIObject:=FGenerator;
   SELineLength.Link.TIObject:=FGenerator;
-{$IFDEF VER2_2}
-  CBIgnoreSelection.Visible:=False;
-{$ENDIF VER2_2}
 end;
 
 procedure TGenerateSQLForm.BGenerateClick(Sender: TObject);
diff --git a/tools/lazdatadesktop/frmmain.pp b/tools/lazdatadesktop/frmmain.pp
index fd27a5d70d..5540872b42 100644
--- a/tools/lazdatadesktop/frmmain.pp
+++ b/tools/lazdatadesktop/frmmain.pp
@@ -18,9 +18,6 @@
  *                                                                         *
  ***************************************************************************
 }
-{$ifdef ver2_2}
-{$define onlyoldobjects}
-{$endif}
 unit frmmain;
 
 {$mode objfpc}{$H+}