namespace core -> serversdk

This commit is contained in:
Filip Bucek 2019-11-06 15:03:21 +01:00
parent 06956a28aa
commit 42d2fd58d1
15 changed files with 29 additions and 29 deletions

View File

@ -1,14 +1,14 @@
#include "core.h" #include "core.h"
#include "logger.h" #include "logger.h"
namespace core { namespace serversdk {
void installLogger(QtMsgType type, const QMessageLogContext &context, const QString &msg) { void installLogger(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
core::Logger::outputMessage(type, context, msg); serversdk::Logger::outputMessage(type, context, msg);
} }
void initAppLogger() { void initAppLogger() {
auto res = qInstallMessageHandler(core::Logger::outputMessage); auto res = qInstallMessageHandler(serversdk::Logger::outputMessage);
if (res) if (res)
qCInfo(sdkcore) << "user message handler qInstallMessageHandler installed sucessfully"; qCInfo(sdkcore) << "user message handler qInstallMessageHandler installed sucessfully";
else else

View File

@ -7,7 +7,7 @@
// c++ // c++
#include <memory> #include <memory>
namespace core { namespace serversdk {
/** internal application logger handler */ /** internal application logger handler */
void installLogger(QtMsgType type, const QMessageLogContext &context, const QString &msg); void installLogger(QtMsgType type, const QMessageLogContext &context, const QString &msg);

View File

@ -1,6 +1,6 @@
#include "databasemanager.h" #include "databasemanager.h"
namespace core { namespace serversdk {
DatabaseManager::DatabaseManager(const QString& host, const QString& dbName, const QString& user, const QString& password, bool dryMode) DatabaseManager::DatabaseManager(const QString& host, const QString& dbName, const QString& user, const QString& password, bool dryMode)
: mDryMode(dryMode) : mDryMode(dryMode)

View File

@ -10,7 +10,7 @@
#include <QDateTime> #include <QDateTime>
//#include "logger.h" //#include "logger.h"
namespace core { namespace serversdk {
class DatabaseManager : public QObject class DatabaseManager : public QObject
{ {

View File

@ -8,7 +8,7 @@ Q_LOGGING_CATEGORY(sdkcore, "sdk.core");
Q_LOGGING_CATEGORY(sdknetwork, "sdk.network"); Q_LOGGING_CATEGORY(sdknetwork, "sdk.network");
Q_LOGGING_CATEGORY(sdkcompress, "sdk.compress"); Q_LOGGING_CATEGORY(sdkcompress, "sdk.compress");
namespace core { namespace serversdk {
Logger* Logger::sConsumer = nullptr; Logger* Logger::sConsumer = nullptr;
//bool Logger::sShowFunction = false; //bool Logger::sShowFunction = false;

View File

@ -12,7 +12,7 @@ Q_DECLARE_LOGGING_CATEGORY(sdkcore)
Q_DECLARE_LOGGING_CATEGORY(sdknetwork) Q_DECLARE_LOGGING_CATEGORY(sdknetwork)
Q_DECLARE_LOGGING_CATEGORY(sdkcompress) Q_DECLARE_LOGGING_CATEGORY(sdkcompress)
namespace core { namespace serversdk {
/** /**
* # Loggger * # Loggger
@ -24,7 +24,7 @@ namespace core {
* *
* @code * @code
* int main() { * int main() {
* core::initAppLogger(); // <-- then Logger::outputMessage will handle all messages * serversdk::initAppLogger(); // <-- then Logger::outputMessage will handle all messages
* // Log messge Filtering * // Log messge Filtering
* QStringList filters; * QStringList filters;
* filters << "qt.*=false"; * filters << "qt.*=false";
@ -50,14 +50,14 @@ public:
/** /**
* @brief User specific consumer of logger messages * @brief User specific consumer of logger messages
* @param consumer - sublass of core::Loger * @param consumer - sublass of serversdk::Loger
* *
* @code * @code
* #include "core.h" * #include "core.h"
* int main() { * int main() {
* core::initAppLogger(); * serversdk::initAppLogger();
* core::Logger logger; * serversdk::Logger logger;
* core::Logger::setConsumer(&logger); * serversdk::Logger::setConsumer(&logger);
* } * }
* @endcode * @endcode
* *
@ -70,7 +70,7 @@ public:
* @code * @code
* #include "core.h" * #include "core.h"
* int main() { * int main() {
* core::initAppLogger(); * serversdk::initAppLogger();
* } * }
* @endcode * @endcode
*/ */
@ -78,11 +78,11 @@ public:
/** Pusing messges from installed message handler */ /** Pusing messges from installed message handler */
virtual void pushMessage(const LoggerMessage& logmsg); virtual void pushMessage(const LoggerMessage& logmsg);
QList<core::LoggerMessage> getNewMessages(int currentCount); QList<serversdk::LoggerMessage> getNewMessages(int currentCount);
signals: signals:
void messageReceived(const core::LoggerMessage &message); void messageReceived(const serversdk::LoggerMessage &message);
void messageListUpdated(); void messageListUpdated();
private: private:
QList<LoggerMessage> mLogMessages; QList<LoggerMessage> mLogMessages;

View File

@ -5,7 +5,7 @@
#include <utility> #include <utility>
namespace core { namespace serversdk {
LoggerMessage::LoggerMessage(QString file, int line, QString function, QString type, QString group, QString msg, QString detailMessage) LoggerMessage::LoggerMessage(QString file, int line, QString function, QString type, QString group, QString msg, QString detailMessage)
: mFile(std::move(file)), mFunction(std::move(function)), mType(std::move(type)), mLine(line), : mFile(std::move(file)), mFunction(std::move(function)), mType(std::move(type)), mLine(line),
@ -56,7 +56,7 @@ QString LoggerMessage::function() const
} // core } // core
QDebug operator<<(QDebug dbg, const core::LoggerMessage &message) QDebug operator<<(QDebug dbg, const serversdk::LoggerMessage &message)
{ {
dbg.nospace() << "message: " << message.message(); dbg.nospace() << "message: " << message.message();
dbg.nospace() << "next output not implemented: " << message.message(); dbg.nospace() << "next output not implemented: " << message.message();

View File

@ -3,7 +3,7 @@
#include <QString> #include <QString>
#include <QObject> #include <QObject>
namespace core { namespace serversdk {
class LoggerMessage class LoggerMessage
{ {
@ -31,6 +31,6 @@ private:
} // core } // core
QDebug operator<<(QDebug dbg, const core::LoggerMessage &message); QDebug operator<<(QDebug dbg, const serversdk::LoggerMessage &message);
Q_DECLARE_METATYPE(core::LoggerMessage) Q_DECLARE_METATYPE(serversdk::LoggerMessage)

View File

@ -4,7 +4,7 @@
#include <QDebug> #include <QDebug>
#include <utility> #include <utility>
namespace core { namespace serversdk {
Request::~Request() Request::~Request()

View File

@ -3,7 +3,7 @@
#include <QString> #include <QString>
#include <QNetworkRequest> #include <QNetworkRequest>
namespace core { namespace serversdk {
class Request : public QObject { class Request : public QObject {
Q_OBJECT Q_OBJECT

View File

@ -7,7 +7,7 @@
#include <memory> #include <memory>
namespace core { namespace serversdk {
/** /**
* @brief Wrapper around QNetworkAccessManger to handle soap protocol * @brief Wrapper around QNetworkAccessManger to handle soap protocol

View File

@ -7,7 +7,7 @@
#include <memory> #include <memory>
namespace core { namespace serversdk {
/** /**
* @brief Will download only ONE ITEM at a time * @brief Will download only ONE ITEM at a time

View File

@ -6,7 +6,7 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
core::initAppLogger(); serversdk::initAppLogger();
qCDebug(sdkcore) << "test message"; qCDebug(sdkcore) << "test message";

View File

@ -2,7 +2,7 @@
#include "serversdk/request.h" #include "serversdk/request.h"
namespace core { namespace serversdk {
void RequestTest::basicAuthorization_test() void RequestTest::basicAuthorization_test()
{ {
@ -16,4 +16,4 @@ void RequestTest::basicAuthorization_test()
} }
QTEST_APPLESS_MAIN(core::RequestTest) QTEST_APPLESS_MAIN(serversdk::RequestTest)

View File

@ -3,7 +3,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
namespace core { namespace serversdk {
class RequestTest : public QObject class RequestTest : public QObject
{ {