Sat, 26 Mar 2022 21:53:00 +0100
Removed unneeded functions.
src/bmsapp.cpp | file | annotate | diff | comparison | revisions | |
src/bmsapp.h | file | annotate | diff | comparison | revisions | |
src/database/database.cpp | file | annotate | diff | comparison | revisions | |
src/main.cpp | file | annotate | diff | comparison | revisions |
--- a/src/bmsapp.cpp Sat Mar 26 21:13:17 2022 +0100 +++ b/src/bmsapp.cpp Sat Mar 26 21:53:00 2022 +0100 @@ -20,36 +20,8 @@ #include "MainWindow.h" -bool Bmsapp::ensureDirectoriesExist() -{ - QDir resourceDir = Bmsapp::getResourceDir(); - bool resourceDirSuccess = resourceDir.exists(); - if (!resourceDirSuccess) { - QString errMsg{ - QObject::tr("Resource directory \"%1\" is missing. Some features will be unavailable.").arg(resourceDir.path()) - }; - qCritical() << Q_FUNC_INFO << errMsg; - } - - return resourceDirSuccess; -} - - -QDir Bmsapp::getResourceDir() -{ - QString dir = qApp->applicationDirPath(); - - dir = QString(CONFIGDATADIR); - - qDebug() << "Resource dir" << dir; - return dir; -} - - - bool Bmsapp::initialize(bool useDevelop) { - ensureDirectoriesExist(); readsettings(); // QLocale german(QLocale::German,QLocale::Germany); @@ -62,7 +34,6 @@ } - void Bmsapp::cleanup() { qDebug() << "BMSapp is cleaning up."; @@ -72,7 +43,6 @@ } - void Bmsapp::readsettings() { QSettings settings(QSettings::IniFormat, QSettings::UserScope, "mbse", "bmsapp"); @@ -129,7 +99,6 @@ } - void Bmsapp::writesettings() { QSettings settings(QSettings::IniFormat, QSettings::UserScope, "mbse", "bmsapp"); @@ -155,7 +124,6 @@ } - int Bmsapp::run(bool useDevelop, bool startConfig) { int rc = 0; @@ -177,4 +145,3 @@ } -
--- a/src/bmsapp.h Sat Mar 26 21:13:17 2022 +0100 +++ b/src/bmsapp.h Sat Mar 26 21:53:00 2022 +0100 @@ -66,8 +66,6 @@ public: Bmsapp(); - static QDir getResourceDir(); /* System wide resources */ - /** * @brief Blocking call that executes the application. * @return Exit code from the application. @@ -78,12 +76,6 @@ private: /** - * @brief Ensure some directories and files exist. - * @return true if all is ok. - */ - static bool ensureDirectoriesExist(); - - /** * @brief Run before showing MainWindow, does all system setup. * @return false if anything goes awry, true if it's ok to start MainWindow. */
--- a/src/database/database.cpp Sat Mar 26 21:13:17 2022 +0100 +++ b/src/database/database.cpp Sat Mar 26 21:53:00 2022 +0100 @@ -55,7 +55,7 @@ return false; } } - + void DataBase::closeDataBase() { qDebug() << "Database close called";
--- a/src/main.cpp Sat Mar 26 21:13:17 2022 +0100 +++ b/src/main.cpp Sat Mar 26 21:53:00 2022 +0100 @@ -29,19 +29,12 @@ QApplication app(argc, argv); QString locale = QLocale::system().name(); - app.setApplicationName( -#ifdef QT_DEBUG - "bmsapp-debug" -#else - "bmsapp" -#endif - ); + app.setApplicationName("bmsapp"); app.setApplicationVersion(VERSIONSTRING); app.setOrganizationName("mbse"); /* Stylesheet setup */ QFile f(":/qdarkstyle/theme/style.qss"); - //QFile f(":darkorange.qss"); //QFile f(":dummy"); if (!f.exists()) { printf("Unable to set stylesheet, file not found\n");