Browse Source

refactor(settings): replace getAppCacheDirPath() with Paths

reviewable/pr6649/r5
sudden6 7 years ago
parent
commit
93504f4255
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
  1. 27
      src/persistence/settings.cpp
  2. 1
      src/persistence/settings.h
  3. 7
      src/widget/form/settings/advancedform.cpp

27
src/persistence/settings.cpp

@ -728,33 +728,6 @@ QString Settings::getSettingsDirPath() const @@ -728,33 +728,6 @@ QString Settings::getSettingsDirPath() const
return QFileInfo{settingsFile}.dir().absolutePath();
}
/**
* @brief Get path to directory, where the application cache are stored.
* @return Path to application cache, ends with a directory separator.
*/
QString Settings::getAppCacheDirPath() const
{
QMutexLocker locker{&bigLock};
if (makeToxPortable)
return qApp->applicationDirPath() + QDir::separator();
// workaround for https://bugreports.qt-project.org/browse/QTBUG-38845
#ifdef Q_OS_WIN
return QDir::cleanPath(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)
+ QDir::separator() + "AppData" + QDir::separator() + "Roaming"
+ QDir::separator() + "tox")
+ QDir::separator();
#elif defined(Q_OS_OSX)
return QDir::cleanPath(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)
+ QDir::separator() + "Library" + QDir::separator()
+ "Application Support" + QDir::separator() + "Tox")
+ QDir::separator();
#else
return QDir::cleanPath(QStandardPaths::writableLocation(QStandardPaths::CacheLocation))
+ QDir::separator();
#endif
}
const QList<DhtServer>& Settings::getDhtServerList() const
{
QMutexLocker locker{&bigLock};

1
src/persistence/settings.h

@ -139,7 +139,6 @@ public: @@ -139,7 +139,6 @@ public:
~Settings() override;
static Settings& getInstance();
QString getSettingsDirPath() const;
QString getAppCacheDirPath() const;
void createSettingsDir();
void createPersonal(QString basename);

7
src/widget/form/settings/advancedform.cpp

@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
#include "src/core/core.h"
#include "src/core/coreav.h"
#include "src/nexus.h"
#include "src/persistence/paths.h"
#include "src/persistence/profile.h"
#include "src/persistence/settings.h"
#include "src/widget/gui.h"
@ -107,8 +108,7 @@ void AdvancedForm::on_btnExportLog_clicked() @@ -107,8 +108,7 @@ void AdvancedForm::on_btnExportLog_clicked()
return;
}
QString logFileDir = Settings::getInstance().getAppCacheDirPath();
QString logfile = logFileDir + "qtox.log";
QString logfile = Settings::getInstance().getPaths().getLogFilePath();
QFile file(logfile);
if (file.exists()) {
@ -126,8 +126,7 @@ void AdvancedForm::on_btnExportLog_clicked() @@ -126,8 +126,7 @@ void AdvancedForm::on_btnExportLog_clicked()
void AdvancedForm::on_btnCopyDebug_clicked()
{
QString logFileDir = Settings::getInstance().getAppCacheDirPath();
QString logfile = logFileDir + "qtox.log";
QString logfile = Settings::getInstance().getPaths().getLogFilePath();
QFile file(logfile);
if (!file.exists()) {

Loading…
Cancel
Save