flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-15 09:15:34 +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

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

@@ -92,7 +92,7 @@ namespace BlackGui
if (!this->currentModelView())
{
const CStatusMessage m(this, CStatusMessage::SeverityError, "No data for simulator updating");
const CStatusMessage m(this, CStatusMessage::SeverityError, u"No data for simulator updating");
this->addStatusMessage(m);
}
else

17
src/blackgui/components/dbautostashingcomponent.cpp
View File

@@ -32,6 +32,7 @@
#include <QLineEdit>
#include <QProgressBar>
#include <QRadioButton>
#include <QStringBuilder>
#include <QString>
#include <QWidget>
#include <Qt>
@@ -100,7 +101,7 @@ namespace BlackGui
{
if (this->getSelectedOrAllCount() < 1)
{
const CStatusMessage m(this, CStatusMessage::SeverityError, "No data, nothing to do");
const CStatusMessage m(this, CStatusMessage::SeverityError, u"No data, nothing to do");
this->addStatusMessage(m);
QDialog::accept();
}
@@ -146,7 +147,7 @@ namespace BlackGui
if (!this->currentModelView())
{
const CStatusMessage m(this, CStatusMessage::SeverityError, "No data for auto stashing");
const CStatusMessage m(this, CStatusMessage::SeverityError, u"No data for auto stashing");
this->addStatusMessage(m);
}
else
@@ -157,12 +158,12 @@ namespace BlackGui
QString allStr(QString::number(all));
if (all > CDbStashComponent::MaxModelPublished)
{
allStr += " (Max." + QString::number(CDbStashComponent::MaxModelPublished) + ")";
allStr += u" (Max." % QString::number(CDbStashComponent::MaxModelPublished) % u")";
}
ui->le_All->setText(allStr);
if (ui->le_MaxModelsStashed->text().isEmpty())
{
ui->le_MaxModelsStashed->setText(all > 100 ? "100" : "");
ui->le_MaxModelsStashed->setText(all > 100 ? QStringLiteral("100") : QString());
}
if (selected > 0)
{
@@ -304,14 +305,14 @@ namespace BlackGui
//! Some upfront tests
if (!model.hasModelString())
{
this->addStatusMessage(CStatusMessage(this, CStatusMessage::SeverityError, "No model string"));
this->addStatusMessage(CStatusMessage(this, CStatusMessage::SeverityError, u"No model string"));
m_noData++;
return false;
}
if (!model.hasAircraftDesignator())
{
this->addStatusMessage(CStatusMessage(this, CStatusMessage::SeverityError, "No aircraft designator"), model);
this->addStatusMessage(CStatusMessage(this, CStatusMessage::SeverityError, u"No aircraft designator"), model);
m_noData++;
return false;
}
@@ -335,7 +336,7 @@ namespace BlackGui
// if there is no livery (normal) we need an airline
if (!fallback)
{
this->addStatusMessage(CStatusMessage(this, CStatusMessage::SeverityError, "No airline designator"), model);
this->addStatusMessage(CStatusMessage(this, CStatusMessage::SeverityError, u"No airline designator"), model);
m_noData++;
return false;
}
@@ -353,7 +354,7 @@ namespace BlackGui
}
else
{
msg = CStatusMessage(this, CStatusMessage::SeverityInfo, "Stashed succesfully");
msg = CStatusMessage(this, CStatusMessage::SeverityInfo, u"Stashed succesfully");
stashed = true;
m_noStashed++;
model = stashModel;

9
src/blackgui/components/dbownmodelsetcomponent.cpp
View File

@@ -36,6 +36,7 @@
#include <QIcon>
#include <QLineEdit>
#include <QPushButton>
#include <QStringBuilder>
#include <QString>
#include <QWidget>
#include <Qt>
@@ -162,7 +163,7 @@ namespace BlackGui
CStatusMessage CDbOwnModelSetComponent::addToModelSet(const CAircraftModelList &models, const CSimulatorInfo &simulator)
{
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Need single simulator");
if (models.isEmpty()) { return CStatusMessage(this, CStatusMessage::SeverityInfo, "No data", true); }
if (models.isEmpty()) { return CStatusMessage(this, CStatusMessage::SeverityInfo, u"No data", true); }
if (!this->getModelSetSimulator().isSingleSimulator())
{
// no sim yet, we set it
@@ -172,7 +173,7 @@ namespace BlackGui
{
// only currently selected sim allowed
return CStatusMessage(this, CStatusMessage::SeverityError,
"Cannot add data for " + simulator.toQString(true) + " to " + this->getModelSetSimulator().toQString(true), true);
u"Cannot add data for " % simulator.toQString(true) % u" to " % this->getModelSetSimulator().toQString(true), true);
}
const bool allowExcludedModels = m_modelSettings.get().getAllowExcludedModels();
@@ -183,11 +184,11 @@ namespace BlackGui
if (!allowExcludedModels) { updateModels.removeIfExcluded(); }
updateModels.resetOrder();
ui->tvp_OwnModelSet->updateContainerMaybeAsync(updateModels);
return CStatusMessage(this, CStatusMessage::SeverityInfo, "Modified " + QString::number(d) + " entries in model set " + this->getModelSetSimulator().toQString(true), true);
return CStatusMessage(this, CStatusMessage::SeverityInfo, u"Modified " % QString::number(d) % u" entries in model set " % this->getModelSetSimulator().toQString(true), true);
}
else
{
return CStatusMessage(this, CStatusMessage::SeverityInfo, "No data modified in model set", true);
return CStatusMessage(this, CStatusMessage::SeverityInfo, u"No data modified in model set", true);
}
}

6
src/blackgui/components/dbquickmappingwizard.cpp
View File

@@ -195,11 +195,11 @@ namespace BlackGui
CStatusMessageList msgs;
if (requestSuccessful)
{
msgs.push_back(CStatusMessage(this, CStatusMessage::SeverityInfo, "Publishing request sent"));
msgs.push_back(CStatusMessage(this, CStatusMessage::SeverityInfo, u"Publishing request sent"));
}
else
{
msgs.push_back(CStatusMessage(this, CStatusMessage::SeverityError, "Publishing request failed"));
msgs.push_back(CStatusMessage(this, CStatusMessage::SeverityError, u"Publishing request failed"));
}
msgs.push_back(messages);
ui->comp_Log->appendStatusMessagesToList(msgs);
@@ -305,7 +305,7 @@ namespace BlackGui
CStatusMessageList msgs(ui->editor_AircraftModel->validate(true));
if (ui->le_ModelString->text().isEmpty())
{
const CStatusMessage error(this, CStatusMessage::SeverityError, "Missing model string", true);
const CStatusMessage error(this, CStatusMessage::SeverityError, u"Missing model string", true);
msgs.push_back(error);
}
return msgs;

9
src/blackgui/components/dbstashcomponent.cpp
View File

@@ -31,6 +31,7 @@
#include <QMessageBox>
#include <QPushButton>
#include <QWidget>
#include <QStringBuilder>
#include <Qt>
#include <QtGlobal>
#include <iterator>
@@ -211,7 +212,7 @@ namespace BlackGui
{
if (!icao.hasValidDesignator())
{
static const CStatusMessage msg(CStatusMessage::SeverityError, "No valid designator");
static const CStatusMessage msg(CStatusMessage::SeverityError, u"No valid designator");
this->showOverlayMessage(msg);
return;
}
@@ -220,7 +221,7 @@ namespace BlackGui
const CLivery stdLivery(sApp->getWebDataServices()->getStdLiveryForAirlineCode(icao));
if (!stdLivery.hasValidDbKey())
{
static const CStatusMessage msg(CStatusMessage::SeverityError, "No valid standard livery for " + icao.getDesignator());
static const CStatusMessage msg(CStatusMessage::SeverityError, u"No valid standard livery for " % icao.getDesignator());
this->showOverlayMessage(msg);
return;
}
@@ -283,7 +284,7 @@ namespace BlackGui
if (validModels.size() > MaxModelPublished)
{
validModels.truncate(MaxModelPublished);
msgs.push_back(CStatusMessage(validationCategories(), CStatusMessage::SeverityWarning, QStringLiteral("More than %1 values, values skipped").arg(MaxModelPublished)));
msgs.push_back(CStatusMessage(validationCategories(), CStatusMessage::SeverityWarning, u"More than %1 values, values skipped") << MaxModelPublished);
}
msgs.push_back(sGui->getWebDataServices()->asyncPublishModels(validModels));
@@ -340,7 +341,7 @@ namespace BlackGui
{
return CStatusMessageList(
{
CStatusMessage(validationCategories(), CStatusMessage::SeverityInfo, QStringLiteral("No errors in %1 model(s)").arg(models.size()))
CStatusMessage(validationCategories(), CStatusMessage::SeverityInfo, u"No errors in %1 model(s)") << models.size()
});
}
else

6
src/blackgui/components/flightplancomponent.cpp
View File

@@ -509,7 +509,7 @@ namespace BlackGui
{
if (fileName.isEmpty())
{
m = CStatusMessage(this, CStatusMessage::SeverityDebug, "Save canceled", true);
m = CStatusMessage(this, CStatusMessage::SeverityDebug, u"Save canceled", true);
break;
}
CFlightPlan fp;
@@ -521,12 +521,12 @@ namespace BlackGui
const bool ok = CFileUtils::writeStringToFile(json, fileName);
if (ok)
{
m = CStatusMessage(this, CStatusMessage::SeverityInfo, "Written " + fileName, true);
m = CStatusMessage(this, CStatusMessage::SeverityInfo, u"Written " % fileName, true);
this->updateDirectorySettings(fileName);
}
else
{
m = CStatusMessage(this, CStatusMessage::SeverityError, "Writing " + fileName + " failed", true);
m = CStatusMessage(this, CStatusMessage::SeverityError, u"Writing " % fileName % u" failed", true);
}
}
while (false);

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

@@ -662,7 +662,7 @@ namespace BlackGui
if (!this->hasValidContexts()) { return; }
if (!sGui->getIContextNetwork()->isConnected()) { return; } // nothing to logoff
const CStatusMessage m = CStatusMessage(this, CStatusMessage::SeverityInfo, "Auto logoff in progress");
const CStatusMessage m = CStatusMessage(this, CStatusMessage::SeverityInfo, u"Auto logoff in progress");
const int delaySecs = 45;
this->showOverlayHTMLMessage(m, qRound(1000 * delaySecs * 0.8));
this->setLogoffCountdown(delaySecs);

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>