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

3
src/blackcore/db/airportdatareader.cpp
View File

@@ -13,6 +13,7 @@
#include "blackmisc/network/networkutils.h"
#include "blackmisc/logmessage.h"
#include <QStringBuilder>
#include <QNetworkReply>
#include <QFileInfo>
#include <QPointer>
@@ -220,7 +221,7 @@ namespace BlackCore
if (!inconsistent.isEmpty())
{
logInconsistentData(
CStatusMessage(this, CStatusMessage::SeverityInfo, "Inconsistent airports: " + inconsistent.dbKeysAsString(", ")),
CStatusMessage(this, CStatusMessage::SeverityInfo, u"Inconsistent airports: " % inconsistent.dbKeysAsString(", ")),
Q_FUNC_INFO);
}

12
src/blackcore/db/databaseauthentication.cpp
View File

@@ -66,12 +66,12 @@ namespace BlackCore
CStatusMessageList msgs;
static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::validation()}));
if (m_shutdown) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Shutdown in progress")); return msgs; }
if (m_shutdown) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"Shutdown in progress")); return msgs; }
const QString un(username.trimmed());
const QString pw(password.trimmed());
if (un.isEmpty()) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "No user name/id")); }
if (pw.isEmpty()) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "No password")); }
if (un.isEmpty()) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"No user name/id")); }
if (pw.isEmpty()) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"No password")); }
if (!msgs.isEmpty()) { return msgs; }
const CUrl url(sApp->getGlobalSetup().getDbLoginServiceUrl());
@@ -146,18 +146,18 @@ namespace BlackCore
{
if (!msgs.hasErrorMessages())
{
msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Cannot login, user or password wrong"));
msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"Cannot login, user or password wrong"));
}
}
else
{
if (!user.isEnabled())
{
msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "User is disabled"));
msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"User is disabled"));
}
if (user.getRoles().isEmpty())
{
msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "User has no roles"));
msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"User has no roles"));
}
}
m_swiftDbUser.set(user);

9
src/blackcore/db/databasereader.cpp
View File

@@ -22,6 +22,7 @@
#include "blackmisc/logmessage.h"
#include "blackmisc/verify.h"
#include <QStringBuilder>
#include <QByteArray>
#include <QJsonDocument>
#include <QJsonObject>
@@ -242,7 +243,7 @@ namespace BlackCore
datastoreResponse.setStringSize(dataFileData.size());
if (dataFileData.isEmpty())
{
datastoreResponse.setMessage(CStatusMessage(this, CStatusMessage::SeverityError, "Empty response, no data"));
datastoreResponse.setMessage(CStatusMessage(this, CStatusMessage::SeverityError, u"Empty response, no data"));
}
else
{
@@ -267,7 +268,7 @@ namespace BlackCore
if (!this->doWorkCheck())
{
nwReply->abort();
headerResponse.setMessage(CStatusMessage(this, CStatusMessage::SeverityError, "Terminated data parsing process"));
headerResponse.setMessage(CStatusMessage(this, CStatusMessage::SeverityError, u"Terminated data parsing process"));
return false; // stop, terminate straight away, ending thread
}
@@ -284,7 +285,7 @@ namespace BlackCore
const QString url(nwReply->url().toString());
nwReply->abort();
headerResponse.setMessage(CStatusMessage(this, CStatusMessage::SeverityError,
QString("Reading data failed: '" + error + "' " + url)));
u"Reading data failed: '" % error % u"' " % url));
return false;
}
}
@@ -504,7 +505,7 @@ namespace BlackCore
void CDatabaseReader::logNoWorkingUrl(CEntityFlags::Entity entity)
{
const CStatusMessage msg = CStatusMessage(this, m_severityNoWorkingUrl, "No working URL for '%1'") << CEntityFlags::flagToString(entity);
const CStatusMessage msg = CStatusMessage(this, m_severityNoWorkingUrl, u"No working URL for '%1'") << CEntityFlags::flagToString(entity);
CLogMessage::preformatted(msg);
}

11
src/blackcore/db/databasewriter.cpp
View File

@@ -17,6 +17,7 @@
#include "blackmisc/network/networkutils.h"
#include "blackmisc/statusmessage.h"
#include <QStringBuilder>
#include <QHttpMultiPart>
#include <QNetworkReply>
#include <QNetworkRequest>
@@ -53,7 +54,7 @@ namespace BlackCore
CStatusMessageList msgs;
if (m_shutdown)
{
msgs.push_back(CStatusMessage(CStatusMessage::SeverityWarning, "Database writer shuts down"));
msgs.push_back(CStatusMessage(CStatusMessage::SeverityWarning, u"Database writer shuts down"));
return msgs;
}
@@ -62,7 +63,7 @@ namespace BlackCore
const bool killed = this->killPendingReply();
if (killed)
{
const CStatusMessage msg(CStatusMessage::SeverityWarning, "Aborted outdated pending reply");
const CStatusMessage msg(CStatusMessage::SeverityWarning, u"Aborted outdated pending reply");
msgs.push_back(CStatusMessage(msg));
// need to let a potential receiver know it has failed
emit this->publishedModels(CAircraftModelList(), CAircraftModelList(), msg, false, false);
@@ -71,7 +72,7 @@ namespace BlackCore
if (m_pendingReply)
{
msgs.push_back(CStatusMessage(CStatusMessage::SeverityWarning, "Another write operation in progress"));
msgs.push_back(CStatusMessage(CStatusMessage::SeverityWarning, u"Another write operation in progress"));
return msgs;
}
@@ -124,7 +125,7 @@ namespace BlackCore
nwReply->close(); // close asap
if (dataFileData.isEmpty())
{
const CStatusMessageList msgs({CStatusMessage(cats, CStatusMessage::SeverityError, "No response data from " + urlString)});
const CStatusMessageList msgs({CStatusMessage(cats, CStatusMessage::SeverityError, u"No response data from " % urlString)});
emit this->publishedModels(CAircraftModelList(), CAircraftModelList(), msgs, false, false);
return;
}
@@ -146,7 +147,7 @@ namespace BlackCore
{
const QString error = nwReply->errorString();
nwReply->close(); // close asap
const CStatusMessageList msgs( {CStatusMessage(cats, CStatusMessage::SeverityError, "HTTP error: " + error)});
const CStatusMessageList msgs( {CStatusMessage(cats, CStatusMessage::SeverityError, u"HTTP error: " % error)});
emit this->publishedModels(CAircraftModelList(), CAircraftModelList(), msgs, false, false);
}
}

5
src/blackcore/db/icaodatareader.cpp
View File

@@ -16,6 +16,7 @@
#include "blackmisc/logmessage.h"
#include "blackmisc/statusmessage.h"
#include <QStringBuilder>
#include <QDateTime>
#include <QDir>
#include <QFlags>
@@ -292,7 +293,7 @@ namespace BlackCore
if (!inconsistent.isEmpty())
{
logInconsistentData(
CStatusMessage(this, CStatusMessage::SeverityInfo, "Inconsistent aircraft codes: " + inconsistent.dbKeysAsString(", ")),
CStatusMessage(this, CStatusMessage::SeverityInfo, u"Inconsistent aircraft codes: " % inconsistent.dbKeysAsString(", ")),
Q_FUNC_INFO);
}
@@ -347,7 +348,7 @@ namespace BlackCore
if (!inconsistent.isEmpty())
{
logInconsistentData(
CStatusMessage(this, CStatusMessage::SeverityInfo, "Inconsistent airline codes: " + inconsistent.dbKeysAsString(", ")),
CStatusMessage(this, CStatusMessage::SeverityInfo, u"Inconsistent airline codes: " % inconsistent.dbKeysAsString(", ")),
Q_FUNC_INFO);
}