diff --git a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp index 332e58d1d..968a67142 100644 --- a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp @@ -1,7 +1,7 @@ #include "cards_display_settings.h" CardsDisplaySettings::CardsDisplaySettings(const QString &settingPath, QObject *parent) - : SettingsManager(settingPath + "cards.ini", "cards", QString(), parent) + : SettingsManager(settingPath + "cards_display.ini", "cards", QString(), parent) { } diff --git a/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp b/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp index cd6553a26..078e5ac16 100644 --- a/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp +++ b/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp @@ -249,7 +249,7 @@ static void migrateCardsDisplaySettings(const QString &settingsPath, QSettings & return; } - QSettings cardsIni(settingsPath + "cards.ini", QSettings::IniFormat); + QSettings cardsIni(settingsPath + "cards_display.ini", QSettings::IniFormat); for (const auto &key : cardsRootKeys) { if (globalIni.contains(key)) { cardsIni.setValue(key, globalIni.value(key)); diff --git a/tests/settings/settings_migration_test.cpp b/tests/settings/settings_migration_test.cpp index 5c8b41264..00e5c65c1 100644 --- a/tests/settings/settings_migration_test.cpp +++ b/tests/settings/settings_migration_test.cpp @@ -206,9 +206,9 @@ TEST_F(SettingsMigrationTest, MigratesAllSettingsGroups) ASSERT_EQ(readFromIni("personal.ini", "home/background"), QVariant("custom_bg")); ASSERT_EQ(readFromIni("personal.ini", "tipOfDay/showTips"), QVariant(false)); - ASSERT_TRUE(fileExists("cards.ini")); - ASSERT_EQ(readFromIni("cards.ini", "cards/displaycardnames"), QVariant(false)); - ASSERT_EQ(readFromIni("cards.ini", "cards/tapanimation"), QVariant(true)); + ASSERT_TRUE(fileExists("cards_display.ini")); + ASSERT_EQ(readFromIni("cards_display.ini", "cards/displaycardnames"), QVariant(false)); + ASSERT_EQ(readFromIni("cards_display.ini", "cards/tapanimation"), QVariant(true)); ASSERT_TRUE(fileExists("interface.ini")); ASSERT_EQ(readFromIni("interface.ini", "interface/usetearoffmenus"), QVariant(true)); @@ -318,11 +318,11 @@ TEST_F(SettingsMigrationTest, CardsKeysKeepGroupPrefix) ASSERT_TRUE(SettingsMigration::migrateSettingsFromGlobalIni(settingsPath)); ASSERT_TRUE(fileExists("global.ini.old")); - ASSERT_TRUE(fileExists("cards.ini")); + ASSERT_TRUE(fileExists("cards_display.ini")); // "cards/displaycardnames" should be stored with its group prefix - ASSERT_EQ(readFromIni("cards.ini", "cards/displaycardnames"), QVariant(false)); + ASSERT_EQ(readFromIni("cards_display.ini", "cards/displaycardnames"), QVariant(false)); // "interface/..." keys should keep their full path - ASSERT_EQ(readFromIni("cards.ini", "interface/deckeditorbannercardcomboboxvisible"), QVariant(true)); + ASSERT_EQ(readFromIni("cards_display.ini", "interface/deckeditorbannercardcomboboxvisible"), QVariant(true)); } TEST_F(SettingsMigrationTest, LegacyMigrationIsIdempotent)