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

Rename xbus to xswiftbus

Browse Source 
Summary:
I wanted to rename xbus because its relation to //swift// is not immediately clear from the name.

xswiftbus seems reasonable.

Reviewers: #swift_pilot_client, kbasan

Reviewed By: kbasan

Subscribers: kbasan, jenkins

Tags: #swift_pilot_client

Differential Revision: https://dev.swift-project.org/D14
This commit is contained in:
Mathew Sutcliffe
2017-05-05 23:07:11 +01:00
parent 83adc66ec7
commit 4a4dea8d4d
53 changed files with 442 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/registermetadata.cpp
View File

@@ -100,7 +100,7 @@ namespace BlackMisc
Simulation::registerMetadata();
Weather::registerMetadata();
// needed by XBus proxy class
// needed by XSwiftBus proxy class
qRegisterMetaType<CSequence<double>>();
qRegisterMetaType<CSequence<double>>("CDoubleSequence");
qDBusRegisterMetaType<CSequence<double>>();

2
src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
View File

@@ -138,7 +138,7 @@ namespace BlackMisc
CAircraftModelList CAircraftModelLoaderXPlane::performParsing(const QString &rootDirectory, const QStringList &excludeDirectories)
{
CAircraftModelList allModels;
allModels.push_back(parseCslPackages(CXPlaneUtil::xbusLegacyDir(rootDirectory), excludeDirectories));
allModels.push_back(parseCslPackages(CXPlaneUtil::xswiftbusLegacyDir(rootDirectory), excludeDirectories));
allModels.push_back(parseCslPackages(rootDirectory, excludeDirectories));
allModels.push_back(parseFlyableAirplanes(rootDirectory, excludeDirectories));
return allModels;

16
src/blackmisc/simulation/xplane/xplaneutil.cpp
View File

@@ -119,25 +119,25 @@ namespace BlackMisc
return QStringList();
}
QString CXPlaneUtil::xbusLegacyDir(const QString &rootDir)
QString CXPlaneUtil::xswiftbusLegacyDir(const QString &rootDir)
{
static const QString legacyPath("/Resources/plugins/xbus/LegacyData");
static const QString legacyPath("/Resources/plugins/xswiftbus/LegacyData");
// Return the first non empty path, we can find.
if (!rootDir.isEmpty())
{
const QString xbusLegacy = CFileUtils::appendFilePaths(rootDir, legacyPath);
if (QDir(xbusLegacy).exists())
const QString xswiftbusLegacy = CFileUtils::appendFilePaths(rootDir, legacyPath);
if (QDir(xswiftbusLegacy).exists())
{
return xbusLegacy;
return xswiftbusLegacy;
}
}
for (auto func : {&CXPlaneUtil::xplane11Dir, &CXPlaneUtil::xplane10Dir, &CXPlaneUtil::xplane9Dir})
{
const QString xbusLegacy = CFileUtils::appendFilePaths(func(), legacyPath);
if (QDir(xbusLegacy).exists())
const QString xswiftbusLegacy = CFileUtils::appendFilePaths(func(), legacyPath);
if (QDir(xswiftbusLegacy).exists())
{
return xbusLegacy;
return xswiftbusLegacy;
}
}
return {};

4
src/blackmisc/simulation/xplane/xplaneutil.h
View File

@@ -48,8 +48,8 @@ namespace BlackMisc
//! Exclude directories for models
static QStringList xplaneModelExcludeDirectoryPatterns();
//! XBus legacy directory
static QString xbusLegacyDir(const QString &rootDir);
//! XSwiftBus legacy directory
static QString xswiftbusLegacyDir(const QString &rootDir);
private:
//! Concatenates dirs for used OS