X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;h=b7a6fbfb51c31205655c5e2b13b94e8875573233;hp=af4c69b607938f67e00c1154bb4b7fc4a35b6883;hb=877a724cbb82479a3a260cf291a1d46b32cc0fa6;hpb=4e43a17088e8ff76c220bd8b4ebf37d9dbb4863a

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index af4c69b6..b7a6fbfb 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -416,22 +416,13 @@ QString Quassel::configDirPath()
 }
 
 
-void Quassel::setDataDirPaths(const QStringList &paths) {
-    instance()->_dataDirPaths = paths;
-}
-
-
 QStringList Quassel::dataDirPaths()
 {
-    return instance()->_dataDirPaths;
-}
-
+    if (!instance()->_dataDirPaths.isEmpty())
+        return instance()->_dataDirPaths;
 
-QStringList Quassel::findDataDirPaths()
-{
-    // TODO Qt5
-    // We don't use QStandardPaths for now, as we still need to provide fallbacks for Qt4 and
-    // want to stay consistent.
+    // TODO: Migrate to QStandardPaths (will require moving of the sqlite database,
+    //       or a fallback for it being in the config dir)
 
     QStringList dataDirNames;
 #ifdef Q_OS_WIN
@@ -485,6 +476,7 @@ QStringList Quassel::findDataDirPaths()
 
     dataDirNames.removeDuplicates();
 
+    instance()->_dataDirPaths = dataDirNames;
     return dataDirNames;
 }