Skip to content

Commit 63bf432

Browse files
author
delphidabbler
committed
Make processing of user config file versions earlier then v9 available in portable edition
1 parent 4f02d2c commit 63bf432

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

Src/FirstRun.UConfigFile.pas

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,13 @@ TUserConfigFileUpdater = class(TConfigFileUpdater)
8787
/// <summary>Deletes any highlighter preferences.</summary>
8888
/// <remarks>Standard edition only.</remarks>
8989
procedure DeleteHighligherPrefs;
90+
{$ENDIF}
9091
/// <summary>Updates Prefs:CodeGen section from format prior to version 9
9192
/// to version 9 and later format.</summary>
92-
/// <remarks>Standard edition only.</remarks>
9393
procedure UpdateCodeGenEntries;
9494
/// <summary>Deletes unused key that determines detail pane index.
9595
/// </summary>
96-
/// <remarks>Standard edition only.</remarks>
9796
procedure DeleteDetailsPaneIndex;
98-
{$ENDIF}
9997
/// <summary>Deletes proxy server section.</summary>
10098
procedure DeleteProxyServerSection;
10199
/// <summary>Deletes unused Prefs:News section.</summary>
@@ -288,14 +286,12 @@ procedure TUserConfigFileUpdater.CreateDefaultCodeGenEntries;
288286
SetIniString('Prefs:CodeGen', 'Warning7.MinCompiler', '20.00', CfgFileName);
289287
end;
290288

291-
{$IFNDEF PORTABLE}
292289
procedure TUserConfigFileUpdater.DeleteDetailsPaneIndex;
293290
begin
294291
if not TFile.Exists(CfgFileName, False) then
295292
CreateNewFile;
296293
DeleteIniKey('MainWindow', 'DetailTab', CfgFileName);
297294
end;
298-
{$ENDIF}
299295

300296
{$IFNDEF PORTABLE}
301297
procedure TUserConfigFileUpdater.DeleteHighligherPrefs;
@@ -398,7 +394,6 @@ procedure TUserConfigFileUpdater.Stamp;
398394
);
399395
end;
400396

401-
{$IFNDEF PORTABLE}
402397
procedure TUserConfigFileUpdater.UpdateCodeGenEntries;
403398
begin
404399
// Key that determines if warnings are emitted changes from SwitchOffWarnings
@@ -418,7 +413,6 @@ procedure TUserConfigFileUpdater.UpdateCodeGenEntries;
418413
else
419414
SetIniInt('Prefs:CodeGen', 'EmitWarnDirs', 0, CfgFileName);
420415
end;
421-
{$ENDIF}
422416

423417
procedure TUserConfigFileUpdater.UpdateFindXRefs;
424418
begin

Src/FirstRun.UMain.pas

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,11 @@ procedure TFirstRun.UpdateUserCfgFile(out Changes: TFirstRunCfgChangeSet);
220220
// we rely on this for portable version.
221221
fUserConfigFile.CreateDefaultCodeGenEntries;
222222

223-
{$IFNDEF PORTABLE}
224223
if fUserConfigFile.FileVer < 9 then
225224
begin
226225
fUserConfigFile.DeleteDetailsPaneIndex;
227226
fUserConfigFile.UpdateCodeGenEntries;
228227
end;
229-
{$ENDIF}
230228

231229
if fUserConfigFile.FileVer < 11 then
232230
fUserConfigFile.RenameMainWindowSection;

0 commit comments

Comments
 (0)