From 692ccc133bc7c4af6461382bf11efb7bc5063116 Mon Sep 17 00:00:00 2001 From: Gres Date: Sun, 25 Oct 2015 13:56:56 +0300 Subject: [PATCH] Relative paths now relative to app.exe instead of current dir. --- RecognizerHelper.cpp | 3 +++ TranslatorHelper.cpp | 2 ++ Updater.cpp | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/RecognizerHelper.cpp b/RecognizerHelper.cpp index 6547efb..8510e14 100644 --- a/RecognizerHelper.cpp +++ b/RecognizerHelper.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include "RecognizerHelper.h" @@ -10,6 +11,8 @@ RecognizerHelper::RecognizerHelper () #ifdef Q_OS_LINUX QDir settingDir = QFileInfo (QSettings ().fileName ()).dir (); fileName_ = settingDir.absoluteFilePath (fileName_); +#else + fileName_ = QApplication::applicationDirPath () + QDir::separator () + fileName_; #endif } diff --git a/TranslatorHelper.cpp b/TranslatorHelper.cpp index f79ddc4..cabb379 100644 --- a/TranslatorHelper.cpp +++ b/TranslatorHelper.cpp @@ -1,12 +1,14 @@ #include #include #include +#include #include "TranslatorHelper.h" #include "Settings.h" TranslatorHelper::TranslatorHelper () : translatorsDir_ ("translators"), currentIndex_ (0) { + translatorsDir_ = QApplication::applicationDirPath () + QDir::separator () + translatorsDir_; } void TranslatorHelper::setEnabledTranslators (const QStringList &enabled) const { diff --git a/Updater.cpp b/Updater.cpp index ff74312..102fdd1 100644 --- a/Updater.cpp +++ b/Updater.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "Updater.h" #include "StAssert.h" @@ -44,7 +45,7 @@ Updater::Updater (QObject *parent) : QObject (parent), network_ (new QNetworkAccessManager (this)), componentsUpdating_ (0) { - updatesFileName_ = "updates.json"; + updatesFileName_ = QApplication::applicationDirPath () + QDir::separator () + "updates.json"; backupSuffix_ = "_backup"; connect (network_, SIGNAL (finished (QNetworkReply *)), SLOT (replyFinished (QNetworkReply *)));