projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Well, if we check for a settings version, maybe we should set it too...
[quassel.git]
/
src
/
qtui
/
qtuiapplication.cpp
diff --git
a/src/qtui/qtuiapplication.cpp
b/src/qtui/qtuiapplication.cpp
index
49eecee
..
8acead9
100644
(file)
--- a/
src/qtui/qtuiapplication.cpp
+++ b/
src/qtui/qtuiapplication.cpp
@@
-29,6
+29,7
@@
#include "client.h"
#include "cliparser.h"
#include "qtui.h"
#include "client.h"
#include "cliparser.h"
#include "qtui.h"
+#include "qtuisettings.h"
#include "sessionsettings.h"
QtUiApplication::QtUiApplication(int &argc, char **argv)
#include "sessionsettings.h"
QtUiApplication::QtUiApplication(int &argc, char **argv)
@@
-64,19
+65,24
@@
QtUiApplication::QtUiApplication(int &argc, char **argv)
bool QtUiApplication::init() {
if(Quassel::init()) {
bool QtUiApplication::init() {
if(Quassel::init()) {
-#ifndef Q_WS_MAC
// FIXME: MIGRATION 0.3 -> 0.4: Move database and core config to new location
// Move settings, note this does not delete the old files
// FIXME: MIGRATION 0.3 -> 0.4: Move database and core config to new location
// Move settings, note this does not delete the old files
-#ifdef Q_WS_
WIN
- QSettings
::Format format = QSettings::IniFormat
;
+#ifdef Q_WS_
MAC
+ QSettings
newSettings("quassel-irc.org", "quasselclient")
;
#else
#else
+
+# ifdef Q_WS_WIN
+ QSettings::Format format = QSettings::IniFormat;
+# else
QSettings::Format format = QSettings::NativeFormat;
QSettings::Format format = QSettings::NativeFormat;
-#endif
+# endif
+
QString newFilePath = Quassel::configDirPath() + "quasselclient"
+ ((format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini"));
QSettings newSettings(newFilePath, format);
QString newFilePath = Quassel::configDirPath() + "quasselclient"
+ ((format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini"));
QSettings newSettings(newFilePath, format);
+#endif /* Q_WS_MAC */
- if(newSettings.value("Config/Version").toUInt()
!= 1
) {
+ if(newSettings.value("Config/Version").toUInt()
== 0
) {
qWarning() << "\n\n*** IMPORTANT: Config and data file locations have changed. Attempting to auto-migrate your client settings...";
# ifdef Q_WS_MAC
QString org = "quassel-irc.org";
qWarning() << "\n\n*** IMPORTANT: Config and data file locations have changed. Attempting to auto-migrate your client settings...";
# ifdef Q_WS_MAC
QString org = "quassel-irc.org";
@@
-92,9
+98,17
@@
bool QtUiApplication::init() {
}
qWarning() << "*** Migration completed.\n\n";
}
}
qWarning() << "*** Migration completed.\n\n";
}
-#endif /* !Q_WS_MAC */
+
// MIGRATION end
// MIGRATION end
+ // check settings version
+ // so far, we only have 1
+ QtUiSettings s;
+ if(s.version() != 1) {
+ qCritical() << "Invalid client settings version, terminating!";
+ return false;
+ }
+
// session resume
QtUi *gui = new QtUi();
Client::init(gui);
// session resume
QtUi *gui = new QtUi();
Client::init(gui);