flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-08-08 02:25:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updating IContext to our current style and making it less reliant on macros.

Browse Source 
Updating code that uses IContext to a more conformant pattern of usage.
This commit is contained in:
Mathew Sutcliffe
2013-10-05 18:12:16 +01:00
parent 01af31d4da
commit e607121cc4
26 changed files with 235 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/cli_client/client.cpp
View File

@@ -8,8 +8,8 @@
#include <iostream>
#include <QStringList>
Client::Client()
: m_net(BlackMisc::IContext::getInstance().singleton<BlackCore::INetwork>())
Client::Client(BlackMisc::IContext &ctx)
: m_net(&ctx.getObject<BlackCore::INetwork>())
{
using namespace BlackCore;
connect(m_net, &INetwork::atcPositionUpdate, this, &Client::atcPositionUpdate);

5
samples/cli_client/client.h
View File

@@ -6,18 +6,19 @@
#ifndef __BLACKSAMPLE_CLI_CLIENT_H__
#define __BLACKSAMPLE_CLI_CLIENT_H__
#include "blackcore/network.h"
#include "blackmisc/context.h"
#include <QObject>
#include <QTextStream>
#include <QMap>
#include <functional>
#include "blackcore/network.h"
class Client : public QObject
{
Q_OBJECT
public:
Client();
Client(BlackMisc::IContext &);
signals:
void quit();

13
samples/cli_client/main.cpp
View File

@@ -4,6 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "blackcore/network_vatlib.h"
#include "blackmisc/context.h"
#include "client.h"
#include "reader.h"
#include <QCoreApplication>
@@ -12,11 +13,15 @@
int main(int argc, char *argv[])
{
QCoreApplication app (argc, argv);
BlackMisc::CApplicationContext myApplicationContext;
BlackMisc::IContext::getInstance().setSingleton(new BlackMisc::CDebug());
BlackMisc::IContext::getInstance().setSingleton<BlackCore::INetwork>(new BlackCore::NetworkVatlib());
Client client;
BlackMisc::CApplicationContext ctx;
BlackMisc::IContext::setInstance(ctx);
BlackMisc::CDebug debug;
ctx.setObject(debug);
BlackCore::NetworkVatlib net;
ctx.setObject<BlackCore::INetwork>(net);
Client client(ctx);
LineReader reader;
QObject::connect(&reader, SIGNAL(command(const QString&)), &client, SLOT(command(const QString&)));
QObject::connect(&client, SIGNAL(quit()), &reader, SLOT(terminate()));

6
samples/com_client/main.cpp
View File

@@ -7,10 +7,12 @@ using namespace BlackMisc;
int main(int argc, char *argv[])
{
BlackMisc::CApplicationContext myApplicationContext;
QCoreApplication a(argc, argv);
BlackMisc::IContext::getInstance().setSingleton(new BlackMisc::CDebug());
BlackMisc::CApplicationContext ctx;
BlackMisc::IContext::setInstance(ctx);
BlackMisc::CDebug debug;
ctx.setObject(debug);
Client client;

6
samples/com_server/main.cpp
View File

@@ -7,10 +7,12 @@ using namespace BlackMisc;
int main(int argc, char *argv[])
{
BlackMisc::CApplicationContext myApplicationContext;
QCoreApplication a(argc, argv);
BlackMisc::IContext::getInstance().setSingleton(new BlackMisc::CDebug());
BlackMisc::CApplicationContext ctx;
BlackMisc::IContext::setInstance(ctx);
BlackMisc::CDebug debug;
ctx.setObject(debug);
Server server;

6
samples/config/main.cpp
View File

@@ -10,9 +10,11 @@ using namespace BlackMisc;
int main(int argc, char *argv[])
{
QCoreApplication a(argc, argv);
BlackMisc::CApplicationContext myApplicationContext;
BlackMisc::IContext::getInstance().setSingleton(new BlackMisc::CDebug());
BlackMisc::CApplicationContext ctx;
BlackMisc::IContext::setInstance(ctx);
BlackMisc::CDebug debug;
ctx.setObject(debug);
CConfigManager::getInstance().setConfigPath(QString("config"));
if (!CConfigManager::getInstance().readConfig())

6
samples/interpolator/main.cpp
View File

@@ -22,7 +22,11 @@ using namespace BlackMisc::Aviation;
int main(int argc, char *argv[])
{
QCoreApplication a(argc, argv);
BlackMisc::IContext::getInstance().setSingleton(new BlackMisc::CDebug());
BlackMisc::CApplicationContext ctx;
BlackMisc::IContext::setInstance(ctx);
BlackMisc::CDebug debug;
ctx.setObject(debug);
QElapsedTimer timer;

6
samples/logging/main.cpp
View File

@@ -7,9 +7,11 @@
int main(int argc, char *argv[])
{
QCoreApplication a(argc, argv);
BlackMisc::CApplicationContext myApplicationContext;
BlackMisc::IContext::getInstance().setSingleton(new BlackMisc::CDebug());
BlackMisc::CApplicationContext ctx;
BlackMisc::IContext::setInstance(ctx);
BlackMisc::CDebug debug;
ctx.setObject(debug);
bAppInfo << "This is a Info log message";
bAppWarning << "This is a bWarning log message";

6
samples/pluginmgr/main.cpp
View File

@@ -9,9 +9,11 @@
int main(int argc, char *argv[])
{
QCoreApplication a(argc, argv);
BlackMisc::CApplicationContext myApplicationContext;
BlackMisc::IContext::getInstance().setSingleton(new BlackMisc::CDebug());
BlackMisc::CApplicationContext ctx;
BlackMisc::IContext::setInstance(ctx);
BlackMisc::CDebug debug;
ctx.setObject(debug);
{
const QString pluginPath = "../../build/bin";