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

Added swift header / formatting / fixed mixing registerMetatype

Browse Source
This commit is contained in:
Klaus Basan
2015-11-06 02:23:14 +01:00
committed by Mathew Sutcliffe
parent 6dd66284ca
commit a33558987c
5 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
samples/blackmiscdbus/servicetool.cpp
View File

@@ -30,10 +30,6 @@ using namespace BlackMiscTest;
namespace BlackMiscTest
{
/*
* Start a new process
*/
QProcess *ServiceTool::startNewProcess(const QString &executable, const QStringList &arguments, QObject *parent)
{
QProcess *process = new QProcess(parent);
@@ -41,9 +37,6 @@ namespace BlackMiscTest
return process;
}
/*
* Display DBus arguments
*/
void ServiceTool::displayQDBusArgument(const QDBusArgument &arg, qint32 level)
{
arg.beginArray();
@@ -68,9 +61,6 @@ namespace BlackMiscTest
arg.endArray();
}
/*
* Server side on testserver
*/
void ServiceTool::dataTransferTestServer(BlackCore::CDBusServer *dBusServer)
{
QDBusConnection sessionBusConnection = QDBusConnection::sessionBus();
@@ -84,9 +74,6 @@ namespace BlackMiscTest
dBusServer->addObject(Testservice::ServicePath, testservice);
}
/*
* Client side on testserver
*/
void ServiceTool::dataTransferTestClient(const QString &address)
{
// send data as P2P to server (this can be session bus, too, but usually is P2P)
@@ -104,9 +91,6 @@ namespace BlackMiscTest
ServiceTool::sendDataToTestservice(p2pConnection);
}
/*
* Get callsign
*/
CCallsign ServiceTool::getRandomAtcCallsign()
{
static QList<CCallsign> callsigns;
@@ -124,9 +108,6 @@ namespace BlackMiscTest
return cs;
}
/*
* Stations
*/
CAtcStationList ServiceTool::getStations(int number)
{
QElapsedTimer timer;
@@ -148,9 +129,6 @@ namespace BlackMiscTest
return list;
}
/*
* Aircraft cfg entries
*/
CAircraftCfgEntriesList ServiceTool::getAircraftCfgEntries(int number)
{
QElapsedTimer timer;
@@ -173,9 +151,6 @@ namespace BlackMiscTest
return list;
}
/*
* Airports
*/
CAirportList ServiceTool::getAirports(int number)
{
BlackMisc::Aviation::CAirportList list;
@@ -209,9 +184,6 @@ namespace BlackMiscTest
return list;
}
/*
* Register testservice (server side)
*/
Testservice *ServiceTool::registerTestservice(QDBusConnection &connection, QObject *parent)
{
Testservice *pTestservice = new Testservice(parent); // just a QObject with signals / slots and Q_CLASSINFO("D-Bus Interface", some service name)
@@ -247,9 +219,6 @@ namespace BlackMiscTest
return pTestservice;
}
/*
* Send data to testservice, this sends data to the slots on the server
*/
void ServiceTool::sendDataToTestservice(const QDBusConnection &connection)
{
// on the client's side

11
src/blackcore/context_runtime_config.h
View File

@@ -1,3 +1,14 @@
/* Copyright (C) 2013
* swift Project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
//! \file
#ifndef BLACKCORE_CONTEXT_RUNTIME_CONFIG_H
#define BLACKCORE_CONTEXT_RUNTIME_CONFIG_H

12
src/blackgui/models/actionmodel.cpp
View File

@@ -1,3 +1,12 @@
/* Copyright (C) 2015
* swift project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
#include "actionmodel.h"
#include "actionitem.h"
#include "blackcore/input_manager.h"
@@ -14,8 +23,7 @@ namespace BlackGui
}
CActionModel::~CActionModel()
{
}
{ }
int CActionModel::columnCount(const QModelIndex &parent) const
{

12
src/blackmisc/blackmiscfreefunctions_nwmeta.cpp
View File

@@ -19,17 +19,19 @@
*/
void BlackMisc::Network::registerMetadata()
{
CUser::registerMetadata();
CUserList::registerMetadata();
CAuthenticatedUser::registerMetadata();
CClient::registerMetadata();
CClientList::registerMetadata();
CEntityFlags::registerMetadata();
CRole::registerMetadata();
CRoleList::registerMetadata();
CServer::registerMetadata();
CServerList::registerMetadata();
CTextMessage::registerMetadata();
CTextMessageList::registerMetadata();
CClient::registerMetadata();
CClientList::registerMetadata();
CUrl::registerMetadata();
CUrlList::registerMetadata();
CUser::registerMetadata();
CUserList::registerMetadata();
CVoiceCapabilities::registerMetadata();
CEntityFlags::registerMetadata();
}

16
src/blackmisc/network/network.h
View File

@@ -17,15 +17,19 @@
* \brief Classes related to the traffic network, swift DB, such as VATSIM user, utilities, URL etc.
*/
#include "blackmisc/network/user.h"
#include "blackmisc/network/userlist.h"
#include "blackmisc/network/authenticateduser.h"
#include "blackmisc/network/role.h"
#include "blackmisc/network/rolelist.h"
#include "blackmisc/network/serverlist.h"
#include "blackmisc/network/textmessagelist.h"
#include "blackmisc/network/client.h"
#include "blackmisc/network/clientlist.h"
#include "blackmisc/network/role.h"
#include "blackmisc/network/rolelist.h"
#include "blackmisc/network/server.h"
#include "blackmisc/network/serverlist.h"
#include "blackmisc/network/textmessage.h"
#include "blackmisc/network/textmessagelist.h"
#include "blackmisc/network/url.h"
#include "blackmisc/network/urllist.h"
#include "blackmisc/network/user.h"
#include "blackmisc/network/userlist.h"
#include "blackmisc/network/voicecapabilities.h"
#endif // guard