From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 26 Jul 2018 20:07:24 +0000 (+0200)
Subject: qt4-b-gone: Initialize data dir paths on demand
X-Git-Tag: test-travis-01~183
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=877a724cbb82479a3a260cf291a1d46b32cc0fa6;hp=4e43a17088e8ff76c220bd8b4ebf37d9dbb4863a

qt4-b-gone: Initialize data dir paths on demand

Since special handling for KDE4 data locations was removed, it is
no longer required to set the paths from the outside. Simply
initialize the paths on first use.
---

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;
 }
 
diff --git a/src/common/quassel.h b/src/common/quassel.h
index fc40bbb4..097481d1 100644
--- a/src/common/quassel.h
+++ b/src/common/quassel.h
@@ -218,14 +218,6 @@ public slots:
 signals:
     void messageLogged(const QDateTime &timeStamp, const QString &msg);
 
-protected:
-    static void setDataDirPaths(const QStringList &paths);
-    static QStringList findDataDirPaths();
-
-    friend class CoreApplication;
-    friend class QtUiApplication;
-    friend class MonolithicApplication;
-
 private:
     void setupEnvironment();
     void registerMetaTypes();
diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp
index 3f03f09f..608d39ad 100644
--- a/src/qtui/qtuiapplication.cpp
+++ b/src/qtui/qtuiapplication.cpp
@@ -35,8 +35,6 @@
 QtUiApplication::QtUiApplication(int &argc, char **argv)
     : QApplication(argc, argv)
 {
-    Quassel::setDataDirPaths(Quassel::findDataDirPaths());
-
     connect(this, &QGuiApplication::commitDataRequest, this, &QtUiApplication::commitData, Qt::DirectConnection);
     connect(this, &QGuiApplication::saveStateRequest, this, &QtUiApplication::saveState, Qt::DirectConnection);