Make Quasel compile on mac and win again.

Curse you evil #ifdefs!111

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 5014073..d9e180e 100644 (file)
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -255,8 +255,8 @@ QString Quassel::configDirPath() {
     QSettings s(format, QSettings::UserScope, QCoreApplication::organizationDomain(), buildInfo().applicationName);
     QFileInfo fileInfo(s.fileName());
     _configDirPath = fileInfo.dir().absolutePath();
     QSettings s(format, QSettings::UserScope, QCoreApplication::organizationDomain(), buildInfo().applicationName);
     QFileInfo fileInfo(s.fileName());
     _configDirPath = fileInfo.dir().absolutePath();

-  }

 #endif /* Q_WS_MAC */
 #endif /* Q_WS_MAC */

+  }

 
   if(!_configDirPath.endsWith(QDir::separator()) && !_configDirPath.endsWith('/'))
     _configDirPath += QDir::separator();
 
   if(!_configDirPath.endsWith(QDir::separator()) && !_configDirPath.endsWith('/'))
     _configDirPath += QDir::separator();


@@ -286,7 +286,7 @@ QStringList Quassel::findDataDirPaths() const {
   // Provide a fallback
   // FIXME fix this for win and mac!
 #ifdef Q_OS_WIN32
   // Provide a fallback
   // FIXME fix this for win and mac!
 #ifdef Q_OS_WIN32

-    dataDirNames << qgetenv("APPDATA") + QCoreApplication::organizationDomain();
+    dataDirNames << qgetenv("APPDATA") + QCoreApplication::organizationDomain()

                  << QCoreApplication::applicationDirPath();
 #elif defined Q_WS_MAC
     dataDirNames << QDir::homePath() + "/Library/Application Support/Quassel/"
                  << QCoreApplication::applicationDirPath();
 #elif defined Q_WS_MAC
     dataDirNames << QDir::homePath() + "/Library/Application Support/Quassel/"