walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

GUI: DataDir - use application path if datadir is not set

This commit is contained in:
Daniel Marjamäki 2017-10-07 16:09:14 +02:00
parent 3d353a021d
commit ec55313c28
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gui/mainwindow.cpp
View File

@ -49,6 +49,12 @@
static const QString OnlineHelpURL("http://cppcheck.net/manual.html"); static const QString OnlineHelpURL("http://cppcheck.net/manual.html");
static const QString compile_commands_json("compile_commands.json"); static const QString compile_commands_json("compile_commands.json");
static QString getDataDir(const QSettings *settings) {
const QString dataDir = settings->value("DATADIR", QString()).toString();
const QString appPath = QFileInfo(QCoreApplication::applicationFilePath()).canonicalPath();
return dataDir.isEmpty() ? appPath : dataDir;
}
MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) : MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
mSettings(settings), mSettings(settings),
mApplications(new ApplicationList(this)), mApplications(new ApplicationList(this)),
@ -64,7 +70,7 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
{ {
mUI.setupUi(this); mUI.setupUi(this);
mThread = new ThreadHandler(this); mThread = new ThreadHandler(this);
mThread->setDataDir(mSettings->value("DATADIR", QString()).toString()); mThread->setDataDir(getDataDir(settings));
mUI.mResults->initialize(mSettings, mApplications, mThread); mUI.mResults->initialize(mSettings, mApplications, mThread);
// Filter timer to delay filtering results slightly while typing // Filter timer to delay filtering results slightly while typing