From f2602a89155cd191e5073134b5d9f08537f8e644 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Fri, 7 Apr 2017 00:48:54 +0200
Subject: [PATCH] Formatting, const, Doxygen #930

---
 src/blackcore/application.cpp       |  1 +
 src/blackcore/db/databasewriter.cpp | 11 +++++------
 src/blackcore/db/databasewriter.h   |  5 ++++-
 src/blackmisc/network/url.cpp       |  4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp
index 708c0c7be..df2f678b7 100644
--- a/src/blackcore/application.cpp
+++ b/src/blackcore/application.cpp
@@ -42,6 +42,7 @@
 #include <QEventLoop>
 #include <QFile>
 #include <QFileInfo>
+#include <QHttpMultiPart>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QProcess>
diff --git a/src/blackcore/db/databasewriter.cpp b/src/blackcore/db/databasewriter.cpp
index 360ad243f..560ae4f8d 100644
--- a/src/blackcore/db/databasewriter.cpp
+++ b/src/blackcore/db/databasewriter.cpp
@@ -98,16 +98,15 @@ namespace BlackCore
         {
             static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::swiftDbWebservice()}));
             QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
-            m_pendingReply = nullptr;
-            QUrl url(nwReply->url());
-            QString urlString(url.toString());
-
             if (m_shutdown)
             {
                 nwReply->abort();
                 return;
             }
 
+            m_pendingReply = nullptr;
+            const QUrl url(nwReply->url());
+            const QString urlString(url.toString());
             if (nwReply->error() == QNetworkReply::NoError)
             {
                 const QString dataFileData(nwReply->readAll().trimmed());
@@ -128,7 +127,7 @@ namespace BlackCore
             }
             else
             {
-                QString error = nwReply->errorString();
+                const QString error = nwReply->errorString();
                 nwReply->close(); // close asap
                 const CStatusMessageList msgs( {CStatusMessage(cats, CStatusMessage::SeverityError, "HTTP error: " + error)});
                 emit publishedModels(CAircraftModelList(), CAircraftModelList(), msgs, false, false);
@@ -147,7 +146,7 @@ namespace BlackCore
         bool CDatabaseWriter::isReplyOverdue() const
         {
             if (m_replyPendingSince < 0 || !m_pendingReply) { return false; }
-            qint64 ms = QDateTime::currentMSecsSinceEpoch() - m_replyPendingSince;
+            const qint64 ms = QDateTime::currentMSecsSinceEpoch() - m_replyPendingSince;
             return ms > 7500;
         }
 
diff --git a/src/blackcore/db/databasewriter.h b/src/blackcore/db/databasewriter.h
index ea8ba9b15..0359888ac 100644
--- a/src/blackcore/db/databasewriter.h
+++ b/src/blackcore/db/databasewriter.h
@@ -36,7 +36,7 @@ namespace BlackCore
             //! Constructor
             CDatabaseWriter(const BlackMisc::Network::CUrl &baseUrl, QObject *parent);
 
-            //! Write models to DB
+            //! Write model to DB
             BlackMisc::CStatusMessageList asyncPublishModel(const BlackMisc::Simulation::CAircraftModel &model);
 
             //! Write models to DB
@@ -45,6 +45,9 @@ namespace BlackCore
             //! Shutdown
             void gracefulShutdown();
 
+            //! Shutting down?
+            bool isShuttingDown() const { return m_shutdown; }
+
         signals:
             //! Published models, the response to \sa asyncPublishModels
             void publishedModels(const BlackMisc::Simulation::CAircraftModelList &modelsPublished,
diff --git a/src/blackmisc/network/url.cpp b/src/blackmisc/network/url.cpp
index 1ceeeef3e..677349fba 100644
--- a/src/blackmisc/network/url.cpp
+++ b/src/blackmisc/network/url.cpp
@@ -83,7 +83,7 @@ namespace BlackMisc
 
         void CUrl::setQuery(const QString &query)
         {
-            QString q(stripQueryString(query));
+            const QString q(stripQueryString(query));
             m_query = q;
         }
 
@@ -94,7 +94,7 @@ namespace BlackMisc
 
         QString CUrl::appendQuery(const QString &queryToAppend)
         {
-            QString q(stripQueryString(queryToAppend));
+            const QString q(stripQueryString(queryToAppend));
             if (q.isEmpty()) { return m_query;  }
             if (!hasQuery())
             {