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

Formatting

Browse Source
This commit is contained in:
Klaus Basan
2017-09-06 01:18:17 +02:00
committed by Mathew Sutcliffe
parent eab22e86b0
commit a22cd134f8
17 changed files with 68 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,8 +89,8 @@ namespace BlackCore
QString query = params.toString();
const QNetworkRequest request(CNetworkUtils::getNetworkRequest(url, CNetworkUtils::PostUrlEncoded));
sApp->postToNetwork(request, query.toUtf8(), { this, &CDatabaseAuthenticationService::parseServerResponse});
QString rm("Sent request to authentication server %1");
sApp->postToNetwork(request, CApplication::NoLogRequestId, query.toUtf8(), { this, &CDatabaseAuthenticationService::parseServerResponse});
static const QString rm("Sent request to authentication server '%1'");
msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityInfo, rm.arg(url.toQString())));
return msgs;
}

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

@@ -601,10 +601,8 @@ namespace BlackCore
Q_ASSERT_X(CEntityFlags::isSingleEntity(entity), Q_FUNC_INFO, "needs single entity");
switch (mode)
{
case CDbFlags::Shared:
return CDbInfo::entityToSharedName(entity);
case CDbFlags::SharedInfoOnly:
return CDbInfo::sharedInfoFileName();
case CDbFlags::Shared: return CDbInfo::entityToSharedName(entity);
case CDbFlags::SharedInfoOnly: return CDbInfo::sharedInfoFileName();
default:
case CDbFlags::DbReading:
return CDbInfo::entityToServiceName(entity);
@@ -613,7 +611,7 @@ namespace BlackCore
QString CDatabaseReader::dateTimeToDbLatestTs(const QDateTime &ts)
{
if (!ts.isValid()) return "";
if (!ts.isValid()) { return ""; }
return ts.toUTC().toString(Qt::ISODate);
}

8
src/blackcore/db/databasereader.h
View File

@@ -262,10 +262,10 @@ namespace BlackCore
void sharedFileHeaderRead(BlackMisc::Network::CEntityFlags::Entity entity, const QString &fileName, bool success);
protected:
CDatabaseReaderConfigList m_config; //!< DB reder configuration
QString m_statusMessage; //!< Returned status message from watchdog
bool m_1stReplyReceived = false; //!< Successful connection? Does not mean data / authorizations are correct
mutable QReadWriteLock m_statusLock; //!< Lock
CDatabaseReaderConfigList m_config; //!< DB reder configuration
QString m_statusMessage; //!< Returned status message from watchdog
bool m_1stReplyReceived = false; //!< Successful connection? Does not mean data / authorizations are correct
mutable QReadWriteLock m_statusLock; //!< Lock
QNetworkReply::NetworkError m_1stReplyStatus = QNetworkReply::UnknownServerError; //!< Successful connection?
QMap<BlackMisc::Network::CEntityFlags::Entity, HeaderResponse> m_sharedFileResponses; //!< file responses of the shared files
BlackMisc::CStatusMessage::StatusSeverity m_severityNoWorkingUrl = BlackMisc::CStatusMessage::SeverityError; //!< severity of message if there is no working URL

6
src/blackcore/db/databasewriter.h
View File

@@ -61,9 +61,9 @@ namespace BlackCore
private:
BlackMisc::Network::CUrl m_modelPublishUrl;
QNetworkReply *m_pendingReply = nullptr;
qint64 m_replyPendingSince = -1;
bool m_shutdown = false;
QNetworkReply *m_pendingReply = nullptr;
qint64 m_replyPendingSince = -1;
bool m_shutdown = false;
//! Kill the pending reply
bool killPendingReply();