New TAppInfo methods to get config file names. Updated other units to use.

This avoids duplication of code across units.

Author: DelphiDabbler

Src/FirstRun.UInstallInfo.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2008-2016, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -170,13 +170,12 @@ constructor TInstallInfo.Create;
 
 function TInstallInfo.CurrentCommonConfigFileName: string;
 begin
-  Result := IncludeTrailingPathDelimiter(TAppInfo.CommonAppDir)
-    + 'Common.config';
+  Result := TAppInfo.AppConfigFileName;
 end;
 
 class function TInstallInfo.CurrentUserConfigFileName: string;
 begin
-  Result := MakeFullUserPath(UserConfigFileNames[CurrentVersionID]);
+  Result := TAppInfo.UserConfigFileName;
 end;
 
 class function TInstallInfo.CurrentUserDatabaseDir: string;

Src/UAppInfo.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2005-2016, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -97,6 +97,12 @@   TAppInfo = class(TNoConstructObject)
       {Returns fully specified name of CodeSnip's help file.
         @return Name of help file.
       }
+    class function AppConfigFileName: string;
+      {Returns fully specified name of application config file.
+      }
+    class function UserConfigFileName: string;
+      {Returns fully specified name of per-user config file.
+      }
     class function ProgramReleaseInfo: string;
       {Gets information about the current program release. Includes any special
       build information if present in version information.
@@ -146,6 +152,11 @@ implementation
 
 { TAppInfo }
 
+class function TAppInfo.AppConfigFileName: string;
+begin
+  Result := CommonAppDir + '\Common.config';
+end;
+
 class function TAppInfo.AppDataDir: string;
   {Returns the directory where CodeSnip stores the "database" files.
     @return Full path to database sub directory.
@@ -347,6 +358,11 @@ class function TAppInfo.UserAppDir: string;
   {$ENDIF}
 end;
 
+class function TAppInfo.UserConfigFileName: string;
+begin
+  Result := UserAppDir + '\User.config';
+end;
+
 class function TAppInfo.UserDataDir: string;
   {Returns the directory where CodeSnip stores the user's "database" files.
     @return Full path to database sub directory.

Src/USettings.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2006-2016, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -595,9 +595,9 @@ function TIniSettingsBase.StorageName(
 begin
   case Storage of
     ssUser:
-      Result := TAppInfo.UserAppDir + '\User.config';
+      Result := TAppInfo.UserConfigFileName;
     ssCommon:
-      Result := TAppInfo.CommonAppDir + '\Common.config';
+      Result := TAppInfo.AppConfigFileName;
     else
       raise EBug.Create(ClassName + '.StorageName: unknown storage type');
   end;