ide: define ide's settingsName in a single location and use that definition is settin...

diff --git a/ide/src/IDESettings.ec b/ide/src/IDESettings.ec
index d37ede5..bf7f56b 100644 (file)
--- a/ide/src/IDESettings.ec
+++ b/ide/src/IDESettings.ec
@@ -237,14 +237,16 @@ CompilerConfig MakeDefaultCompiler(const char * name, bool readOnly)
    return defaultCompiler;
 }
 
-class IDESettingsContainer : GlobalSettings
-{
 #ifdef SETTINGS_TEST
-   settingsName = "ecereIDESettingsTest";
+define settingsName = "ecereIDE-SettingsTest";
 #else
-   settingsName = "ecereIDE";
+define ideSettingsName = "ecereIDE";
 #endif
 
+class IDESettingsContainer : GlobalSettings
+{
+   settingsName = ideSettingsName;
+
    virtual void OnLoad(GlobalSettingsData data);
 
    char moduleLocation[MAX_LOCATION];
@@ -270,12 +272,14 @@ private:
 
          strcpy(configFilePath, path);
          PathCat(configFilePath, "Data");
-         PathCat(configFilePath, "ecereIDE.ini");
+         PathCat(configFilePath, ideSettingsName);
+         ChangeExtension(configFilePath, "ini", configFilePath);
 
          strcpy(defaultConfigFilePath, path);
          PathCat(defaultConfigFilePath, "App");
          PathCat(defaultConfigFilePath, "DefaultData");
-         PathCat(defaultConfigFilePath, "ecereIDE.ini");
+         PathCat(defaultConfigFilePath, ideSettingsName);
+         ChangeExtension(defaultConfigFilePath, "ini", defaultConfigFilePath);
 
          if(FileExists(defaultConfigFilePath))
          {

diff --git a/ide/src/OldIDESettings.ec b/ide/src/OldIDESettings.ec
index ea261a8..5d4aa39 100644 (file)
--- a/ide/src/OldIDESettings.ec
+++ b/ide/src/OldIDESettings.ec
@@ -28,11 +28,7 @@ define makeDefaultCommand = (__runtimePlatform == win32) ? "mingw32-make" :
 
 class OldIDESettings : GlobalAppSettings
 {
-#ifdef SETTINGS_TEST
-   settingsName = "ecereIDESettingsTest";
-#else
-   settingsName = "ecereIDE";
-#endif
+   settingsName = ideSettingsName;
 
    List<CompilerConfig> compilerConfigs { };
    Array<String> recentFiles { };