X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=1b75f29b435623f3b142668791a071e42d641df5;hp=41139dd5e7c35f8f341c99ba6421d65434a5064c;hb=a3aaabf6254c8c5439af8982cc613c4ced3f50ed;hpb=8ff5e8deb3662e1b540574e8f7a07d39edcf737e

diff --git a/src/common/util.cpp b/src/common/util.cpp
index 41139dd5..1b75f29b 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -19,13 +19,14 @@
  ***************************************************************************/
 
 #include "util.h"
-#include "global.h"
 
 #include <QCoreApplication>
 #include <QDebug>
 #include <QTextCodec>
 #include <QTranslator>
 
+#include "quassel.h"
+
 class QMetaMethod;
 
 QString nickFromMask(QString mask) {
@@ -124,7 +125,7 @@ uint editingDistance(const QString &s1, const QString &s2) {
 	min = deleteChar;
       else
 	min = insertChar;
-      
+
       if(s1[i-1] == s2[j-1]) {
 	uint inheritChar = matrix[i-1][j-1];
 	if(inheritChar < min)
@@ -144,9 +145,10 @@ QByteArray methodName(const QMetaMethod &method) {
 
 QDir quasselDir() {
   QString quasselDir;
-  if(Global::parser.isSet("datadir")) {
-    quasselDir = Global::parser.value("datadir");
+  if(Quassel::isOptionSet("datadir")) {
+    quasselDir = Quassel::optionValue("datadir");
   } else {
+    // FIXME use QDesktopServices
 #ifdef Q_OS_WIN32
     quasselDir = qgetenv("APPDATA") + "/quassel/";
 #elif defined Q_WS_MAC
@@ -179,7 +181,7 @@ void loadTranslation(const QLocale &locale) {
 
   if(locale.language() == QLocale::C)
     return;
-  
+
   qtTranslator->load(QString(":i18n/qt_%1").arg(locale.name()));
   quasselTranslator->load(QString(":i18n/quassel_%1").arg(locale.name()));