refactor(core,ui): move cacheLocation() to Core::Application

src/libs/core/application.cpp

@@ -39,6 +39,7 @@
 #include <QNetworkProxy>
 #include <QNetworkReply>
 #include <QScopedPointer>
+#include <QStandardPaths>
 #include <QSysInfo>
 #include <QThread>
 
@@ -133,6 +134,15 @@ FileManager *Application::fileManager() const
     return m_fileManager;
 }
 
+QString Application::cacheLocation()
+{
+#ifndef PORTABLE_BUILD
+    return QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
+#else
+    return QCoreApplication::applicationDirPath() + QLatin1String("/cache");
+#endif
+}
+
 QVersionNumber Application::version()
 {
     return QVersionNumber::fromString(QCoreApplication::applicationVersion());

src/libs/core/application.h

@@ -65,6 +65,7 @@ public:
     Registry::DocsetRegistry *docsetRegistry();
     FileManager *fileManager() const;
 
+    static QString cacheLocation();
     static QVersionNumber version();
 
 public slots:

src/libs/core/filemanager.cpp

@@ -22,13 +22,14 @@
 
 #include "filemanager.h"
 
+#include "application.h"
+
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QDir>
 #include <QFileInfo>
 #include <QFutureWatcher>
 #include <QLoggingCategory>
-#include <QStandardPaths>
 
 #include <QtConcurrent>
 
@@ -41,7 +42,7 @@ FileManager::FileManager(QObject *parent)
 {
     // Ensure that cache location exists.
     // TODO: Check for errors.
-    QDir().mkpath(cacheLocation());
+    QDir().mkpath(Application::cacheLocation());
 }
 
 bool FileManager::removeRecursively(const QString &path)
@@ -81,12 +82,3 @@ bool FileManager::removeRecursively(const QString &path)
 
     return true;
 }
-
-QString FileManager::cacheLocation()
-{
-#ifndef PORTABLE_BUILD
-    return QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
-#else
-    return QCoreApplication::applicationDirPath() + QLatin1String("/cache");
-#endif
-}

src/libs/core/filemanager.h

@@ -36,8 +36,6 @@ public:
     explicit FileManager(QObject *parent = nullptr);
 
     bool removeRecursively(const QString &path);
-
-    static QString cacheLocation();
 };
 
 } // namespace Core

src/libs/core/settings.cpp

@@ -23,7 +23,6 @@
 #include "settings.h"
 
 #include "application.h"
-#include "filemanager.h"
 
 #include <QCoreApplication>
 #include <QDir>
@@ -55,7 +54,7 @@ Settings::Settings(QObject *parent) :
 
     // Enable local storage due to https://github.com/zealdocs/zeal/issues/872.
     QWebSettings *webSettings = QWebSettings::globalSettings();
-    webSettings->setLocalStoragePath(FileManager::cacheLocation() + QLatin1String("/localStorage"));
+    webSettings->setLocalStoragePath(Application::cacheLocation() + QLatin1String("/localStorage"));
     webSettings->setAttribute(QWebSettings::LocalStorageEnabled, true);
 
     load();

src/libs/ui/docsetsdialog.cpp

@@ -856,5 +856,5 @@ int DocsetsDialog::percent(qint64 fraction, qint64 total)
 
 QString DocsetsDialog::cacheLocation(const QString &fileName)
 {
-    return QDir(Core::FileManager::cacheLocation()).filePath(fileName);
+    return QDir(Core::Application::cacheLocation()).filePath(fileName);
 }