From 21b9667c5ded97e18c89f40dbcb1198e3158652a Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Sat, 2 Jan 2021 19:39:26 -0330 Subject: [PATCH] Fix minor compile warning in Xcode (unused variable). --- src/common/repository/sqlite/StellaDb.cxx | 12 ++++++------ src/macos/stella.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/repository/sqlite/StellaDb.cxx b/src/common/repository/sqlite/StellaDb.cxx index 27a943ddb..f9b4cce17 100644 --- a/src/common/repository/sqlite/StellaDb.cxx +++ b/src/common/repository/sqlite/StellaDb.cxx @@ -35,12 +35,6 @@ namespace { constexpr Int32 CURRENT_VERSION = 1; - - #ifdef BSPF_WINDOWS - constexpr char LEGACY_SETTINGS_FILE[] = "stella.ini"; - #else - constexpr char LEGACY_SETTINGS_FILE[] = "stellarc"; - #endif } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -112,6 +106,12 @@ void StellaDb::importOldSettings() mySettingsRepository->save(SettingsRepositoryMACOS().load()); #else + #if defined(BSPF_WINDOWS) + constexpr char LEGACY_SETTINGS_FILE[] = "stella.ini"; + #else + constexpr char LEGACY_SETTINGS_FILE[] = "stellarc"; + #endif + FilesystemNode legacyConfigFile{myDatabaseDirectory}; legacyConfigFile /= LEGACY_SETTINGS_FILE; diff --git a/src/macos/stella.xcodeproj/project.pbxproj b/src/macos/stella.xcodeproj/project.pbxproj index a9e2aa020..82ec37473 100644 --- a/src/macos/stella.xcodeproj/project.pbxproj +++ b/src/macos/stella.xcodeproj/project.pbxproj @@ -1922,12 +1922,12 @@ 2D6050C60898771C00C6DE89 /* macos */ = { isa = PBXGroup; children = ( - E0D4153A25A120340031A8D6 /* SettingsRepositoryMACOS.hxx */, - E0D4153B25A120340031A8D6 /* SettingsRepositoryMACOS.mm */, DC21E5B921CA903E007D0E1A /* OSystemMACOS.cxx */, DC21E5BA21CA903E007D0E1A /* OSystemMACOS.hxx */, DC21E5BB21CA903E007D0E1A /* SerialPortMACOS.cxx */, DC21E5BC21CA903E007D0E1A /* SerialPortMACOS.hxx */, + E0D4153A25A120340031A8D6 /* SettingsRepositoryMACOS.hxx */, + E0D4153B25A120340031A8D6 /* SettingsRepositoryMACOS.mm */, ); path = macos; sourceTree = "";