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

Ref T516 Update CStatusMessage call sites to use new syntax.

Browse Source
This commit is contained in:
Mat Sutcliffe
2019-01-19 23:08:15 +00:00
parent 8599cbbd23
commit fe7a45afcf
48 changed files with 195 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackgui/views/aircraftmodelview.cpp
View File

@@ -33,6 +33,7 @@
#include <QDropEvent>
#include <QMap>
#include <QShortcut>
#include <QStringBuilder>
#include <QString>
#include <QWidget>
#include <QtGlobal>
@@ -362,12 +363,12 @@ namespace BlackGui
CStatusMessage CAircraftModelView::modifyLoadedJsonData(CAircraftModelList &models) const
{
if (m_loadingRequiresSimulator.isNoSimulator()) { return {}; }
if (models.isEmpty()) { return CStatusMessage(this, CStatusMessage::SeverityDebug, "Empty models", true); }
if (models.isEmpty()) { return CStatusMessage(this, CStatusMessage::SeverityDebug, u"Empty models", true); }
// multiple sims with same count
const int removed = models.removeIfNotMatchingSimulator(m_loadingRequiresSimulator);
if (removed < 1) { return {}; }
return CStatusMessage(this, CStatusMessage::SeverityWarning, "Reduced by %1 model(s) to only use %2 models", true) << removed << m_loadingRequiresSimulator.toQString(true);
return CStatusMessage(this, CStatusMessage::SeverityWarning, u"Reduced by %1 model(s) to only use %2 models", true) << removed << m_loadingRequiresSimulator.toQString(true);
}
CStatusMessage CAircraftModelView::validateLoadedJsonData(const CAircraftModelList &models) const
@@ -376,7 +377,7 @@ namespace BlackGui
if (m_loadingRequiresSimulator.isNoSimulator()) { return COrderableViewWithDbObjects::validateLoadedJsonData(models); }
if (models.containsNotMatchingSimulator(m_loadingRequiresSimulator))
{
return CStatusMessage(this, CStatusMessage::SeverityError, "Found entry not matching %1 in model data", true) << m_loadingRequiresSimulator.toQString();
return CStatusMessage(this, CStatusMessage::SeverityError, u"Found entry not matching %1 in model data", true) << m_loadingRequiresSimulator.toQString();
}
return COrderableViewWithDbObjects::validateLoadedJsonData(models);
}
@@ -421,7 +422,7 @@ namespace BlackGui
{
this->clearSelection();
}
sGui->displayInStatusBar(CStatusMessage(CStatusMessage::SeverityInfo, "Stashed " + models.getModelStringList(true).join(" ")));
sGui->displayInStatusBar(CStatusMessage(CStatusMessage::SeverityInfo, u"Stashed " % models.getModelStringList(true).join(" ")));
}
void CAircraftModelView::requestTempDisable()
@@ -430,7 +431,7 @@ namespace BlackGui
if (!this->hasSelection()) { return; }
const CAircraftModelList models(this->selectedObjects());
emit this->requestTempDisableModelsForMatching(models);
sGui->displayInStatusBar(CStatusMessage(CStatusMessage::SeverityInfo, "Temp.disabled " + models.getModelStringList(true).join(" ")));
sGui->displayInStatusBar(CStatusMessage(CStatusMessage::SeverityInfo, u"Temp.disabled " % models.getModelStringList(true).join(" ")));
}
void CAircraftModelView::displayModelStatisticsDialog()

3
src/blackgui/views/simulatedaircraftview.cpp
View File

@@ -18,6 +18,7 @@
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/icons.h"
#include <QStringBuilder>
#include <QPointer>
#include <QtGlobal>
@@ -177,7 +178,7 @@ namespace BlackGui
if (!this->hasSelection()) { return; }
const CAircraftModelList models(this->selectedObjects().getModels());
emit this->requestTempDisableModelsForMatching(models);
sGui->displayInStatusBar(CStatusMessage(CStatusMessage::SeverityInfo, "Temp.disabled " + models.getModelStringList(true).join(" ")));
sGui->displayInStatusBar(CStatusMessage(CStatusMessage::SeverityInfo, u"Temp.disabled " % models.getModelStringList(true).join(" ")));
}
void CSimulatedAircraftView::showPositionLogInSimulator()

11
src/blackgui/views/viewbase.cpp
View File

@@ -20,6 +20,7 @@
#include <QClipboard>
#include <QFileDialog>
#include <QTextEdit>
#include <QStringBuilder>
using namespace BlackMisc;
using namespace BlackGui;
@@ -666,7 +667,7 @@ namespace BlackGui
CStatusMessage CViewBase<T>::modifyLoadedJsonData(ContainerType &data) const
{
Q_UNUSED(data);
static const CStatusMessage e(this, CStatusMessage::SeverityInfo, "no modification", true);
static const CStatusMessage e(this, CStatusMessage::SeverityInfo, u"no modification", true);
return e;
}
@@ -674,7 +675,7 @@ namespace BlackGui
CStatusMessage CViewBase<T>::validateLoadedJsonData(const ContainerType &data) const
{
Q_UNUSED(data);
static const CStatusMessage e(this, CStatusMessage::SeverityInfo, "validation passed", true);
static const CStatusMessage e(this, CStatusMessage::SeverityInfo, u"validation passed", true);
return e;
}
@@ -801,15 +802,15 @@ namespace BlackGui
tr("Save data file"),
directory.isEmpty() ? this->getFileDialogFileName(false) : directory,
tr("swift (*.json *.txt)"));
if (fileName.isEmpty()) { return CStatusMessage(this, CStatusMessage::SeverityDebug, "Save canceled", true); }
if (fileName.isEmpty()) { return CStatusMessage(this, CStatusMessage::SeverityDebug, u"Save canceled", true); }
const QString json(this->toJsonString(QJsonDocument::Indented, selectedOnly)); // save as CVariant JSON
// save file
const bool ok = CFileUtils::writeStringToFileInBackground(json, fileName);
if (ok) { this->rememberLastJsonDirectory(fileName); }
return ok ?
CStatusMessage(this, CStatusMessage::SeverityInfo, "Writing " + fileName + " in progress", true) :
CStatusMessage(this, CStatusMessage::SeverityError, "Writing " + fileName + " failed", true);
CStatusMessage(this, CStatusMessage::SeverityInfo, u"Writing " % fileName % u" in progress", true) :
CStatusMessage(this, CStatusMessage::SeverityError, u"Writing " % fileName % u" failed", true);
}
template<class T>