Use nested namespaces (C++17 feature)

This commit is contained in:
Mat Sutcliffe
2021-09-15 21:44:54 +01:00
parent 3f2e5b0b69
commit 57d32da826
1345 changed files with 146075 additions and 150376 deletions

View File

@@ -19,41 +19,38 @@
using namespace BlackCore::Afv::Model;
using namespace BlackCore::Afv::Clients;
namespace BlackGui
namespace BlackGui::Components
{
namespace Components
CAfvMapDialog::CAfvMapDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::CAfvMapDialog)
{
CAfvMapDialog::CAfvMapDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::CAfvMapDialog)
/**
m_afvMapReader = new CAfvMapReader(this);
m_afvMapReader->updateFromMap();
CAfvClient *afvClient = nullptr;
if (sGui && !sGui->isShuttingDown() && sGui->getIContextAudio())
{
/**
m_afvMapReader = new CAfvMapReader(this);
m_afvMapReader->updateFromMap();
CAfvClient *afvClient = nullptr;
if (sGui && !sGui->isShuttingDown() && sGui->getIContextAudio())
if (sGui->getIContextAudio()->isUsingImplementingObject())
{
if (sGui->getIContextAudio()->isUsingImplementingObject())
{
afvClient = sGui->getCoreFacade()->getCContextAudio()->voiceClient();
}
afvClient = sGui->getCoreFacade()->getCContextAudio()->voiceClient();
}
ui->setupUi(this);
QQmlContext *ctxt = ui->qw_AfvMap->rootContext();
ctxt->setContextProperty("afvMapReader", m_afvMapReader);
if (m_afvClient)
{
ctxt->setContextProperty("voiceClient", afvClient);
}
// ui->qw_AfvMap->engine()->setBaseUrl(":/blackgui/qml");
ui->qw_AfvMap->setSource(QUrl("qrc:/blackgui/qml/AFVMap.qml"));
**/
}
CAfvMapDialog::~CAfvMapDialog() { }
} // ns
ui->setupUi(this);
QQmlContext *ctxt = ui->qw_AfvMap->rootContext();
ctxt->setContextProperty("afvMapReader", m_afvMapReader);
if (m_afvClient)
{
ctxt->setContextProperty("voiceClient", afvClient);
}
// ui->qw_AfvMap->engine()->setBaseUrl(":/blackgui/qml");
ui->qw_AfvMap->setSource(QUrl("qrc:/blackgui/qml/AFVMap.qml"));
**/
}
CAfvMapDialog::~CAfvMapDialog() { }
} // ns