diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro index b62e37631..78380b89a 100644 --- a/src/blackcore/blackcore.pro +++ b/src/blackcore/blackcore.pro @@ -22,13 +22,13 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) { DEFINES += LOG_IN_FILE BUILD_BLACKCORE_LIB -HEADERS += *.h \ - $$PWD/settings/*.h \ - $$PWD/data/*.h +HEADERS += *.h +HEADERS += $$PWD/settings/*.h +HEADERS += $$PWD/data/*.h -SOURCES += *.cpp \ -# $$PWD/settings/*.cpp \ - $$PWD/data/*.cpp +SOURCES += *.cpp +# SOURCES += $$PWD/settings/*.cpp +SOURCES += $$PWD/data/*.cpp LIBS *= -lvatlib2 diff --git a/src/blackmisc/project.cpp b/src/blackmisc/project.cpp index 609872e42..63bb83a4b 100644 --- a/src/blackmisc/project.cpp +++ b/src/blackmisc/project.cpp @@ -255,7 +255,7 @@ namespace BlackMisc return QProcessEnvironment::systemEnvironment().value(envVarPrivateSetupDir()); } - QString getApplicationDir_() + QString getApplicationDirImpl() { QFileInfo executable(QCoreApplication::applicationFilePath()); QDir p(executable.dir()); @@ -264,11 +264,11 @@ namespace BlackMisc const QString &CProject::getApplicationDir() { - static const QString s(getApplicationDir_()); + static const QString s(getApplicationDirImpl()); return s; } - QString getSwiftResourceDir_() + QString getSwiftResourceDirImpl() { QDir dir(CProject::getApplicationDir()); if (dir.cdUp()) { return dir.absolutePath(); } @@ -277,7 +277,7 @@ namespace BlackMisc const QString &CProject::getSwiftResourceDir() { - static const QString s(getSwiftResourceDir_()); + static const QString s(getSwiftResourceDirImpl()); return s; } @@ -287,7 +287,7 @@ namespace BlackMisc return dir; } - QString getSwiftStaticDbFilesDir_() + QString getSwiftStaticDbFilesDirImpl() { QString d(CProject::getSwiftResourceDir()); if (d.isEmpty()) { return ""; } @@ -298,11 +298,11 @@ namespace BlackMisc const QString &CProject::getSwiftStaticDbFilesDir() { - static QString s(getSwiftResourceDir_()); + static QString s(getSwiftResourceDirImpl()); return s; } - QString getImagesDir_() + QString getImagesDirImpl() { QString d(CProject::getSwiftResourceDir()); if (d.isEmpty()) return ""; @@ -311,7 +311,7 @@ namespace BlackMisc const QString &CProject::getImagesDir() { - static const QString s(getImagesDir_()); + static const QString s(getImagesDirImpl()); return s; }