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

ide, tools, examples: remove ver2_2_x defines

Browse Source 
git-svn-id: trunk@36370 -
This commit is contained in:
paul 2012-03-27 07:19:59 +00:00
parent 223ba36920
commit 9226386149
7 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/trayicon/frmtest.pas
View File

@ -71,11 +71,7 @@ uses Windows;
{$endif}
{$IFDEF Darwin}
uses
{$ifdef ver2_2_0}
FPCMacOSAll;
{$else}
MacOSAll;
{$endif}
{$ENDIF}
{ TfrmTrayTest }

5
ide/include/win/lazbaseconf.inc
View File

@ -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';

4
ide/lazarus.pp
View File

@ -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,

7
ideintf/propedits.pp
View File

@ -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}

3
tools/lazdatadesktop/dicteditor.pp
View File

@ -18,9 +18,6 @@
* *
***************************************************************************
}
{$ifdef ver2_2}
{$define onlyoldobjects}
{$endif}
unit dicteditor;
{$mode objfpc}{$H+}

5
tools/lazdatadesktop/frmgeneratesql.pp
View File

@ -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);

3
tools/lazdatadesktop/frmmain.pp
View File

@ -18,9 +18,6 @@
* *
***************************************************************************
}
{$ifdef ver2_2}
{$define onlyoldobjects}
{$endif}
unit frmmain;
{$mode objfpc}{$H+}