paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-11 16:19:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

removed $IFDEF VER1 from Salvatore

Browse Source 
git-svn-id: trunk@7475 -
This commit is contained in:
vincents 2005-08-03 20:14:56 +00:00
parent 2dfbcbf1ec
commit e91c979c4e
13 changed files with 11 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/componentpalette.pas
View File

@ -39,7 +39,7 @@ interface
uses
Classes, SysUtils, LCLProc, Controls, Dialogs, Graphics, ExtCtrls, Buttons,
Menus, LResources, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF},
Menus, LResources, AVL_Tree,
PropEdits, FormEditingIntf,
{$IFDEF CustomIDEComps}
CustomIDEComps,

6
ide/customformeditor.pp
View File

@ -40,7 +40,7 @@ uses
{$ENDIF}
// LCL+FCL
Classes, SysUtils, TypInfo, Math,
{$IFNDEF Ver1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF},
AVL_Tree,
LCLProc, Graphics, Controls, Forms, Menus, Dialogs,
// components
PropEdits, ObjectInspector, IDECommands,
@ -1733,10 +1733,6 @@ begin
Result:=AClassName;
if (length(Result)>1) and (Result[1]='T') then
Result:=RightStr(Result,length(Result)-1);
{$IfDef VER1_0}
//make it more presentable
Result := Result[1] + lowercase(Copy(Result,2,length(Result)));
{$EndIf}
Result:=Result+IntToStr(i);
while (j>=0)
and (AnsiCompareText(Result,OwnerComponent.Components[j].Name)<>0) do

2
ide/dialogprocs.pas
View File

@ -38,7 +38,7 @@ interface
uses
Classes, SysUtils, LCLProc, LResources, Forms, Controls, Dialogs, FileUtil,
CodeCache, CodeToolManager, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF},
CodeCache, CodeToolManager, AVL_Tree,
IDEProcs, LazarusIDEStrConsts;
type

2
ide/filereferencelist.pas
View File

@ -39,7 +39,7 @@ unit FileReferenceList;
interface
uses
Classes, SysUtils, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, FileUtil,
Classes, SysUtils, AVL_Tree, FileUtil,
IDEProcs;
type

14
ide/ideprocs.pp
View File

@ -208,11 +208,7 @@ implementation
uses
Dos
{$IfNDef Win32}
{$IFDEF Ver1_0}
,Linux
{$ELSE}
,Unix,BaseUnix
{$ENDIF}
{$EndIf};
function AddToRecentList(const s: string; RecentList: TStrings;
@ -1285,7 +1281,7 @@ begin
{$IFDEF Win32}
OldAttr:=FileGetAttr(Filename);
{$ELSE}
{$IFDEF Ver1_0}FStat{$ELSE}FpStat{$ENDIF}(Filename,OldInfo);
FpStat(Filename,OldInfo);
{$ENDIF}
if not FileIsSymlink(Filename) then begin
@ -1307,8 +1303,7 @@ begin
{$IFDEF Win32}
FileSetAttr(FileName,OldAttr);
{$ELSE}
{$IFDEF Ver1_0}Chmod{$ELSE}FpChmod{$ENDIF}(Filename,
{$IFDEF VER1_0}OldInfo.Mode{$ELSE} OldInfo.st_Mode{$endif} and (STAT_IRWXO+STAT_IRWXG+STAT_IRWXU
FpChmod(Filename, OldInfo.st_Mode and (STAT_IRWXO+STAT_IRWXG+STAT_IRWXU
+STAT_ISUID+STAT_ISGID+STAT_ISVTX));
{$ENDIF}
@ -2052,7 +2047,7 @@ begin
{$IFDEF Win32}
OldAttr:=FileGetAttr(SrcFilename);
{$ELSE}
{$IFDEF Ver1_0}FStat{$ELSE}FpStat{$ENDIF}(SrcFilename,OldInfo);
FpStat(SrcFilename,OldInfo);
{$ENDIF}
//writeln('CopyFileWithMethods ',SrcFilename,' ',DestFilename);
@ -2078,8 +2073,7 @@ begin
{$IFDEF Win32}
FileSetAttr(DestFileName,OldAttr);
{$ELSE}
{$IFDEF Ver1_0}Chmod{$ELSE}FpChmod{$ENDIF}(DestFilename,
{$IFDEF VER1_0}OldInfo.Mode{$ELSE} OldInfo.st_Mode{$endif} and (STAT_IRWXO+STAT_IRWXG+STAT_IRWXU
FpChmod(DestFilename, OldInfo.st_Mode and (STAT_IRWXO+STAT_IRWXG+STAT_IRWXU
+STAT_ISUID+STAT_ISGID+STAT_ISVTX));
{$ENDIF}

4
ide/include/darwin/lazconf.inc
View File

@ -30,11 +30,7 @@
{Should become unit Unix in the future. For both Linux and FreeBSD}
uses
Dos,
{$IFNDEF VER1_0}
BaseUnix, Unix;
{$ELSE}
linux;
{$ENDIF}
function GetDefaultTargetOS: string;
begin

4
ide/include/freebsd/lazconf.inc
View File

@ -30,11 +30,7 @@
{Should become unit Unix in the future. For both Linux and FreeBSD}
uses
Dos,
{$IFNDEF VER1_0}
BaseUnix, Unix;
{$ELSE}
Linux;
{$ENDIF}
function GetDefaultTargetOS: string;
begin

4
ide/include/linux/lazconf.inc
View File

@ -28,11 +28,7 @@
}
uses
Dos,
{$IFNDEF VER1_0}
Unix, BaseUnix;
{$ELSE}
Linux;
{$ENDIF}
function GetDefaultTargetOS: string;
begin

2
ide/lazarusmanager.pas
View File

@ -299,9 +299,7 @@ end;
procedure TLazarusProcess.Execute;
begin
FProcess.Execute;
{$IFNDEF VER1_0}
Sleep(2000);
{$ENDIF}
if Assigned(FOnStart) then
FOnStart(Self);
end;

10
ide/main.pp
View File

@ -66,7 +66,7 @@ uses
Forms, Buttons, Menus, FileUtil, Controls, GraphType, Graphics, ExtCtrls,
Dialogs, InterfaceBase,
// codetools
{$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, Laz_XMLCfg,
AVL_Tree, Laz_XMLCfg,
CodeToolsStructs, CodeToolManager, CodeCache, DefineTemplates,
// IDE interface
AllIDEIntf, ObjectInspector, PropEdits, MacroIntf, IDECommands, SrcEditorIntf,
@ -6861,7 +6861,6 @@ procedure TMainIDE.DoRestart;
StartLazProcess: TProcess;
ExeName: string;
begin
{$IFNDEF VER1_0}
StartLazProcess := TProcess.Create(nil);
try
// TODO: use the target directory, where the new startlazarus is
@ -6879,17 +6878,10 @@ procedure TMainIDE.DoRestart;
finally
StartLazProcess.Free;
end;
{$ENDIF}
end;
var CanClose: boolean;
begin
{$IFDEF VER1_0}
if not StartedByStartLazarus then begin
DebugLn('Restarting Lazarus not supported, if compiled with fpc 1.0.x');
exit;
end;
{$ENDIF}
CanClose:=true;
MainIDEBar.OnCloseQuery(Self, CanClose);
if not CanClose then exit;

2
ide/mainbase.pas
View File

@ -58,7 +58,7 @@ uses
{$ENDIF}
Classes, LCLType, LCLIntf, StdCtrls, Buttons, Menus, ComCtrls, SysUtils,
Controls, Graphics, ExtCtrls, Dialogs, FileUtil, Forms, CodeToolManager,
CodeCache, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, SynEditKeyCmds,
CodeCache, AVL_Tree, SynEditKeyCmds,
// IDE
LazConf, LazarusIDEStrConsts, SrcEditorIntf,
ProjectDefs, Project, PublishModule, BuildLazDialog, Compiler, LazIDEIntf,

2
ide/mainintf.pas
View File

@ -62,7 +62,7 @@ uses
{$ENDIF}
Classes, LCLType, LCLIntf, StdCtrls, Buttons, Menus, ComCtrls, SysUtils,
Controls, Graphics, ExtCtrls, Dialogs, FileUtil, Forms, CodeToolManager,
CodeCache, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, SynEditKeyCmds,
CodeCache, AVL_Tree, SynEditKeyCmds,
// IDE
ObjectInspector,
LazConf, LazarusIDEStrConsts, MacroIntf,

9
ide/todolist.pp
View File

@ -106,9 +106,7 @@ var
implementation
uses
{$ifndef ver1_0}
StrUtils,
{$endif}
FileUtil;
Type
@ -542,13 +540,6 @@ Var
TodoFLag := Flag;
Result := Pos(UpperCase(Flag),UpperCase(TokenString)) > 1;
end;
{$ifdef ver1_0}
//fpc 1.0.x has no strutils unit.
Function AnsiStartsText(const ASubText, AText: string): Boolean;
begin
Result:=Copy(AText,1,Length(AsubText))=ASubText;
end;
{$endif}
begin
if IsTodoFlag(cTodoFlag) or IsTodoFlag(cAltTodoFlag) then
begin