From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Sun, 25 Jan 2009 23:54:36 +0000 (+0100)
Subject: Making Quassel compile on Mac OS _AGAIN_ -.-
X-Git-Tag: 0.4.0~171
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=5080325e7f8c5cf95bbcddf0e2e0cfd2233a5795

Making Quassel compile on Mac OS _AGAIN_ -.-
---

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 92e0908d..aa1b7d48 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -81,7 +81,7 @@ Core::Core() : storage(0) {
       foreach(QString key, oldSettings.allKeys())
         newSettings.setValue(key, oldSettings.value(key));
       newSettings.setValue("Config/Version", 1);
-      qWarning() << "*   Your core settings have been migrated to" << newFilePath;
+      qWarning() << "*   Your core settings have been migrated to" << newSettings.fileName();
 
 #ifndef Q_WS_MAC /* we don't need to move the db and cert for mac */
 #ifdef Q_OS_WIN32
@@ -114,10 +114,10 @@ Core::Core() : storage(0) {
         else
           qWarning() << "!!! Moving your certificate has failed. Please move it manually into" << Quassel::configDirPath();
       }
+#endif /* !Q_WS_MAC */
       qWarning() << "*** Migration completed.\n\n";
     }
   }
-#endif /* !Q_WS_MAC */
   // MIGRATION end
 
   // check settings version
diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp
index c1cf2c99..de9844f2 100644
--- a/src/qtui/qtuiapplication.cpp
+++ b/src/qtui/qtuiapplication.cpp
@@ -94,7 +94,7 @@ bool QtUiApplication::init() {
         foreach(QString key, oldSettings.allKeys())
           newSettings.setValue(key, oldSettings.value(key));
         newSettings.setValue("Config/Version", 1);
-        qWarning() << "*   Your client settings have been migrated to" << newFilePath;
+        qWarning() << "*   Your client settings have been migrated to" << newSettings.fileName();
         qWarning() << "*** Migration completed.\n\n";
       }
     }