flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 09:15:34 +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

8
src/xbus/plugin.cpp
View File

@@ -20,9 +20,9 @@ namespace XBus
CPlugin::CPlugin()
: m_menu(CMenu::mainMenu().subMenu("XBus"))
{
m_startServerMenuItems.push_back(m_menu.item("Start server on session bus", [this]{ startServer(BlackCore::CDBusServer::sessionDBusServer()); }));
m_startServerMenuItems.push_back(m_menu.item("Start server on system bus", [this]{ startServer(BlackCore::CDBusServer::systemDBusServer()); }));
m_startServerMenuItems.push_back(m_menu.item("Start server on localhost P2P", [this]{ startServer(BlackCore::CDBusServer::p2pAddress()); }));
m_startServerMenuItems.push_back(m_menu.item("Start server on session bus", [this]{ startServer(BlackMisc::CDBusServer::sessionDBusServer()); }));
m_startServerMenuItems.push_back(m_menu.item("Start server on system bus", [this]{ startServer(BlackMisc::CDBusServer::systemDBusServer()); }));
m_startServerMenuItems.push_back(m_menu.item("Start server on localhost P2P", [this]{ startServer(BlackMisc::CDBusServer::p2pAddress()); }));
}
void CPlugin::startServer(const QString &address)
@@ -30,7 +30,7 @@ namespace XBus
Q_ASSERT(! m_server);
for (auto &item : m_startServerMenuItems) { item.setEnabled(false); }
m_server = new BlackCore::CDBusServer(xbusServiceName(), address, this);
m_server = new BlackMisc::CDBusServer(xbusServiceName(), address, this);
m_service = new CService(this);
m_traffic = new CTraffic(this);
m_weather = new CWeather(this);

4
src/xbus/plugin.h
View File

@@ -20,7 +20,7 @@
#pragma push_macro("interface")
#undef interface
#include "blackcore/dbusserver.h"
#include "blackmisc/dbusserver.h"
#pragma pop_macro("interface")
#include <QVector>
@@ -49,7 +49,7 @@ namespace XBus
void onAircraftRepositioned();
private:
BlackCore::CDBusServer *m_server = nullptr;
BlackMisc::CDBusServer *m_server = nullptr;
CService *m_service = nullptr;
CTraffic *m_traffic = nullptr;
CWeather *m_weather = nullptr;