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

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

View File

@@ -118,14 +118,14 @@ void BlackD::createTrayIcon()
void BlackD::createLogging()
{
BlackMisc::IContext::getInstance().getDebug()->create();
BlackMisc::IContext::getInstance().getDebug().create();
m_displayer = new CQtDisplayer(ui->logginView);
BlackMisc::IContext::getInstance().getDebug()->getDebugLog()->attachDisplay(m_displayer);
BlackMisc::IContext::getInstance().getDebug()->getInfoLog()->attachDisplay(m_displayer);
BlackMisc::IContext::getInstance().getDebug()->getWarningLog()->attachDisplay(m_displayer);
BlackMisc::IContext::getInstance().getDebug()->getErrorLog()->attachDisplay(m_displayer);
BlackMisc::IContext::getInstance().getDebug().getDebugLog()->attachDisplay(m_displayer);
BlackMisc::IContext::getInstance().getDebug().getInfoLog()->attachDisplay(m_displayer);
BlackMisc::IContext::getInstance().getDebug().getWarningLog()->attachDisplay(m_displayer);
BlackMisc::IContext::getInstance().getDebug().getErrorLog()->attachDisplay(m_displayer);
}
void BlackD::createComServer()

View File

@@ -18,7 +18,10 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
BlackMisc::CApplicationContext myBlackApp;
BlackMisc::IContext::getInstance().setSingleton(new BlackMisc::CDebug());
BlackMisc::CApplicationContext ctx;
BlackMisc::IContext::setInstance(ctx);
BlackMisc::CDebug debug;
ctx.setObject(debug);
if (!QSystemTrayIcon::isSystemTrayAvailable()) {
QMessageBox::critical(0, QObject::tr("Systray"),