From da59ff42a45055d11fc3ad8a280d76346c6dd5b2 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 6 Apr 2017 02:56:39 +0200 Subject: [PATCH] Formatting, comments #930 --- src/blackcore/db/databasereader.h | 9 ++++----- src/blackcore/db/modeldatareader.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/blackcore/db/databasereader.h b/src/blackcore/db/databasereader.h index cd3d95272..793b45cf5 100644 --- a/src/blackcore/db/databasereader.h +++ b/src/blackcore/db/databasereader.h @@ -34,7 +34,6 @@ class QNetworkReply; namespace BlackMisc { class CLogCategoryList; } - namespace BlackCore { namespace Db @@ -109,9 +108,9 @@ namespace BlackCore struct JsonDatastoreResponse : public HeaderResponse { private: - QJsonArray m_jsonArray; //!< JSON array data - int m_arraySize = -1; //!< size of array, if applicable (copied to member for debugging purposes) - bool m_restricted = false; //!< restricted reponse, only changed data + QJsonArray m_jsonArray; //!< JSON array data + int m_arraySize = -1; //!< size of array, if applicable (copied to member for debugging purposes) + bool m_restricted = false; //!< restricted reponse, only changed data public: //! Any data? @@ -274,7 +273,7 @@ namespace BlackCore //! \remark normally constant after startup phase static BlackMisc::Network::CUrl getWorkingDbDataFileLocationUrl(); - //! File appendix for given mode, such as ".php" or ".json" + //! File name for given mode, either php service or shared file name static QString fileNameForMode(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Db::CDbFlags::DataRetrievalModeFlag mode); //! \name Cache access diff --git a/src/blackcore/db/modeldatareader.h b/src/blackcore/db/modeldatareader.h index 0b01f3e5c..eb07d4ef7 100644 --- a/src/blackcore/db/modeldatareader.h +++ b/src/blackcore/db/modeldatareader.h @@ -115,7 +115,7 @@ namespace BlackCore //! \threadsafe bool areAllDataRead() const; - //! Read to JSON file + //! Read from local JSON file BlackMisc::CStatusMessageList readFromJsonFiles(const QString &dir, BlackMisc::Network::CEntityFlags::Entity whatToRead = BlackMisc::Network::CEntityFlags::DistributorLiveryModel); //! Read from static DB data file