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

refs #507, adjusted resource subproject

Browse Source
This commit is contained in:
Klaus Basan
2015-11-17 02:23:04 +01:00
committed by Mathew Sutcliffe
parent 6dd8fb333e
commit 02733cacb7
15 changed files with 109 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackmisc/project.cpp
View File

@@ -324,7 +324,12 @@ namespace BlackMisc
QString getSwiftResourceDirImpl()
{
QDir dir(CProject::getApplicationDir());
if (dir.cdUp()) { return dir.absolutePath(); }
if (dir.cdUp())
{
Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
return dir.absolutePath();
}
Q_ASSERT_X(false, Q_FUNC_INFO, "missing dir");
return "";
}
@@ -344,22 +349,23 @@ namespace BlackMisc
{
QString d(CProject::getSwiftResourceDir());
if (d.isEmpty()) { return ""; }
QDir dir(d);
if (dir.cd("swiftDB")) { return dir.absolutePath(); }
return "";
QDir dir(CFileUtils::appendFilePaths(d, "shared/dbdata"));
Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
return dir.absolutePath();
}
const QString &CProject::getSwiftStaticDbFilesDir()
{
static QString s(getSwiftResourceDirImpl());
static QString s(getSwiftStaticDbFilesDirImpl());
return s;
}
QString getImagesDirImpl()
{
QString d(CProject::getSwiftResourceDir());
if (d.isEmpty()) return "";
return CFileUtils::appendFilePaths(d, "data/images");
QDir dir(CFileUtils::appendFilePaths(d, "data/images"));
Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
return dir.absolutePath();
}
const QString &CProject::getImagesDir()