flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-23 05:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

MS' review items from here ( refs #478 )

Browse Source 
https://dev.vatsim-germany.org/issues/478#note-3
This commit is contained in:
Klaus Basan
2015-10-22 10:11:33 +02:00
committed by Mathew Sutcliffe
parent c83213e25e
commit 1e57ce7ecb
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackcore/blackcore.pro
View File

@@ -22,13 +22,13 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) {
DEFINES += LOG_IN_FILE BUILD_BLACKCORE_LIB DEFINES += LOG_IN_FILE BUILD_BLACKCORE_LIB
HEADERS += *.h \ HEADERS += *.h
$$PWD/settings/*.h \ HEADERS += $$PWD/settings/*.h
$$PWD/data/*.h HEADERS += $$PWD/data/*.h
SOURCES += *.cpp \ SOURCES += *.cpp
# $$PWD/settings/*.cpp \ # SOURCES += $$PWD/settings/*.cpp
$$PWD/data/*.cpp SOURCES += $$PWD/data/*.cpp
LIBS *= -lvatlib2 LIBS *= -lvatlib2

16
src/blackmisc/project.cpp
View File

@@ -255,7 +255,7 @@ namespace BlackMisc
return QProcessEnvironment::systemEnvironment().value(envVarPrivateSetupDir()); return QProcessEnvironment::systemEnvironment().value(envVarPrivateSetupDir());
} }
QString getApplicationDir_() QString getApplicationDirImpl()
{ {
QFileInfo executable(QCoreApplication::applicationFilePath()); QFileInfo executable(QCoreApplication::applicationFilePath());
QDir p(executable.dir()); QDir p(executable.dir());
@@ -264,11 +264,11 @@ namespace BlackMisc
const QString &CProject::getApplicationDir() const QString &CProject::getApplicationDir()
{ {
static const QString s(getApplicationDir_()); static const QString s(getApplicationDirImpl());
return s; return s;
} }
QString getSwiftResourceDir_() QString getSwiftResourceDirImpl()
{ {
QDir dir(CProject::getApplicationDir()); QDir dir(CProject::getApplicationDir());
if (dir.cdUp()) { return dir.absolutePath(); } if (dir.cdUp()) { return dir.absolutePath(); }
@@ -277,7 +277,7 @@ namespace BlackMisc
const QString &CProject::getSwiftResourceDir() const QString &CProject::getSwiftResourceDir()
{ {
static const QString s(getSwiftResourceDir_()); static const QString s(getSwiftResourceDirImpl());
return s; return s;
} }
@@ -287,7 +287,7 @@ namespace BlackMisc
return dir; return dir;
} }
QString getSwiftStaticDbFilesDir_() QString getSwiftStaticDbFilesDirImpl()
{ {
QString d(CProject::getSwiftResourceDir()); QString d(CProject::getSwiftResourceDir());
if (d.isEmpty()) { return ""; } if (d.isEmpty()) { return ""; }
@@ -298,11 +298,11 @@ namespace BlackMisc
const QString &CProject::getSwiftStaticDbFilesDir() const QString &CProject::getSwiftStaticDbFilesDir()
{ {
static QString s(getSwiftResourceDir_()); static QString s(getSwiftResourceDirImpl());
return s; return s;
} }
QString getImagesDir_() QString getImagesDirImpl()
{ {
QString d(CProject::getSwiftResourceDir()); QString d(CProject::getSwiftResourceDir());
if (d.isEmpty()) return ""; if (d.isEmpty()) return "";
@@ -311,7 +311,7 @@ namespace BlackMisc
const QString &CProject::getImagesDir() const QString &CProject::getImagesDir()
{ {
static const QString s(getImagesDir_()); static const QString s(getImagesDirImpl());
return s; return s;
} }