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

refs #520 Moved CDBusServer from BlackCore to BlackMisc.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-11-28 02:25:56 +00:00
parent d35fc3f056
commit fbcc42424d
38 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -11,7 +11,7 @@
#include "xbusserviceproxy.h"
#include "xbustrafficproxy.h"
#include "xbusweatherproxy.h"
#include "blackcore/dbusserver.h"
#include "blackmisc/dbusserver.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/simulation/modelmappingsprovider.h"
@@ -354,11 +354,11 @@ namespace BlackSimPlugin
QDBusConnection CSimulatorXPlane::connectionFromString(const QString &str)
{
if (str == BlackCore::CDBusServer::sessionDBusServer())
if (str == BlackMisc::CDBusServer::sessionDBusServer())
{
return QDBusConnection::sessionBus();
}
else if (str == BlackCore::CDBusServer::systemDBusServer())
else if (str == BlackMisc::CDBusServer::systemDBusServer())
{
return QDBusConnection::systemBus();
}

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

@@ -4,7 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "xbusserviceproxy.h"
#include "blackcore/dbusserver.h"
#include "blackmisc/dbusserver.h"
#include <QMetaMethod>
#define XBUS_SERVICE_SERVICENAME "org.swift-project.xbus"

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

@@ -4,7 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "xbustrafficproxy.h"
#include "blackcore/dbusserver.h"
#include "blackmisc/dbusserver.h"
#include <QMetaMethod>
#define XBUS_SERVICENAME "org.swift-project.xbus"

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

@@ -8,7 +8,7 @@
*/
#include "xbusweatherproxy.h"
#include "blackcore/dbusserver.h"
#include "blackmisc/dbusserver.h"
#define XBUS_SERVICENAME "org.swift-project.xbus"

6
src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp
View File

@@ -1,6 +1,6 @@
#include "simulatorxplaneconfigwindow.h"
#include "ui_simulatorxplaneconfigwindow.h"
#include "blackcore/dbusserver.h"
#include "blackmisc/dbusserver.h"
#include "blackmisc/simulation/xplane/xplaneutil.h"
#include "blackmisc/fileutils.h"
#include <QStringBuilder>
@@ -30,8 +30,8 @@ namespace BlackSimPlugin
{
ui->setupUi(this);
ui->cp_XBusServer->addItem(BlackCore::CDBusServer::sessionDBusServer());
ui->cp_XBusServer->addItem(BlackCore::CDBusServer::systemDBusServer());
ui->cp_XBusServer->addItem(BlackMisc::CDBusServer::sessionDBusServer());
ui->cp_XBusServer->addItem(BlackMisc::CDBusServer::systemDBusServer());
connect(ui->bb_OkCancel, &QDialogButtonBox::accepted, this, &CSimulatorXPlaneConfigWindow::ps_storeSettings);
connect(ui->bb_OkCancel, &QDialogButtonBox::accepted, this, &CSimulatorXPlaneConfigWindow::close);