Don't tinker with config and data files on Mac for now

[quassel.git] / src / qtui / qtuiapplication.cpp

diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp
index d9165ba..49eecee 100644 (file)
--- a/src/qtui/qtuiapplication.cpp
+++ b/src/qtui/qtuiapplication.cpp
@@ -64,6 +64,7 @@ QtUiApplication::QtUiApplication(int &argc, char **argv)
 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
 #ifdef Q_WS_WIN
@@ -75,7 +76,7 @@ bool QtUiApplication::init() {
     + ((format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini"));
     QSettings newSettings(newFilePath, format);
 
-    if(newSettings.value("General/Version").toUInt() != 1) {
+    if(newSettings.value("Config/Version").toUInt() != 1) {
       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";
@@ -91,7 +92,7 @@ bool QtUiApplication::init() {
       }
       qWarning() << "*** Migration completed.\n\n";
     }
-
+#endif /* !Q_WS_MAC */
     // MIGRATION end
 
     // session resume
@@ -111,6 +112,7 @@ QtUiApplication::~QtUiApplication() {
 }
 
 void QtUiApplication::commitData(QSessionManager &manager) {
+  Q_UNUSED(manager)
   _aboutToQuit = true;
 }