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

Harmonize swift domain names to org.swift-project.*

Browse Source
This commit is contained in:
Roland Winklmeier
2015-04-15 21:57:38 +02:00
committed by Michał Garapich
parent f9de3ad409
commit 57b5e1421c
22 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/context_application.h
View File

@@ -24,10 +24,10 @@
//! @{ //! @{
//! DBus interface for context //! DBus interface for context
#define BLACKCORE_CONTEXTAPPLICATION_INTERFACENAME "org.swift.pilotclient.BlackCore.ContextApplication" #define BLACKCORE_CONTEXTAPPLICATION_INTERFACENAME "org.swift-project.blackcore.contextapplication"
//! DBus object path for context //! DBus object path for context
#define BLACKCORE_CONTEXTAPPLICATION_OBJECTPATH "/Application" #define BLACKCORE_CONTEXTAPPLICATION_OBJECTPATH "/application"
//! @} //! @}

4
src/blackcore/context_audio.h
View File

@@ -26,10 +26,10 @@
//! @{ //! @{
//! DBus interface for context //! DBus interface for context
#define BLACKCORE_CONTEXTAUDIO_INTERFACENAME "org.swift.pilotclient.BlackCore.ContextAudio" #define BLACKCORE_CONTEXTAUDIO_INTERFACENAME "org.swift-project.blackcore.contextaudio"
//! DBus object path for context //! DBus object path for context
#define BLACKCORE_CONTEXTAUDIO_OBJECTPATH "/Audio" #define BLACKCORE_CONTEXTAUDIO_OBJECTPATH "/audio"
//! @} //! @}

4
src/blackcore/context_network.h
View File

@@ -27,10 +27,10 @@
//! @{ //! @{
//! DBus interface for context //! DBus interface for context
#define BLACKCORE_CONTEXTNETWORK_INTERFACENAME "org.swift.pilotclient.BlackCore.ContextNetwork" #define BLACKCORE_CONTEXTNETWORK_INTERFACENAME "org.swift-project.blackcore.contextnetwork"
//! DBus object path for context //! DBus object path for context
#define BLACKCORE_CONTEXTNETWORK_OBJECTPATH "/Network" #define BLACKCORE_CONTEXTNETWORK_OBJECTPATH "/network"
//! @} //! @}

4
src/blackcore/context_ownaircraft.h
View File

@@ -22,10 +22,10 @@
//! @{ //! @{
//! DBus interface for context //! DBus interface for context
#define BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME "org.swift.pilotclient.BlackCore.ContextOwnAircraft" #define BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME "org.swift-project.blackcore.contextownaircraft"
//! DBus object path for context //! DBus object path for context
#define BLACKCORE_CONTEXTOWNAIRCRAFT_OBJECTPATH "/OwnAircraft" #define BLACKCORE_CONTEXTOWNAIRCRAFT_OBJECTPATH "/ownaircraft"
//! @} //! @}

4
src/blackcore/context_settings.h
View File

@@ -26,10 +26,10 @@
//! @{ //! @{
//! DBus interface for context //! DBus interface for context
#define BLACKCORE_CONTEXTSETTINGS_INTERFACENAME "org.swift.pilotclient.BlackCore.ContextSettings" #define BLACKCORE_CONTEXTSETTINGS_INTERFACENAME "org.swift-project.blackcore.contextsettings"
//! DBus object path for context //! DBus object path for context
#define BLACKCORE_CONTEXTSETTINGS_OBJECTPATH "/Settings" #define BLACKCORE_CONTEXTSETTINGS_OBJECTPATH "/settings"
//! @} //! @}

4
src/blackcore/context_simulator.h
View File

@@ -16,10 +16,10 @@
//! @{ //! @{
//! DBus interface for context //! DBus interface for context
#define BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME "org.swift.pilotclient.BlackCore.ContextSimulator" #define BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME "org.swift-project.blackcore.contextsimulator"
//! DBus object path for context //! DBus object path for context
#define BLACKCORE_CONTEXTSIMULATOR_OBJECTPATH "/Simulator" #define BLACKCORE_CONTEXTSIMULATOR_OBJECTPATH "/simulator"
//! @} //! @}

2
src/blackcore/dbus_server.h
View File

@@ -21,7 +21,7 @@
#include <QMap> #include <QMap>
//! Service name of DBus service //! Service name of DBus service
#define BLACKCORE_RUNTIME_SERVICENAME "org.swift.pilotclient" #define BLACKCORE_RUNTIME_SERVICENAME "org.swift-project"
namespace BlackCore namespace BlackCore
{ {

2
src/blackcore/simulator.h
View File

@@ -357,6 +357,6 @@ namespace BlackCore
} // namespace } // namespace
Q_DECLARE_INTERFACE(BlackCore::ISimulatorFactory, "org.swift.pilotclient.BlackCore.SimulatorInterface") Q_DECLARE_INTERFACE(BlackCore::ISimulatorFactory, "org.swift-project.blackcore.simulatorinterface")
#endif // guard #endif // guard

2
src/blackmisc/simulation/simulatorplugininfo.cpp
View File

@@ -20,7 +20,7 @@ namespace BlackMisc
void CSimulatorPluginInfo::convertFromJson(const QJsonObject &json) void CSimulatorPluginInfo::convertFromJson(const QJsonObject &json)
{ {
if (json.contains("IID")) { // comes from the plugin if (json.contains("IID")) { // comes from the plugin
if (json["IID"].toString() != QStringLiteral("org.swift.pilotclient.BlackCore.SimulatorInterface")) if (json["IID"].toString() != QStringLiteral("org.swift-project.blackcore.simulatorinterface"))
{ {
return; return;
} }

2
src/blackmisc/simulation/simulatorplugininfo.h
View File

@@ -48,7 +48,7 @@ namespace BlackMisc
//! Check if the provided plugin metadata is valid. //! Check if the provided plugin metadata is valid.
//! Simulator plugin (driver) has to meet the following requirements: //! Simulator plugin (driver) has to meet the following requirements:
//! * implements org.swift.pilotclient.BlackCore.SimulatorInterface; //! * implements org.swift-project.blackcore.simulatorinterface;
//! * provides plugin name; //! * provides plugin name;
//! * specifies simulator it handles. //! * specifies simulator it handles.
//! Unspecified sim is considered as invalid. //! Unspecified sim is considered as invalid.

2
src/plugins/simulator/fs9/simulator_fs9.h
View File

@@ -139,7 +139,7 @@ namespace BlackSimPlugin
class CSimulatorFs9Factory : public QObject, public BlackCore::ISimulatorFactory class CSimulatorFs9Factory : public QObject, public BlackCore::ISimulatorFactory
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "org.swift.pilotclient.BlackCore.SimulatorInterface" FILE "simulator_fs9.json") Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulator_fs9.json")
Q_INTERFACES(BlackCore::ISimulatorFactory) Q_INTERFACES(BlackCore::ISimulatorFactory)
public: public:

2
src/plugins/simulator/fsx/simulator_fsxfactory.h
View File

@@ -27,7 +27,7 @@ namespace BlackSimPlugin
class CSimulatorFsxFactory : public QObject, public BlackCore::ISimulatorFactory class CSimulatorFsxFactory : public QObject, public BlackCore::ISimulatorFactory
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "org.swift.pilotclient.BlackCore.SimulatorInterface" FILE "simulator_fsx.json") Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulator_fsx.json")
Q_INTERFACES(BlackCore::ISimulatorFactory) Q_INTERFACES(BlackCore::ISimulatorFactory)
public: public:

2
src/plugins/simulator/xplane/simulator_xplane.cpp
View File

@@ -28,7 +28,7 @@ namespace
{ {
inline QString xbusServiceName() inline QString xbusServiceName()
{ {
return QStringLiteral("org.swift.xbus"); return QStringLiteral("org.swift-project.xbus");
} }
} }

2
src/plugins/simulator/xplane/simulator_xplane.h
View File

@@ -201,7 +201,7 @@ namespace BlackSimPlugin
class CSimulatorXPlaneFactory : public QObject, public BlackCore::ISimulatorFactory class CSimulatorXPlaneFactory : public QObject, public BlackCore::ISimulatorFactory
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "org.swift.pilotclient.BlackCore.SimulatorInterface" FILE "simulator_xplane.json") Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulator_xplane.json")
Q_INTERFACES(BlackCore::ISimulatorFactory) Q_INTERFACES(BlackCore::ISimulatorFactory)
public: public:

2
src/plugins/simulator/xplane/xbus_service_proxy.cpp
View File

@@ -7,7 +7,7 @@
#include "blackcore/dbus_server.h" #include "blackcore/dbus_server.h"
#include <QMetaMethod> #include <QMetaMethod>
#define XBUS_SERVICE_SERVICENAME "org.swift.xbus" #define XBUS_SERVICE_SERVICENAME "org.swift-project.xbus"
namespace BlackSimPlugin namespace BlackSimPlugin
{ {

2
src/plugins/simulator/xplane/xbus_service_proxy.h
View File

@@ -13,7 +13,7 @@
#include <functional> #include <functional>
//! \cond PRIVATE //! \cond PRIVATE
#define XBUS_SERVICE_INTERFACENAME "org.swift.xbus.service" #define XBUS_SERVICE_INTERFACENAME "org.swift-project.xbus.service"
#define XBUS_SERVICE_OBJECTPATH "/xbus" #define XBUS_SERVICE_OBJECTPATH "/xbus"
//! \endcond //! \endcond

4
src/plugins/simulator/xplane/xbus_traffic_proxy.cpp
View File

@@ -7,7 +7,7 @@
#include "blackcore/dbus_server.h" #include "blackcore/dbus_server.h"
#include <QMetaMethod> #include <QMetaMethod>
#define XBUS_SERVICENAME "org.swift.xbus" #define XBUS_SERVICENAME "org.swift-project.xbus"
namespace BlackSimPlugin namespace BlackSimPlugin
{ {
@@ -97,4 +97,4 @@ namespace BlackSimPlugin
} }
} }
} }

2
src/plugins/simulator/xplane/xbus_traffic_proxy.h
View File

@@ -11,7 +11,7 @@
#include "blackmisc/genericdbusinterface.h" #include "blackmisc/genericdbusinterface.h"
//! \cond PRIVATE //! \cond PRIVATE
#define XBUS_TRAFFIC_INTERFACENAME "org.swift.xbus.traffic" #define XBUS_TRAFFIC_INTERFACENAME "org.swift-project.xbus.traffic"
#define XBUS_TRAFFIC_OBJECTPATH "/xbus/traffic" #define XBUS_TRAFFIC_OBJECTPATH "/xbus/traffic"
//! \endcond //! \endcond

2
src/xbus/main.cpp
View File

@@ -22,7 +22,7 @@ XBus::CPlugin *g_plugin;
PLUGIN_API int XPluginStart(char *o_name, char *o_sig, char *o_desc) PLUGIN_API int XPluginStart(char *o_name, char *o_sig, char *o_desc)
{ {
std::strcpy(o_name, "X-Bus"); std::strcpy(o_name, "X-Bus");
std::strcpy(o_sig, "org.swift.XBus"); std::strcpy(o_sig, "org.swift-project.xbus");
std::strcpy(o_desc, "Allows pilot client to connect to X-Plane via D-Bus"); std::strcpy(o_desc, "Allows pilot client to connect to X-Plane via D-Bus");
XBus::CTraffic::initLegacyData(); XBus::CTraffic::initLegacyData();

2
src/xbus/plugin.cpp
View File

@@ -9,7 +9,7 @@
namespace { namespace {
inline QString xbusServiceName() { inline QString xbusServiceName() {
return QStringLiteral("org.swift.xbus"); return QStringLiteral("org.swift-project.xbus");
} }
} }

2
src/xbus/service.h
View File

@@ -21,7 +21,7 @@
class QTimer; class QTimer;
//! \cond PRIVATE //! \cond PRIVATE
#define XBUS_SERVICE_INTERFACENAME "org.swift.xbus.service" #define XBUS_SERVICE_INTERFACENAME "org.swift-project.xbus.service"
#define XBUS_SERVICE_OBJECTPATH "/xbus" #define XBUS_SERVICE_OBJECTPATH "/xbus"
//! \endcond //! \endcond

2
src/xbus/traffic.h
View File

@@ -14,7 +14,7 @@
#include "XPMPMultiplayer.h" #include "XPMPMultiplayer.h"
//! \cond PRIVATE //! \cond PRIVATE
#define XBUS_TRAFFIC_INTERFACENAME "org.swift.xbus.traffic" #define XBUS_TRAFFIC_INTERFACENAME "org.swift-project.xbus.traffic"
#define XBUS_TRAFFIC_OBJECTPATH "/xbus/traffic" #define XBUS_TRAFFIC_OBJECTPATH "/xbus/traffic"
//! \endcond //! \endcond