refs #336 Using the new CLogMessage syntax to log messages.

This commit is contained in:
Mathew Sutcliffe
2014-10-14 00:09:18 +01:00
parent 067344df24
commit a294e8db0f
33 changed files with 200 additions and 192 deletions

View File

@@ -251,12 +251,12 @@ void MainWindow::ps_toggleNetworkConnection()
if (this->ui->comp_MainInfoArea->getSettingsComponent()->loginStealth())
{
mode = INetwork::LoginStealth;
this->ps_displayStatusMessageInGui(CLogMessage().info(this, "login in stealth mode"));
this->ps_displayStatusMessageInGui(CLogMessage(this).info("login in stealth mode"));
}
else if (this->ui->comp_MainInfoArea->getSettingsComponent()->loginAsObserver())
{
mode = INetwork::LoginAsObserver;
this->ps_displayStatusMessageInGui(CLogMessage().info(this, "login in observer mode"));
this->ps_displayStatusMessageInGui(CLogMessage(this).info("login in observer mode"));
}
CStatusMessage msg = this->getIContextNetwork()->connectToNetwork(static_cast<uint>(mode));
this->ps_displayStatusMessageInGui(msg);
@@ -278,7 +278,7 @@ void MainWindow::ps_toggleNetworkConnection()
bool MainWindow::isContextNetworkAvailableCheck()
{
if (this->m_contextNetworkAvailable) return true;
this->ps_displayStatusMessageInGui(CLogMessage().error(this, "Network context not available, no updates this time"));
this->ps_displayStatusMessageInGui(CLogMessage(this).error("Network context not available, no updates this time"));
return false;
}
@@ -288,7 +288,7 @@ bool MainWindow::isContextNetworkAvailableCheck()
bool MainWindow::isContextAudioAvailableCheck()
{
if (this->m_contextAudioAvailable) return true;
this->ps_displayStatusMessageInGui(CLogMessage().error(this, "Voice context not available"));
this->ps_displayStatusMessageInGui(CLogMessage(this).error("Voice context not available"));
return false;
}
@@ -500,13 +500,13 @@ void MainWindow::ps_toogleWindowStayOnTop()
{
flags ^= Qt::WindowStaysOnTopHint;
flags |= Qt::WindowStaysOnBottomHint;
this->ps_displayStatusMessageInGui(CLogMessage().info(this, "Window on bottom"));
this->ps_displayStatusMessageInGui(CLogMessage(this).info("Window on bottom"));
}
else
{
flags ^= Qt::WindowStaysOnBottomHint;
flags |= Qt::WindowStaysOnTopHint;
this->ps_displayStatusMessageInGui(CLogMessage().info(this, "Window on top"));
this->ps_displayStatusMessageInGui(CLogMessage(this).info("Window on top"));
}
this->setWindowFlags(flags);
this->show();

View File

@@ -236,13 +236,13 @@ void MainWindow::initialDataReads()
this->m_coreAvailable = (this->getIContextNetwork()->isUsingImplementingObject() || (this->getIContextApplication()->ping(t) == t));
if (!this->m_coreAvailable)
{
this->ps_displayStatusMessageInGui(CLogMessage().error(this, "no initial data read as network context is not available"));
this->ps_displayStatusMessageInGui(CLogMessage(this).error("no initial data read as network context is not available"));
return;
}
this->ui->comp_MainInfoArea->getSettingsComponent()->reloadSettings(); // init read
this->ps_reloadOwnAircraft(); // init read, independent of traffic network
this->ps_displayStatusMessageInGui(CLogMessage().info(this, "initial data read"));
this->ps_displayStatusMessageInGui(CLogMessage(this).info("initial data read"));
}
/*

View File

@@ -41,7 +41,7 @@ void MainWindow::ps_onMenuClicked()
else if (sender == this->ui->menu_ReloadSettings)
{
this->ui->comp_MainInfoArea->getSettingsComponent()->reloadSettings();
this->ps_displayStatusMessageInGui(CLogMessage().info(this, "Settings reloaded"));
this->ps_displayStatusMessageInGui(CLogMessage(this).info("Settings reloaded"));
}
else if (sender == this->ui->menu_FileReloadStyleSheets)
{
@@ -54,7 +54,7 @@ void MainWindow::ps_onMenuClicked()
}
else if (sender == this->ui->menu_FileClose)
{
this->ps_displayStatusMessageInGui(CLogMessage().info(this, "Closing"));
this->ps_displayStatusMessageInGui(CLogMessage(this).info("Closing"));
this->close();
}
else if (sender == this->ui->menu_FileSettingsDirectory)