From 419a23183ff0abfe6fa3da163f46a6b91c76168d Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Sat, 2 Jan 2021 17:12:15 +0100 Subject: [PATCH] Rename SettingsDb -> StellaDb . --- .../sqlite/{SettingsDb.cxx => StellaDb.cxx} | 18 +++++++++--------- .../sqlite/{SettingsDb.hxx => StellaDb.hxx} | 12 ++++++------ src/common/repository/sqlite/module.mk | 2 +- src/emucore/OSystem.cxx | 12 ++++++------ src/emucore/OSystem.hxx | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) rename src/common/repository/sqlite/{SettingsDb.cxx => StellaDb.cxx} (91%) rename src/common/repository/sqlite/{SettingsDb.hxx => StellaDb.hxx} (87%) diff --git a/src/common/repository/sqlite/SettingsDb.cxx b/src/common/repository/sqlite/StellaDb.cxx similarity index 91% rename from src/common/repository/sqlite/SettingsDb.cxx rename to src/common/repository/sqlite/StellaDb.cxx index 54903e1f6..514d0b835 100644 --- a/src/common/repository/sqlite/SettingsDb.cxx +++ b/src/common/repository/sqlite/StellaDb.cxx @@ -17,7 +17,7 @@ #include -#include "SettingsDb.hxx" +#include "StellaDb.hxx" #include "Logger.hxx" #include "SqliteError.hxx" #include "repository/KeyValueRepositoryNoop.hxx" @@ -34,14 +34,14 @@ namespace { } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -SettingsDb::SettingsDb(const string& databaseDirectory, const string& databaseName) +StellaDb::StellaDb(const string& databaseDirectory, const string& databaseName) : myDatabaseDirectory{databaseDirectory}, myDatabaseName{databaseName} { } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void SettingsDb::initialize() +void StellaDb::initialize() { try { myDb = make_unique(myDatabaseDirectory, myDatabaseName); @@ -75,7 +75,7 @@ void SettingsDb::initialize() } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void SettingsDb::initializeDb() const +void StellaDb::initializeDb() const { FilesystemNode legacyConfigFile{myDatabaseDirectory}; legacyConfigFile /= "stellarc"; @@ -87,7 +87,7 @@ void SettingsDb::initializeDb() const legacyPropertyFile /= "stella.pro"; if (legacyConfigDatabase.exists() && legacyConfigDatabase.isFile()) - importOldSettingsDB(legacyConfigDatabase); + importOldStellaDb(legacyConfigDatabase); else if (legacyConfigFile.exists() && legacyConfigFile.isFile()) importStellarc(legacyConfigFile); @@ -98,7 +98,7 @@ void SettingsDb::initializeDb() const } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void SettingsDb::importStellarc(const FilesystemNode& node) const +void StellaDb::importStellarc(const FilesystemNode& node) const { Logger::info("importing old settings from " + node.getPath()); @@ -106,7 +106,7 @@ void SettingsDb::importStellarc(const FilesystemNode& node) const } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void SettingsDb::importOldSettingsDB(const FilesystemNode& node) const { +void StellaDb::importOldStellaDb(const FilesystemNode& node) const { Logger::info("importing old settings from " + node.getPath()); try { @@ -126,7 +126,7 @@ void SettingsDb::importOldSettingsDB(const FilesystemNode& node) const { } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void SettingsDb::importOldPropset(const FilesystemNode& node) const +void StellaDb::importOldPropset(const FilesystemNode& node) const { Logger::info("importing old game properties from " + node.getPath()); @@ -157,7 +157,7 @@ void SettingsDb::importOldPropset(const FilesystemNode& node) const } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void SettingsDb::migrate() const +void StellaDb::migrate() const { Int32 version = myDb->getUserVersion(); switch (version) { diff --git a/src/common/repository/sqlite/SettingsDb.hxx b/src/common/repository/sqlite/StellaDb.hxx similarity index 87% rename from src/common/repository/sqlite/SettingsDb.hxx rename to src/common/repository/sqlite/StellaDb.hxx index 2352f05d1..3ef9122eb 100644 --- a/src/common/repository/sqlite/SettingsDb.hxx +++ b/src/common/repository/sqlite/StellaDb.hxx @@ -15,8 +15,8 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#ifndef SETTINGS_DB_HXX -#define SETTINGS_DB_HXX +#ifndef STELLA_DB_HXX +#define STELLA_DB_HXX #include "bspf.hxx" #include "SqliteDatabase.hxx" @@ -24,11 +24,11 @@ #include "repository/CompositeKeyValueRepository.hxx" #include "FSNode.hxx" -class SettingsDb +class StellaDb { public: - SettingsDb(const string& databaseDirectory, const string& databaseName); + StellaDb(const string& databaseDirectory, const string& databaseName); void initialize(); @@ -42,7 +42,7 @@ class SettingsDb void initializeDb() const; void importStellarc(const FilesystemNode& node) const; - void importOldSettingsDB(const FilesystemNode& node) const; + void importOldStellaDb(const FilesystemNode& node) const; void importOldPropset(const FilesystemNode& node) const; void migrate() const; @@ -58,4 +58,4 @@ class SettingsDb unique_ptr myPropertyRepository; }; -#endif // SETTINGS_DB_HXX +#endif // STELLA_DB_HXX diff --git a/src/common/repository/sqlite/module.mk b/src/common/repository/sqlite/module.mk index bc814bb12..2bf7f680c 100644 --- a/src/common/repository/sqlite/module.mk +++ b/src/common/repository/sqlite/module.mk @@ -4,7 +4,7 @@ MODULE_OBJS := \ src/common/repository/sqlite/AbstractKeyValueRepositorySqlite.o \ src/common/repository/sqlite/KeyValueRepositorySqlite.o \ src/common/repository/sqlite/CompositeKeyValueRepositorySqlite.o \ - src/common/repository/sqlite/SettingsDb.o \ + src/common/repository/sqlite/StellaDb.o \ src/common/repository/sqlite/SqliteDatabase.o \ src/common/repository/sqlite/SqliteStatement.o \ src/common/repository/sqlite/SqliteTransaction.o diff --git a/src/emucore/OSystem.cxx b/src/emucore/OSystem.cxx index 6d41b1120..c762d273e 100644 --- a/src/emucore/OSystem.cxx +++ b/src/emucore/OSystem.cxx @@ -40,7 +40,7 @@ #include "Widget.hxx" #endif #include "KeyValueRepositorySqlite.hxx" - #include "SettingsDb.hxx" + #include "StellaDb.hxx" #include "FSNode.hxx" #include "MD5.hxx" @@ -223,9 +223,9 @@ void OSystem::loadConfig(const Settings::Options& options) if(!myHomeDir.isDirectory()) myHomeDir.makeDir(); - mySettingsDb = make_shared(myBaseDir.getPath(), "stella"); - mySettingsDb->initialize(); - myConfigFile = FilesystemNode(mySettingsDb->databaseFileName()); + myStellaDb = make_shared(myBaseDir.getPath(), "stella"); + myStellaDb->initialize(); + myConfigFile = FilesystemNode(myStellaDb->databaseFileName()); mySettings->setRepository(getSettingsRepository()); myPropSet->setRepository(getPropertyRepository()); @@ -881,12 +881,12 @@ void OSystem::mainLoop() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - shared_ptr OSystem::getSettingsRepository() { - return shared_ptr(mySettingsDb, &mySettingsDb->settingsRepository()); + return shared_ptr(myStellaDb, &myStellaDb->settingsRepository()); } shared_ptr OSystem::getPropertyRepository() { - return shared_ptr(mySettingsDb, &mySettingsDb->propertyRepository()); + return shared_ptr(myStellaDb, &myStellaDb->propertyRepository()); } diff --git a/src/emucore/OSystem.hxx b/src/emucore/OSystem.hxx index a0c845eed..d6120639f 100644 --- a/src/emucore/OSystem.hxx +++ b/src/emucore/OSystem.hxx @@ -48,7 +48,7 @@ class AudioSettings; #ifdef PNG_SUPPORT class PNGLibrary; #endif - class SettingsDb; + class StellaDb; #include @@ -568,7 +568,7 @@ class OSystem static string ourOverrideBaseDir; static bool ourOverrideBaseDirWithApp; - shared_ptr mySettingsDb; + shared_ptr myStellaDb; private: /**