flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-08-11 20:29:47 +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

4
samples/blackmiscdbus/main.cpp
View File

@@ -9,7 +9,7 @@
#include "blackmisc/registermetadata.h"
#include "servicetool.h"
#include "blackcore/dbusserver.h"
#include "blackmisc/dbusserver.h"
#include <QDBusMetaType>
#include <QtDBus/qdbusabstractinterface.h>
#include <QtDBus/qdbusconnection.h>
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
qDebug();
qDebug("--------------------------------------------------------");
BlackCore::CDBusServer *dBusServer = new BlackCore::CDBusServer(useSessionBusForServer ? "session" : address);
BlackMisc::CDBusServer *dBusServer = new BlackMisc::CDBusServer(useSessionBusForServer ? "session" : address);
if (dBusServer->hasQDBusServer())
{
qDebug() << "server" << dBusServer->qDBusServer()->address() << "connected:" << dBusServer->qDBusServer()->isConnected();

4
samples/blackmiscdbus/servicetool.cpp
View File

@@ -10,7 +10,7 @@
#include "servicetool.h"
#include "testservice.h"
#include "testserviceinterface.h"
#include "blackcore/dbusserver.h"
#include "blackmisc/dbusserver.h"
#include <QTextStream>
#include <QString>
@@ -59,7 +59,7 @@ namespace BlackMiscTest
arg.endArray();
}
void ServiceTool::dataTransferTestServer(BlackCore::CDBusServer *dBusServer)
void ServiceTool::dataTransferTestServer(BlackMisc::CDBusServer *dBusServer)
{
QDBusConnection sessionBusConnection = QDBusConnection::sessionBus();
if (sessionBusConnection.interface()->isServiceRegistered(Testservice::ServiceName))

4
samples/blackmiscdbus/servicetool.h
View File

@@ -12,7 +12,7 @@
#ifndef BLACKMISCTEST_SERVICETOOL_H
#define BLACKMISCTEST_SERVICETOOL_H
#include "blackcore/dbusserver.h"
#include "blackmisc/dbusserver.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/network/clientlist.h"
@@ -52,7 +52,7 @@ namespace BlackMiscTest
/*!
* \brief Server side of data transfer test
*/
static void dataTransferTestServer(BlackCore::CDBusServer *dBusServer);
static void dataTransferTestServer(BlackMisc::CDBusServer *dBusServer);
/*!
* \brief Start a new process