flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed implicit logging

Browse Source
This commit is contained in:
Klaus Basan
2015-01-24 00:55:55 +01:00
parent 9f9f3bc3aa
commit 4fa8639735
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackcore/context_settings_impl.cpp
View File

@@ -94,11 +94,11 @@ namespace BlackCore
if (ok) if (ok)
{ {
return CLogMessage(this).info("Read settings: %1") << this->getSettingsFileName(); return CStatusMessage(CStatusMessage::SeverityInfo, QString("Read settings: %1").arg(this->getSettingsFileName()));
} }
else else
{ {
return CLogMessage(this).error("Problem reading settings: %1") << this->getSettingsFileName(); return CStatusMessage(CStatusMessage::SeverityError, QString("Problem reading settings: %1").arg(this->getSettingsFileName()));
} }
} }
@@ -109,7 +109,7 @@ namespace BlackCore
{ {
if (!CSettingUtilities::initSettingsDirectory()) if (!CSettingUtilities::initSettingsDirectory())
{ {
return CLogMessage(this).error("Cannot init directory: %1") << this->getSettingsDirectory(); return CStatusMessage(CStatusMessage::SeverityError, QString("Cannot init directory: %1").arg(this->getSettingsDirectory()));
} }
QFile jsonFile(this->getSettingsFileName()); QFile jsonFile(this->getSettingsFileName());
bool ok = false; bool ok = false;
@@ -121,11 +121,11 @@ namespace BlackCore
} }
if (ok) if (ok)
{ {
return CLogMessage(this).info("Written settings: %1") << this->getSettingsFileName(); return CStatusMessage(CStatusMessage::SeverityInfo, QString("Written settings: %1").arg(this->getSettingsFileName()));
} }
else else
{ {
return CLogMessage(this).error("Problem writing settings: %1") << this->getSettingsFileName(); return CStatusMessage(CStatusMessage::SeverityError, QString("Problem writing settings: %1").arg(this->getSettingsFileName()));
} }
} }
@@ -140,9 +140,13 @@ namespace BlackCore
this->m_settingsSimulator.initDefaultValues(); this->m_settingsSimulator.initDefaultValues();
this->emitCompletelyChanged(); this->emitCompletelyChanged();
if (write) if (write)
{
return this->write(); return this->write();
}
else else
return CLogMessage(this).info("Reset settings data, not written"); {
return CStatusMessage(CStatusMessage::SeverityInfo, "Reset settings data, not written");
}
} }
QString CContextSettings::getSettingsAsJsonString() const QString CContextSettings::getSettingsAsJsonString() const
@@ -264,7 +268,9 @@ namespace BlackCore
} }
else else
{ {
msgs.push_back(CLogMessage(CLogCategory::validation()).error("wrong path: %1") << path); msgs.push_back(
CStatusMessage({CLogCategory::validation()}, CStatusMessage::SeverityError, QString("Wrong path: %1").arg(this->getSettingsFileName()))
);
} }
return msgs; return msgs;
} }

2
src/blackgui/components/mappingcomponent.cpp
View File

@@ -264,7 +264,7 @@ namespace BlackGui
return; return;
} }
getIContextSimulator()->changeRemoteAircraft(aircraft, changedValues); getIContextSimulator()->changeRemoteAircraft(aircraft, changedValues);
CLogMessage(this).info("Requesting model changed for %1") << callsign.asString(); CLogMessage(this).info("Requesting model change for %1") << callsign.asString();
} }
void CMappingComponent::ps_onModelPreviewChanged(int state) void CMappingComponent::ps_onModelPreviewChanged(int state)

4
src/swiftgui_standard/swiftguistd.cpp
View File

@@ -163,7 +163,7 @@ void SwiftGuiStd::ps_loginRequested()
bool SwiftGuiStd::isContextNetworkAvailableCheck() bool SwiftGuiStd::isContextNetworkAvailableCheck()
{ {
if (this->m_contextNetworkAvailable) return true; if (this->m_contextNetworkAvailable) return true;
this->ps_displayStatusMessageInGui(CLogMessage(this).error("Network context not available, no updates this time")); CLogMessage(this).error("Network context not available, no updates this time");
return false; return false;
} }
@@ -173,7 +173,7 @@ bool SwiftGuiStd::isContextNetworkAvailableCheck()
bool SwiftGuiStd::isContextAudioAvailableCheck() bool SwiftGuiStd::isContextAudioAvailableCheck()
{ {
if (this->m_contextAudioAvailable) return true; if (this->m_contextAudioAvailable) return true;
this->ps_displayStatusMessageInGui(CLogMessage(this).error("Voice context not available")); CLogMessage(this).error("Audio context not available");
return false; return false;
} }

4
src/swiftgui_standard/swiftguistd_init.cpp
View File

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