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

IDEIntf: removed conditionals

Browse Source 
git-svn-id: trunk@27124 -
This commit is contained in:
mattias 2010-08-17 13:24:15 +00:00
parent 3e532ee174
commit fc87d06bd0
3 changed files with 2 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ide/compileroptions.pp
View File

@ -246,7 +246,7 @@ const
ParsedCompilerOptStringNames: array[TParsedCompilerOptString] of string = (
'pcosNone',
'pcosBaseDir',
'pcosBaseDir', // only auto created packages can have macros
'pcosUnitPath',
'pcosIncludePath',
'pcosObjectPath',
@ -258,21 +258,6 @@ const
'pcosCompilerPath',
'pcosDebugPath'
);
ParsedCompOptToConditional: array[TParsedCompilerOptString] of TCOCValueType = (
cocvtNone, // pcosNone
cocvtNone, // pcosBaseDir
cocvtUnitPath, // pcosUnitPath
cocvtIncludePath, // pcosIncludePath
cocvtObjectPath, // pcosObjectPath
cocvtLibraryPath, // pcosLibraryPath
cocvtSrcPath, // pcosSrcPath
cocvtLinkerOptions, // pcosLinkerOptions
cocvtCustomOptions, // pcosCustomOptions
cocvtNone, // pcosOutputDir
cocvtNone, // pcosCompilerPath
cocvtDebugPath // pcosDebugPath
);
InheritedToParsedCompilerOption: array[TInheritedCompilerOption] of
TParsedCompilerOptString = (
pcosNone,

11
ideintf/objinspstrconsts.pas
View File

@ -479,16 +479,7 @@ resourcestring
srVK_NONE = 'none';
srkm_Alt = 'Alt';
srkm_Ctrl = 'Ctrl';
pirsUnit = 'Unit';
pirsResult = 'Result';
pirsUnitSearchPath = 'Unit search path';
pirsUnitSourceSearchPath = 'Unit source search path';
pirsIncludeSearchPath = 'Include search path';
pirsObjectSearchPath = 'Object search path';
pirsLibrarySearchPath = 'Library search path';
pirsDebugSearchPath = 'Debug search path';
pirsLinkerOptions = 'Linker options';
pirsCustomOptions = 'Custom options';
pirsUnit = 'Pascal unit';
oisIndexOutOfBounds = 'Index out of bounds';
oisNotSupported = 'not supported';
oisUnableToChangeParentOfControlToNewParent = 'Unable to change parent of '

99
ideintf/projectintf.pas
View File

@ -50,55 +50,6 @@ type
rtRes // fpc resources
);
TCOCNodeType = (
cocntNone,
cocntIf,
cocntIfdef,
cocntIfNdef,
cocntElseIf,
cocntElse,
cocntAddValue,
cocntSetValue
);
TCOCNodeTypes = set of TCOCNodeType;
TCOCValueType = (
cocvtNone,
cocvtResult,
cocvtUnitPath,
cocvtSrcPath,
cocvtIncludePath,
cocvtObjectPath,
cocvtLibraryPath,
cocvtDebugPath,
cocvtLinkerOptions,
cocvtCustomOptions
);
TCOCValueTypes = set of TCOCValueType;
const
COCNodeTypeNames: array[TCOCNodeType] of string = (
'None',
'If',
'Ifdef',
'IfNdef',
'ElseIf',
'Else',
'AddValue',
'SetValue'
);
COCValueTypeNames: array[TCOCValueType] of string = (
'None',
'Result',
'UnitPath',
'SrcPath',
'IncludePath',
'ObjectPath',
'LibraryPath',
'DebugPath',
'LinkerOptions',
'CustomOptions'
);
type
{ TLazBuildMacro
@ -811,10 +762,6 @@ function ProjectFlagsToStr(Flags: TProjectFlags): string;
function StrToProjectSessionStorage(const s: string): TProjectSessionStorage;
function CompilationExecutableTypeNameToType(const s: string
): TCompilationExecutableType;
function COCNodeTypeNameToType(const s: string): TCOCNodeType;
function COCNodeTypeLocalizedName(const nt: TCOCNodeType): string;
function COCValueTypeNameToType(const s: string): TCOCValueType;
function COCValueTypeLocalizedName(const vt: TCOCValueType): string;
procedure RegisterProjectFileDescriptor(FileDesc: TProjectFileDescriptor);
procedure RegisterProjectDescriptor(ProjDesc: TProjectDescriptor);
@ -830,52 +777,6 @@ procedure RegisterProjectDescriptor(ProjDesc: TProjectDescriptor;
implementation
function COCNodeTypeNameToType(const s: string): TCOCNodeType;
begin
for Result:=Low(TCOCNodeType) to High(TCOCNodeType) do
if SysUtils.CompareText(s,COCNodeTypeNames[Result])=0 then exit;
Result:=cocntNone;
end;
function COCNodeTypeLocalizedName(const nt: TCOCNodeType): string;
begin
case nt of
cocntNone: Result:=sccsILEdtNone;
cocntIf: Result:=liisIf;
cocntIfdef: Result:=liisIfDef;
cocntIfNdef: Result:=liisIfNDef;
cocntElseIf: Result:=liisElseIf;
cocntElse: Result:=liisElse;
cocntAddValue: Result:=liisAddValue;
cocntSetValue: Result:=liisSetValue;
else Result:='?';
end;
end;
function COCValueTypeNameToType(const s: string): TCOCValueType;
begin
for Result:=Low(TCOCValueType) to High(TCOCValueType) do
if SysUtils.CompareText(s,COCValueTypeNames[Result])=0 then exit;
Result:=cocvtNone;
end;
function COCValueTypeLocalizedName(const vt: TCOCValueType): string;
begin
case vt of
cocvtNone: Result:=sccsILEdtNone;
cocvtResult: Result:=pirsResult;
cocvtUnitPath: Result:=pirsUnitSearchPath;
cocvtSrcPath: Result:=pirsUnitSourceSearchPath;
cocvtIncludePath: Result:=pirsIncludeSearchPath;
cocvtObjectPath: Result:=pirsObjectSearchPath;
cocvtLibraryPath: Result:=pirsLibrarySearchPath;
cocvtDebugPath: Result:=pirsDebugSearchPath;
cocvtLinkerOptions: Result:=pirsLinkerOptions;
cocvtCustomOptions: Result:=pirsCustomOptions;
else Result:='?';
end;
end;
procedure RegisterProjectFileDescriptor(FileDesc: TProjectFileDescriptor);
begin
RegisterProjectFileDescriptor(FileDesc,FileDescGroupName);