flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-23 15:25:35 +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

54
src/blackmisc/context.cpp
View File

@@ -6,7 +6,6 @@
#include "blackmisc/debug.h"
#include "blackmisc/context.h"
#include <QFileInfo>
#include <stdexcept>
#ifdef Q_OS_WIN
#include <Windows.h>
@@ -15,10 +14,21 @@
namespace BlackMisc
{
IContext &IContext::getInstance()
IContext *&instancePointer()
{
static CApplicationContext context;
return context;
static IContext *ptr = &context;
return ptr;
}
void IContext::setInstance(IContext &context)
{
instancePointer() = &context;
}
IContext &IContext::getInstance()
{
return *instancePointer();
}
IContext::~IContext()
@@ -29,44 +39,20 @@ namespace BlackMisc
{
}
QObject *CApplicationContext::singleton(const QString &singletonName)
const QObject *CApplicationContext::getQObjectNothrow(const QString &name) const
{
TSingletonMap::const_iterator it = m_singletons.find(singletonName);
if (it != m_singletons.end())
{
return it.value();
}
throw std::logic_error("Requested singleton not present");
auto it = m_map.find(name);
return it == m_map.end() ? nullptr : it.value();
}
bool CApplicationContext::hasSingleton(const QString &singletonName) const
void CApplicationContext::setQObject(QString name, QObject &object)
{
TSingletonMap::const_iterator it = m_singletons.find(singletonName);
if (it != m_singletons.end())
{
return true;
}
return false;
m_map.insert(name, &object);
}
void CApplicationContext::setSingleton(const QString &singletonName, QObject *object)
void CApplicationContext::removeQObject(const QString &name)
{
m_singletons.insert(singletonName, object);
}
void CApplicationContext::releaseSingleton(const QString &singletonName)
{
m_singletons.remove(singletonName);
}
CDebug *CApplicationContext::getDebug()
{
return IContext::singleton<CDebug>();
}
void CApplicationContext::setDebug(CDebug *debug)
{
IContext::setSingleton(debug);
m_map.remove(name);
}
void CApplicationContext::setDefaultApplicationName()