diff --git a/CMakeLists.txt b/CMakeLists.txt index 0505b06..102c039 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,7 +122,7 @@ include(BasicConfig) set(CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES "${CONFIGURATION_PACKAGE_SUFFIX}" CACHE STRING "sets the suffix for qtutilities") -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.0.0 REQUIRED) +find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.8.0 REQUIRED) use_qt_utilities() # find passwordfile diff --git a/gui/initiategui.cpp b/gui/initiategui.cpp index 1a0d1e8..154577e 100644 --- a/gui/initiategui.cpp +++ b/gui/initiategui.cpp @@ -33,15 +33,9 @@ int runWidgetsGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs, QApplication application(argc, argv); // restore Qt settings - QtSettings qtSettings; - QSettings settings(QSettings::IniFormat, QSettings::UserScope, QStringLiteral(PROJECT_NAME)); - - // move old config to new location - const QString oldConfig - = QSettings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(), QApplication::applicationName()).fileName(); - QFile::rename(oldConfig, settings.fileName()) || QFile::remove(oldConfig); - settings.sync(); - qtSettings.restore(settings); + auto qtSettings = QtSettings(); + auto settings = QtUtilities::getSettings(QStringLiteral(PROJECT_NAME)); + qtSettings.restore(*settings); qtSettings.apply(); // apply settings specified via command line args @@ -49,7 +43,7 @@ int runWidgetsGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs, LOAD_QT_TRANSLATIONS; // init widgets GUI - MainWindow w(settings, &qtSettings); + auto w = MainWindow(*settings, &qtSettings); w.show(); if (!file.isEmpty()) { w.openFile(file); diff --git a/quickgui/initiatequick.cpp b/quickgui/initiatequick.cpp index 7fd9ed3..4442831 100644 --- a/quickgui/initiatequick.cpp +++ b/quickgui/initiatequick.cpp @@ -79,14 +79,14 @@ int runQuickGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs, c #endif // load settings from configuration file - QSettings settings(QSettings::IniFormat, QSettings::UserScope, QStringLiteral(PROJECT_NAME)); + auto settings = QtUtilities::getSettings(QStringLiteral(PROJECT_NAME)); // load translations LOAD_QT_TRANSLATIONS; // init Quick GUI - QQmlApplicationEngine engine; - Controller controller(settings, file); + auto engine = QQmlApplicationEngine(); + auto controller = Controller(*settings, file); #ifdef Q_OS_ANDROID registerControllerForAndroid(&controller); #endif