forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renamed ambiguous fields

This commit is contained in:
Basile Burg 2015-02-16 02:56:40 +01:00
parent e618812740
commit 302a758612
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/ce_dmdwrap.pas
View File

@ -207,8 +207,8 @@ type
TPathsOpts = class(TOptsGroup) TPathsOpts = class(TOptsGroup)
private private
fExtraSrcs: TStringList; fExtraSrcs: TStringList;
fIncl: TStringList; fImpMod: TStringList;
fImpt: TStringList; fImpStr: TStringList;
fExcl: TStringList; fExcl: TStringList;
fFname: TCEFilename; fFname: TCEFilename;
fObjDir: TCEPathname; fObjDir: TCEPathname;
@ -225,10 +225,10 @@ type
property Sources: TStringList read fExtraSrcs write setSrcs stored false; deprecated; property Sources: TStringList read fExtraSrcs write setSrcs stored false; deprecated;
property exclusions: TStringList read fExcl write setExcl; property exclusions: TStringList read fExcl write setExcl;
property extraSources: TStringList read fExtraSrcs write setSrcs; property extraSources: TStringList read fExtraSrcs write setSrcs;
property includes: TStringList read fIncl write setIncl stored false; deprecated; property includes: TStringList read fImpMod write setIncl stored false; deprecated;
property imports: TStringList read fImpt write setImpt stored false; deprecated; property imports: TStringList read fImpStr write setImpt stored false; deprecated;
property importModulePaths: TStringList read fIncl write setIncl; property importModulePaths: TStringList read fImpMod write setIncl;
property importStringPaths: TStringList read fImpt write setImpt; property importStringPaths: TStringList read fImpStr write setImpt;
public public
constructor create; constructor create;
destructor destroy; override; destructor destroy; override;
@ -829,14 +829,14 @@ end;
constructor TPathsOpts.create; constructor TPathsOpts.create;
begin begin
fExtraSrcs := TStringList.Create; fExtraSrcs := TStringList.Create;
fIncl := TStringList.Create; fImpMod := TStringList.Create;
fImpt := TStringList.Create; fImpStr := TStringList.Create;
fExcl := TStringList.Create; fExcl := TStringList.Create;
// setSrcs(), setIncl(), etc are not called when reloading from // setSrcs(), setIncl(), etc are not called when reloading from
// a stream but rather the TSgringList.Assign() // a stream but rather the TSgringList.Assign()
fExtraSrcs.OnChange := @strLstChange; fExtraSrcs.OnChange := @strLstChange;
fIncl.OnChange := @strLstChange; fImpMod.OnChange := @strLstChange;
fImpt.OnChange := @strLstChange; fImpStr.OnChange := @strLstChange;
fExcl.OnChange := @strLstChange; fExcl.OnChange := @strLstChange;
end; end;
@ -857,9 +857,9 @@ begin
if not listAsteriskPath(str, aList, dExtList) then if not listAsteriskPath(str, aList, dExtList) then
aList.Add(str); aList.Add(str);
end; end;
for str in fIncl do for str in fImpMod do
aList.Add('-I'+ symbolExpander.get(str)); aList.Add('-I'+ symbolExpander.get(str));
for str in fImpt do for str in fImpStr do
aList.Add('-J'+ symbolExpander.get(str)); aList.Add('-J'+ symbolExpander.get(str));
if fFname <> '' then if fFname <> '' then
aList.Add('-of' + symbolExpander.get(fFname)); aList.Add('-of' + symbolExpander.get(fFname));
@ -875,8 +875,8 @@ begin
begin begin
src := TPathsOpts(aValue); src := TPathsOpts(aValue);
fExtraSrcs.Assign(src.fExtraSrcs); fExtraSrcs.Assign(src.fExtraSrcs);
fIncl.Assign(src.fIncl); fImpMod.Assign(src.fImpMod);
fImpt.Assign(src.fImpt); fImpStr.Assign(src.fImpStr);
fFName := patchPlateformPath(src.fFname); fFName := patchPlateformPath(src.fFname);
fObjDir := patchPlateformPath(src.fObjDir); fObjDir := patchPlateformPath(src.fObjDir);
fExcl.Assign(src.fExcl); fExcl.Assign(src.fExcl);
@ -887,8 +887,8 @@ end;
destructor TPathsOpts.destroy; destructor TPathsOpts.destroy;
begin begin
fExtraSrcs.free; fExtraSrcs.free;
fIncl.free; fImpMod.free;
fImpt.free; fImpStr.free;
fExcl.free; fExcl.free;
inherited; inherited;
end; end;
@ -917,15 +917,15 @@ end;
procedure TPathsOpts.setIncl(aValue: TStringList); procedure TPathsOpts.setIncl(aValue: TStringList);
begin begin
fIncl.Assign(aValue); fImpMod.Assign(aValue);
patchPlateformPaths(fIncl); patchPlateformPaths(fImpMod);
doChanged; doChanged;
end; end;
procedure TPathsOpts.setImpt(aValue: TStringList); procedure TPathsOpts.setImpt(aValue: TStringList);
begin begin
fImpt.Assign(aValue); fImpStr.Assign(aValue);
patchPlateformPaths(fImpt); patchPlateformPaths(fImpStr);
doChanged; doChanged;
end; end;