From 141c95fa08e17f37c1ae9f53a7e02748d9855247 Mon Sep 17 00:00:00 2001 From: EndrII Date: Tue, 15 Sep 2020 22:07:49 +0300 Subject: [PATCH] change namespace --- Heart/AbstractSpace/abstractnode.cpp | 4 +- Heart/AbstractSpace/abstractnode.h | 4 +- Heart/AbstractSpace/abstractnodeinfo.cpp | 2 +- Heart/AbstractSpace/abstractnodeinfo.h | 2 +- Heart/AbstractSpace/cryptopairkeys.cpp | 2 +- Heart/AbstractSpace/cryptopairkeys.h | 2 +- Heart/AbstractSpace/datasender.cpp | 4 +- Heart/AbstractSpace/datasender.h | 2 +- Heart/AbstractSpace/header.cpp | 2 +- Heart/AbstractSpace/header.h | 2 +- Heart/AbstractSpace/hostaddress.cpp | 2 +- Heart/AbstractSpace/hostaddress.h | 4 +- Heart/AbstractSpace/icrypto.cpp | 2 +- Heart/AbstractSpace/icrypto.h | 2 +- Heart/AbstractSpace/keystorage.cpp | 2 +- Heart/AbstractSpace/keystorage.h | 2 +- Heart/AbstractSpace/package.cpp | 2 +- Heart/AbstractSpace/package.h | 2 +- Heart/AbstractSpace/packagemanager.cpp | 2 +- Heart/AbstractSpace/packagemanager.h | 2 +- Heart/AbstractSpace/packages/abstractdata.cpp | 2 +- Heart/AbstractSpace/packages/abstractdata.h | 2 +- Heart/AbstractSpace/packages/badrequest.cpp | 2 +- Heart/AbstractSpace/packages/badrequest.h | 2 +- .../packages/closeconnection.cpp | 2 +- .../AbstractSpace/packages/closeconnection.h | 2 +- Heart/AbstractSpace/packages/ping.cpp | 2 +- Heart/AbstractSpace/packages/ping.h | 5 +- Heart/AbstractSpace/qsecretrsa2048.cpp | 2 +- Heart/AbstractSpace/qsecretrsa2048.h | 2 +- Heart/AbstractSpace/receivedata.cpp | 2 +- Heart/AbstractSpace/receivedata.h | 2 +- Heart/AbstractSpace/request.cpp | 2 +- Heart/AbstractSpace/request.h | 2 +- Heart/AbstractSpace/streambase.cpp | 2 +- Heart/AbstractSpace/streambase.h | 2 +- Heart/AbstractSpace/workstate.cpp | 2 +- Heart/AbstractSpace/workstate.h | 2 +- Heart/DataBaseSpace/abstractkey.h | 2 +- Heart/DataBaseSpace/accesstoken.cpp | 2 +- Heart/DataBaseSpace/accesstoken.h | 2 +- Heart/DataBaseSpace/asyncsqldbwriter.cpp | 14 +-- Heart/DataBaseSpace/asyncsqldbwriter.h | 10 +- Heart/DataBaseSpace/basedefines.h | 2 +- Heart/DataBaseSpace/baseid.cpp | 4 +- Heart/DataBaseSpace/baseid.h | 4 +- Heart/DataBaseSpace/basenodeinfo.cpp | 2 +- Heart/DataBaseSpace/basenodeinfo.h | 2 +- Heart/DataBaseSpace/databasenode.cpp | 8 +- Heart/DataBaseSpace/databasenode.h | 2 +- Heart/DataBaseSpace/dbaddress.cpp | 2 +- Heart/DataBaseSpace/dbaddress.h | 2 +- Heart/DataBaseSpace/dbaddresskey.cpp | 2 +- Heart/DataBaseSpace/dbaddresskey.h | 2 +- Heart/DataBaseSpace/dbcachekey.cpp | 2 +- Heart/DataBaseSpace/dbcachekey.h | 2 +- Heart/DataBaseSpace/iobjectprovider.cpp | 2 +- Heart/DataBaseSpace/iobjectprovider.h | 2 +- Heart/DataBaseSpace/packages/dbobject.cpp | 2 +- Heart/DataBaseSpace/packages/dbobject.h | 10 +- .../packages/memberpermisionobject.cpp | 2 +- .../packages/memberpermisionobject.h | 2 +- .../DataBaseSpace/packages/networkmember.cpp | 2 +- Heart/DataBaseSpace/packages/networkmember.h | 2 +- Heart/DataBaseSpace/packages/websocket.cpp | 2 +- Heart/DataBaseSpace/packages/websocket.h | 2 +- .../packages/websocketsubscriptions.cpp | 4 +- .../packages/websocketsubscriptions.h | 2 +- Heart/DataBaseSpace/permisiondata.cpp | 2 +- Heart/DataBaseSpace/permisiondata.h | 2 +- Heart/DataBaseSpace/permission.h | 2 +- Heart/DataBaseSpace/sqldbcache.cpp | 2 +- Heart/DataBaseSpace/sqldbcache.h | 2 +- Heart/DataBaseSpace/sqldbwriter.cpp | 2 +- Heart/DataBaseSpace/sqldbwriter.h | 10 +- Heart/DataBaseSpace/websocketcontroller.cpp | 2 +- Heart/DataBaseSpace/websocketcontroller.h | 2 +- Heart/NetworkSpace/consensus.cpp | 2 +- Heart/NetworkSpace/consensus.h | 2 +- Heart/NetworkSpace/networknode.cpp | 4 +- Heart/NetworkSpace/networknode.h | 2 +- Heart/NetworkSpace/networknodeinfo.cpp | 2 +- Heart/NetworkSpace/networknodeinfo.h | 2 +- .../NetworkSpace/packages/badnoderequest.cpp | 2 +- Heart/NetworkSpace/packages/badnoderequest.h | 2 +- Heart/NetworkSpace/packages/knowaddresses.cpp | 2 +- Heart/NetworkSpace/packages/knowaddresses.h | 2 +- Heart/NetworkSpace/packages/longping.cpp | 4 +- Heart/NetworkSpace/packages/longping.h | 2 +- .../NetworkSpace/packages/networkrequest.cpp | 2 +- Heart/NetworkSpace/packages/networkrequest.h | 2 +- Heart/NetworkSpace/packages/nodeobject.cpp | 2 +- Heart/NetworkSpace/packages/nodeobject.h | 2 +- Heart/NetworkSpace/packages/transportdata.cpp | 2 +- Heart/NetworkSpace/packages/transportdata.h | 2 +- Heart/NetworkSpace/router.cpp | 2 +- Heart/NetworkSpace/router.h | 2 +- Heart/NetworkSpace/senderdata.cpp | 2 +- Heart/NetworkSpace/senderdata.h | 2 +- Heart/NetworkSpace/sign.cpp | 2 +- Heart/NetworkSpace/sign.h | 2 +- Heart/heart.cpp | 2 +- Heart/heart.h | 4 +- HeartTests/AbstractSpace/abstractnodetest.cpp | 22 ++-- HeartTests/AbstractSpace/abstractnodetest.h | 4 +- HeartTests/AbstractSpace/testutils.cpp | 4 +- HeartTests/AbstractSpace/testutils.h | 2 +- HeartTests/DataBaseSpace/basenodetest.cpp | 30 ++--- HeartTests/DataBaseSpace/basenodetest.h | 6 +- .../DataBaseSpace/basenodeunittests.cpp | 8 +- HeartTests/DataBaseSpace/basenodeunittests.h | 6 +- HeartTests/DataBaseSpace/basetestutils.h | 2 +- HeartTests/NetworkSpace/networknodetest.cpp | 24 ++-- HeartTests/NetworkSpace/networknodetest.h | 6 +- .../NetworkSpace/networknodeunittests.cpp | 18 +-- .../NetworkSpace/networknodeunittests.h | 2 +- HeartTests/NetworkSpace/networktestutils.cpp | 20 +-- HeartTests/NetworkSpace/networktestutils.h | 12 +- README.md | 117 +++++++++++++++++- 119 files changed, 332 insertions(+), 222 deletions(-) diff --git a/Heart/AbstractSpace/abstractnode.cpp b/Heart/AbstractSpace/abstractnode.cpp index 704a1c7..76ce8ee 100644 --- a/Heart/AbstractSpace/abstractnode.cpp +++ b/Heart/AbstractSpace/abstractnode.cpp @@ -24,7 +24,7 @@ #include #include -namespace NP { +namespace QH { AbstractNode::AbstractNode(SslMode mode, QObject *ptr): QTcpServer(ptr) { @@ -159,7 +159,7 @@ void AbstractNode::addNode(const HostAddress &nodeAdderess) { QMetaObject::invokeMethod(this, "connectNodePrivate", Qt::QueuedConnection, - Q_ARG(NP::HostAddress, nodeAdderess)); + Q_ARG(QH::HostAddress, nodeAdderess)); } diff --git a/Heart/AbstractSpace/abstractnode.h b/Heart/AbstractSpace/abstractnode.h index 7e55f17..a2e5003 100644 --- a/Heart/AbstractSpace/abstractnode.h +++ b/Heart/AbstractSpace/abstractnode.h @@ -30,7 +30,7 @@ class QSslCertificate; class QSslKey; class QSslConfiguration; -namespace NP { +namespace QH { class DataSender; @@ -445,7 +445,7 @@ private slots: /** * @brief connectNodePrivate */ - void connectNodePrivate(NP::HostAddress); + void connectNodePrivate(QH::HostAddress); private: diff --git a/Heart/AbstractSpace/abstractnodeinfo.cpp b/Heart/AbstractSpace/abstractnodeinfo.cpp index 861429d..f85b699 100644 --- a/Heart/AbstractSpace/abstractnodeinfo.cpp +++ b/Heart/AbstractSpace/abstractnodeinfo.cpp @@ -11,7 +11,7 @@ #include #include -namespace NP { +namespace QH { AbstractNodeInfo::AbstractNodeInfo(QAbstractSocket *sct, const HostAddress *address) { diff --git a/Heart/AbstractSpace/abstractnodeinfo.h b/Heart/AbstractSpace/abstractnodeinfo.h index c9d636b..8628af4 100644 --- a/Heart/AbstractSpace/abstractnodeinfo.h +++ b/Heart/AbstractSpace/abstractnodeinfo.h @@ -16,7 +16,7 @@ class QAbstractSocket; class QHostInfo; -namespace NP { +namespace QH { /** * @brief The TrustNode enum diff --git a/Heart/AbstractSpace/cryptopairkeys.cpp b/Heart/AbstractSpace/cryptopairkeys.cpp index 44846e8..f1dee4a 100644 --- a/Heart/AbstractSpace/cryptopairkeys.cpp +++ b/Heart/AbstractSpace/cryptopairkeys.cpp @@ -1,7 +1,7 @@ #include "cryptopairkeys.h" #include -namespace NP { +namespace QH { CryptoPairKeys::CryptoPairKeys() { } diff --git a/Heart/AbstractSpace/cryptopairkeys.h b/Heart/AbstractSpace/cryptopairkeys.h index 1283eb0..479c605 100644 --- a/Heart/AbstractSpace/cryptopairkeys.h +++ b/Heart/AbstractSpace/cryptopairkeys.h @@ -4,7 +4,7 @@ #include "streambase.h" -namespace NP { +namespace QH { /** * @brief The CryptoPairKeys class contains pair keys. diff --git a/Heart/AbstractSpace/datasender.cpp b/Heart/AbstractSpace/datasender.cpp index 24c2015..854bb1c 100644 --- a/Heart/AbstractSpace/datasender.cpp +++ b/Heart/AbstractSpace/datasender.cpp @@ -3,12 +3,12 @@ #include #include -namespace NP { +namespace QH { DataSender::DataSender() { } -void NP::DataSender::sendPackagePrivate(QByteArray array, void *target) const { +void QH::DataSender::sendPackagePrivate(QByteArray array, void *target) const { auto ptr = static_cast(target); if (array.size() != ptr->write(array)) { QuasarAppUtils::Params::log("not writed data to socket", QuasarAppUtils::Error); diff --git a/Heart/AbstractSpace/datasender.h b/Heart/AbstractSpace/datasender.h index 87bcd42..c58a103 100644 --- a/Heart/AbstractSpace/datasender.h +++ b/Heart/AbstractSpace/datasender.h @@ -5,7 +5,7 @@ class QAbstractSocket; -namespace NP { +namespace QH { /** * @brief The DataSender class - this class create a queue for sendet data to network. diff --git a/Heart/AbstractSpace/header.cpp b/Heart/AbstractSpace/header.cpp index ec2d306..e025e01 100644 --- a/Heart/AbstractSpace/header.cpp +++ b/Heart/AbstractSpace/header.cpp @@ -9,7 +9,7 @@ #include -namespace NP { +namespace QH { Header::Header() { reset(); } diff --git a/Heart/AbstractSpace/header.h b/Heart/AbstractSpace/header.h index fe84141..f8d356a 100644 --- a/Heart/AbstractSpace/header.h +++ b/Heart/AbstractSpace/header.h @@ -10,7 +10,7 @@ #include "heart_global.h" -namespace NP { +namespace QH { /** * @brief The Header struct 12 byte */ diff --git a/Heart/AbstractSpace/hostaddress.cpp b/Heart/AbstractSpace/hostaddress.cpp index e80a991..f2637b8 100644 --- a/Heart/AbstractSpace/hostaddress.cpp +++ b/Heart/AbstractSpace/hostaddress.cpp @@ -1,7 +1,7 @@ #include "hostaddress.h" #include #include -namespace NP { +namespace QH { HostAddress::HostAddress() { diff --git a/Heart/AbstractSpace/hostaddress.h b/Heart/AbstractSpace/hostaddress.h index a09c732..5598846 100644 --- a/Heart/AbstractSpace/hostaddress.h +++ b/Heart/AbstractSpace/hostaddress.h @@ -5,7 +5,7 @@ #include #include "config.h" -namespace NP { +namespace QH { /** * @brief The HostAddress class - this is Wraper of QHostAddress @@ -34,6 +34,6 @@ private: uint qHash(const HostAddress& address); } -Q_DECLARE_METATYPE(NP::HostAddress); +Q_DECLARE_METATYPE(QH::HostAddress); #endif // HOSTADDRESS_H diff --git a/Heart/AbstractSpace/icrypto.cpp b/Heart/AbstractSpace/icrypto.cpp index fb2cddf..0eae680 100644 --- a/Heart/AbstractSpace/icrypto.cpp +++ b/Heart/AbstractSpace/icrypto.cpp @@ -1,7 +1,7 @@ #include "icrypto.h" -namespace NP { +namespace QH { ICrypto::ICrypto() = default; diff --git a/Heart/AbstractSpace/icrypto.h b/Heart/AbstractSpace/icrypto.h index 698c797..66ccdc3 100644 --- a/Heart/AbstractSpace/icrypto.h +++ b/Heart/AbstractSpace/icrypto.h @@ -11,7 +11,7 @@ class QMutex; -namespace NP { +namespace QH { class CryptoPairKeys; diff --git a/Heart/AbstractSpace/keystorage.cpp b/Heart/AbstractSpace/keystorage.cpp index 3ad654b..9903944 100644 --- a/Heart/AbstractSpace/keystorage.cpp +++ b/Heart/AbstractSpace/keystorage.cpp @@ -12,7 +12,7 @@ #include #include "config.h" -namespace NP { +namespace QH { #define THE_CLASS(x) QString::fromLatin1(typeid(*x).name()) #define VERSION_FILE "version" diff --git a/Heart/AbstractSpace/keystorage.h b/Heart/AbstractSpace/keystorage.h index 807a663..3647211 100644 --- a/Heart/AbstractSpace/keystorage.h +++ b/Heart/AbstractSpace/keystorage.h @@ -14,7 +14,7 @@ class QMutex; -namespace NP { +namespace QH { class CryptoPairKeys; class ICrypto; diff --git a/Heart/AbstractSpace/package.cpp b/Heart/AbstractSpace/package.cpp index 9f730eb..a6d24a8 100644 --- a/Heart/AbstractSpace/package.cpp +++ b/Heart/AbstractSpace/package.cpp @@ -10,7 +10,7 @@ #include -namespace NP { +namespace QH { Package::Package() { reset(); diff --git a/Heart/AbstractSpace/package.h b/Heart/AbstractSpace/package.h index 972f9e7..3184ce1 100644 --- a/Heart/AbstractSpace/package.h +++ b/Heart/AbstractSpace/package.h @@ -13,7 +13,7 @@ #include #include -namespace NP { +namespace QH { class Abstract; /** diff --git a/Heart/AbstractSpace/packagemanager.cpp b/Heart/AbstractSpace/packagemanager.cpp index 9526d66..1a348dc 100644 --- a/Heart/AbstractSpace/packagemanager.cpp +++ b/Heart/AbstractSpace/packagemanager.cpp @@ -4,7 +4,7 @@ #include #include -namespace NP { +namespace QH { PackageManager::PackageManager() { diff --git a/Heart/AbstractSpace/packagemanager.h b/Heart/AbstractSpace/packagemanager.h index fa037a4..7e22442 100644 --- a/Heart/AbstractSpace/packagemanager.h +++ b/Heart/AbstractSpace/packagemanager.h @@ -6,7 +6,7 @@ #include -namespace NP { +namespace QH { /** * @brief The PakcageManager class - contains all processed packages diff --git a/Heart/AbstractSpace/packages/abstractdata.cpp b/Heart/AbstractSpace/packages/abstractdata.cpp index 432c6d0..1d81b11 100644 --- a/Heart/AbstractSpace/packages/abstractdata.cpp +++ b/Heart/AbstractSpace/packages/abstractdata.cpp @@ -14,7 +14,7 @@ #include #include -namespace NP { +namespace QH { unsigned short AbstractData::cmd() const { return _cmd; diff --git a/Heart/AbstractSpace/packages/abstractdata.h b/Heart/AbstractSpace/packages/abstractdata.h index e12dbad..7e4ebcf 100644 --- a/Heart/AbstractSpace/packages/abstractdata.h +++ b/Heart/AbstractSpace/packages/abstractdata.h @@ -11,7 +11,7 @@ #include #include -namespace NP { +namespace QH { /** * @brief The AbstractData class diff --git a/Heart/AbstractSpace/packages/badrequest.cpp b/Heart/AbstractSpace/packages/badrequest.cpp index 279b1fb..9b5dfc7 100644 --- a/Heart/AbstractSpace/packages/badrequest.cpp +++ b/Heart/AbstractSpace/packages/badrequest.cpp @@ -9,7 +9,7 @@ #include -namespace NP{ +namespace QH{ BadRequest::BadRequest(const QString &err):AbstractData() { diff --git a/Heart/AbstractSpace/packages/badrequest.h b/Heart/AbstractSpace/packages/badrequest.h index d6deca5..59c14d5 100644 --- a/Heart/AbstractSpace/packages/badrequest.h +++ b/Heart/AbstractSpace/packages/badrequest.h @@ -10,7 +10,7 @@ #include "abstractdata.h" -namespace NP{ +namespace QH{ /** * @brief The BadRequest class diff --git a/Heart/AbstractSpace/packages/closeconnection.cpp b/Heart/AbstractSpace/packages/closeconnection.cpp index e2e93f0..98a720d 100644 --- a/Heart/AbstractSpace/packages/closeconnection.cpp +++ b/Heart/AbstractSpace/packages/closeconnection.cpp @@ -1,6 +1,6 @@ #include "closeconnection.h" -namespace NP { +namespace QH { CloseConnection::CloseConnection() { diff --git a/Heart/AbstractSpace/packages/closeconnection.h b/Heart/AbstractSpace/packages/closeconnection.h index 7a54061..b2017a0 100644 --- a/Heart/AbstractSpace/packages/closeconnection.h +++ b/Heart/AbstractSpace/packages/closeconnection.h @@ -4,7 +4,7 @@ #include "abstractdata.h" -namespace NP{ +namespace QH{ /** * @brief The CloseConnection class - This commnad is request for close connection on parent node of connection diff --git a/Heart/AbstractSpace/packages/ping.cpp b/Heart/AbstractSpace/packages/ping.cpp index ba2ffb3..b74f351 100644 --- a/Heart/AbstractSpace/packages/ping.cpp +++ b/Heart/AbstractSpace/packages/ping.cpp @@ -1,7 +1,7 @@ #include "ping.h" #include -namespace NP { +namespace QH { Ping::Ping() { diff --git a/Heart/AbstractSpace/packages/ping.h b/Heart/AbstractSpace/packages/ping.h index 31aff84..b4130c3 100644 --- a/Heart/AbstractSpace/packages/ping.h +++ b/Heart/AbstractSpace/packages/ping.h @@ -4,7 +4,7 @@ #include "abstractdata.h" -namespace NP { +namespace QH { /** * @brief The Ping class - test class for translate data on network @@ -32,3 +32,6 @@ private: }; } #endif // PING_H + + + diff --git a/Heart/AbstractSpace/qsecretrsa2048.cpp b/Heart/AbstractSpace/qsecretrsa2048.cpp index 25153c0..d7b98dc 100644 --- a/Heart/AbstractSpace/qsecretrsa2048.cpp +++ b/Heart/AbstractSpace/qsecretrsa2048.cpp @@ -3,7 +3,7 @@ #include #include -namespace NP { +namespace QH { QSecretRSA2048::QSecretRSA2048() { qtSecret = new QRSAEncryption(QRSAEncryption::RSA_2048); diff --git a/Heart/AbstractSpace/qsecretrsa2048.h b/Heart/AbstractSpace/qsecretrsa2048.h index 39a0b25..6fb3c0f 100644 --- a/Heart/AbstractSpace/qsecretrsa2048.h +++ b/Heart/AbstractSpace/qsecretrsa2048.h @@ -7,7 +7,7 @@ class QRSAEncryption; -namespace NP { +namespace QH { /** * @brief The QSecretRSA2048 class Use diff --git a/Heart/AbstractSpace/receivedata.cpp b/Heart/AbstractSpace/receivedata.cpp index 10f23a6..236dfad 100644 --- a/Heart/AbstractSpace/receivedata.cpp +++ b/Heart/AbstractSpace/receivedata.cpp @@ -1,6 +1,6 @@ #include "receivedata.h" -namespace NP { +namespace QH { ReceiveData::ReceiveData() { diff --git a/Heart/AbstractSpace/receivedata.h b/Heart/AbstractSpace/receivedata.h index 5074b8a..4347e56 100644 --- a/Heart/AbstractSpace/receivedata.h +++ b/Heart/AbstractSpace/receivedata.h @@ -3,7 +3,7 @@ #include "package.h" -namespace NP { +namespace QH { /** * @brief The ReceiveData struct - this structure contains informaton for parse packages diff --git a/Heart/AbstractSpace/request.cpp b/Heart/AbstractSpace/request.cpp index c3eabfd..c939be5 100644 --- a/Heart/AbstractSpace/request.cpp +++ b/Heart/AbstractSpace/request.cpp @@ -6,7 +6,7 @@ */ #include "request.h" -namespace NP { +namespace QH { Request::Request() { diff --git a/Heart/AbstractSpace/request.h b/Heart/AbstractSpace/request.h index 6713127..fd8aefa 100644 --- a/Heart/AbstractSpace/request.h +++ b/Heart/AbstractSpace/request.h @@ -10,7 +10,7 @@ #include "heart_global.h" -namespace NP { +namespace QH { /** * @brief The Request class - base request methods for data packages diff --git a/Heart/AbstractSpace/streambase.cpp b/Heart/AbstractSpace/streambase.cpp index 4434dad..c00154a 100644 --- a/Heart/AbstractSpace/streambase.cpp +++ b/Heart/AbstractSpace/streambase.cpp @@ -10,7 +10,7 @@ #include -namespace NP { +namespace QH { StreamBase::StreamBase() = default; diff --git a/Heart/AbstractSpace/streambase.h b/Heart/AbstractSpace/streambase.h index a03262d..0b6fbfb 100644 --- a/Heart/AbstractSpace/streambase.h +++ b/Heart/AbstractSpace/streambase.h @@ -13,7 +13,7 @@ #include "heart_global.h" class QDataStream; -namespace NP { +namespace QH { class Package; diff --git a/Heart/AbstractSpace/workstate.cpp b/Heart/AbstractSpace/workstate.cpp index dd7aee7..8a46d81 100644 --- a/Heart/AbstractSpace/workstate.cpp +++ b/Heart/AbstractSpace/workstate.cpp @@ -9,7 +9,7 @@ #include -namespace NP{ +namespace QH{ bool WorkState::getIsRun() const { return isRun; diff --git a/Heart/AbstractSpace/workstate.h b/Heart/AbstractSpace/workstate.h index ea06131..fc3d6d5 100644 --- a/Heart/AbstractSpace/workstate.h +++ b/Heart/AbstractSpace/workstate.h @@ -11,7 +11,7 @@ #include #include -namespace NP { +namespace QH { /** * @brief The WorkState class diff --git a/Heart/DataBaseSpace/abstractkey.h b/Heart/DataBaseSpace/abstractkey.h index d723cb0..4b22206 100644 --- a/Heart/DataBaseSpace/abstractkey.h +++ b/Heart/DataBaseSpace/abstractkey.h @@ -11,7 +11,7 @@ #include -namespace NP { +namespace QH { /** * @brief The Abstractkey class - this class provid one hash function for all keys of database objcets diff --git a/Heart/DataBaseSpace/accesstoken.cpp b/Heart/DataBaseSpace/accesstoken.cpp index f118036..7ac8484 100644 --- a/Heart/DataBaseSpace/accesstoken.cpp +++ b/Heart/DataBaseSpace/accesstoken.cpp @@ -9,7 +9,7 @@ #include #include -namespace NP { +namespace QH { QByteArray AccessToken::generate(const QByteArray &entropy) { diff --git a/Heart/DataBaseSpace/accesstoken.h b/Heart/DataBaseSpace/accesstoken.h index bb960c3..9058b69 100644 --- a/Heart/DataBaseSpace/accesstoken.h +++ b/Heart/DataBaseSpace/accesstoken.h @@ -14,7 +14,7 @@ #include #include -namespace NP { +namespace QH { /** * @brief The AccessToken class - contains info about token and duration of token diff --git a/Heart/DataBaseSpace/asyncsqldbwriter.cpp b/Heart/DataBaseSpace/asyncsqldbwriter.cpp index 26e834c..bd903b2 100644 --- a/Heart/DataBaseSpace/asyncsqldbwriter.cpp +++ b/Heart/DataBaseSpace/asyncsqldbwriter.cpp @@ -13,7 +13,7 @@ #include #include -namespace NP { +namespace QH { AsyncSqlDbWriter::AsyncSqlDbWriter(QObject *ptr): @@ -37,7 +37,7 @@ bool AsyncSqlDbWriter::saveObject(const DBObject *saveObject) { return QMetaObject::invokeMethod(this, "handleSaveObject", Qt::QueuedConnection, - Q_ARG(const NP::DBObject *, saveObject), + Q_ARG(const QH::DBObject *, saveObject), Q_ARG(bool *, nullptr), Q_ARG(bool *, nullptr)); @@ -51,7 +51,7 @@ bool AsyncSqlDbWriter::deleteObject(const DBObject *deleteObject) { return QMetaObject::invokeMethod(this, "handleDeleteObject", Qt::QueuedConnection, - Q_ARG(const NP::DBObject *, deleteObject), + Q_ARG(const QH::DBObject *, deleteObject), Q_ARG(bool *, nullptr), Q_ARG(bool *, nullptr)); } @@ -67,7 +67,7 @@ bool AsyncSqlDbWriter::saveObjectWithWait(const DBObject *saveObject) { bool invoke = QMetaObject::invokeMethod(this, "handleSaveObject", Qt::QueuedConnection, - Q_ARG(const NP::DBObject *, saveObject), + Q_ARG(const QH::DBObject *, saveObject), Q_ARG(bool *, &workResult), Q_ARG(bool *, &workOfEnd)); @@ -95,7 +95,7 @@ bool AsyncSqlDbWriter::deleteObjectWithWait(const DBObject *deleteObject) { bool invoke = QMetaObject::invokeMethod(this, "handleDeleteObject", Qt::QueuedConnection, - Q_ARG(const NP::DBObject *, deleteObject), + Q_ARG(const QH::DBObject *, deleteObject), Q_ARG(bool *, &workResult), Q_ARG(bool *, &workOfEnd)); @@ -124,8 +124,8 @@ bool AsyncSqlDbWriter::getAllObjects(const DBObject &templateObject, QList *, &result), + Q_ARG(const QH::DBObject *, &templateObject), + Q_ARG(QList *, &result), Q_ARG(bool *, &workResult), Q_ARG(bool *, &workOfEnd)); diff --git a/Heart/DataBaseSpace/asyncsqldbwriter.h b/Heart/DataBaseSpace/asyncsqldbwriter.h index 8dbb1bb..76d0ab6 100644 --- a/Heart/DataBaseSpace/asyncsqldbwriter.h +++ b/Heart/DataBaseSpace/asyncsqldbwriter.h @@ -11,7 +11,7 @@ #include "sqldbwriter.h" #include "atomicmetatypes.h" -namespace NP { +namespace QH { /** @@ -73,14 +73,14 @@ protected slots: * @brief handleSaveObject - this method call SaveObject on own thread. * @param saveObject - object for save */ - void handleSaveObject(const NP::DBObject* saveObject, + void handleSaveObject(const QH::DBObject* saveObject, bool *resultOfWork, bool *endOfWork); /** * @brief handleDeleteObject - this method call DeleteObject on own thread. * @param deleteObject object for delete */ - void handleDeleteObject(const NP::DBObject* deleteObject, + void handleDeleteObject(const QH::DBObject* deleteObject, bool *resultOfWork, bool *endOfWork); /** @@ -91,8 +91,8 @@ protected slots: * @param endOfWork - this ptr set true when invocked method is finished * @param cb - this call back method invoke after getAllObjects method */ - virtual void handleGetAllObject(const NP::DBObject *templateObject, - QList *result, + virtual void handleGetAllObject(const QH::DBObject *templateObject, + QList *result, bool *resultOfWork, bool *endOfWork = nullptr); /** diff --git a/Heart/DataBaseSpace/basedefines.h b/Heart/DataBaseSpace/basedefines.h index 251f2f0..40f6f40 100644 --- a/Heart/DataBaseSpace/basedefines.h +++ b/Heart/DataBaseSpace/basedefines.h @@ -1,7 +1,7 @@ #ifndef BASEDEFINES_H #define BASEDEFINES_H -namespace NP { +namespace QH { /** * @brief The DBOperationResult enum diff --git a/Heart/DataBaseSpace/baseid.cpp b/Heart/DataBaseSpace/baseid.cpp index 983de18..6cc30b5 100644 --- a/Heart/DataBaseSpace/baseid.cpp +++ b/Heart/DataBaseSpace/baseid.cpp @@ -1,5 +1,5 @@ #include "baseid.h" -namespace NP { +namespace QH { BaseId::BaseId() = default; @@ -68,7 +68,7 @@ bool operator==(const BaseId &left, const BaseId &other) { } -uint qHash(const NP::BaseId &object) { +uint qHash(const QH::BaseId &object) { return qHash(object.toRaw()); } } diff --git a/Heart/DataBaseSpace/baseid.h b/Heart/DataBaseSpace/baseid.h index 54a9d17..36f7c23 100644 --- a/Heart/DataBaseSpace/baseid.h +++ b/Heart/DataBaseSpace/baseid.h @@ -11,7 +11,7 @@ #include #include -namespace NP { +namespace QH { /** * @brief The BaseId class. General class for work with database id. @@ -87,7 +87,7 @@ private: }; -uint qHash(const NP::BaseId& object); +uint qHash(const QH::BaseId& object); } diff --git a/Heart/DataBaseSpace/basenodeinfo.cpp b/Heart/DataBaseSpace/basenodeinfo.cpp index f6c44e6..d9b5473 100644 --- a/Heart/DataBaseSpace/basenodeinfo.cpp +++ b/Heart/DataBaseSpace/basenodeinfo.cpp @@ -10,7 +10,7 @@ #include #include -namespace NP { +namespace QH { BaseNodeInfo::BaseNodeInfo(QAbstractSocket *tcp, const HostAddress* address): diff --git a/Heart/DataBaseSpace/basenodeinfo.h b/Heart/DataBaseSpace/basenodeinfo.h index b7ff5c6..d1bdd37 100644 --- a/Heart/DataBaseSpace/basenodeinfo.h +++ b/Heart/DataBaseSpace/basenodeinfo.h @@ -15,7 +15,7 @@ #include class QAbstractSocket; -namespace NP { +namespace QH { class DbAddress; diff --git a/Heart/DataBaseSpace/databasenode.cpp b/Heart/DataBaseSpace/databasenode.cpp index 28c7b9b..89dd203 100644 --- a/Heart/DataBaseSpace/databasenode.cpp +++ b/Heart/DataBaseSpace/databasenode.cpp @@ -27,9 +27,9 @@ #include #define THIS_NODE "this_node_key" -namespace NP { +namespace QH { -DataBaseNode::DataBaseNode(NP::SslMode mode, QObject *ptr): +DataBaseNode::DataBaseNode(QH::SslMode mode, QObject *ptr): AbstractNode(mode, ptr) { _webSocketWorker = new WebSocketController(this); @@ -326,8 +326,8 @@ QVariantMap DataBaseNode::defaultDbParams() const { }; } -DBOperationResult NP::DataBaseNode::getObject(const NP::BaseId &requester, - const NP::DBObject &templateObj, +DBOperationResult QH::DataBaseNode::getObject(const QH::BaseId &requester, + const QH::DBObject &templateObj, const DBObject** result) const { if (!_db && !result) { diff --git a/Heart/DataBaseSpace/databasenode.h b/Heart/DataBaseSpace/databasenode.h index a3740f9..c9f541a 100644 --- a/Heart/DataBaseSpace/databasenode.h +++ b/Heart/DataBaseSpace/databasenode.h @@ -14,7 +14,7 @@ #include -namespace NP { +namespace QH { class SqlDBCache; class SqlDBWriter; diff --git a/Heart/DataBaseSpace/dbaddress.cpp b/Heart/DataBaseSpace/dbaddress.cpp index bf1e1e6..0601ddf 100644 --- a/Heart/DataBaseSpace/dbaddress.cpp +++ b/Heart/DataBaseSpace/dbaddress.cpp @@ -10,7 +10,7 @@ #include -namespace NP { +namespace QH { qint64 qHash(const DbAddress &address) { return qHash(address.id().toRaw() + address.table()); diff --git a/Heart/DataBaseSpace/dbaddress.h b/Heart/DataBaseSpace/dbaddress.h index b5fc917..31f8d0d 100644 --- a/Heart/DataBaseSpace/dbaddress.h +++ b/Heart/DataBaseSpace/dbaddress.h @@ -12,7 +12,7 @@ #include "basedefines.h" #include "baseid.h" -namespace NP { +namespace QH { /** * @brief The DbAddress class - this is address of data base object diff --git a/Heart/DataBaseSpace/dbaddresskey.cpp b/Heart/DataBaseSpace/dbaddresskey.cpp index 373f563..4a30398 100644 --- a/Heart/DataBaseSpace/dbaddresskey.cpp +++ b/Heart/DataBaseSpace/dbaddresskey.cpp @@ -1,5 +1,5 @@ #include "dbaddresskey.h" -namespace NP { +namespace QH { DbAddressKey::DbAddressKey() { diff --git a/Heart/DataBaseSpace/dbaddresskey.h b/Heart/DataBaseSpace/dbaddresskey.h index 9d0e0b4..2849b7f 100644 --- a/Heart/DataBaseSpace/dbaddresskey.h +++ b/Heart/DataBaseSpace/dbaddresskey.h @@ -11,7 +11,7 @@ #include "abstractkey.h" #include "dbaddress.h" -namespace NP { +namespace QH { /** * @brief The DbAddressKey class - key provider for DbAddress diff --git a/Heart/DataBaseSpace/dbcachekey.cpp b/Heart/DataBaseSpace/dbcachekey.cpp index f1deeee..f9e6eee 100644 --- a/Heart/DataBaseSpace/dbcachekey.cpp +++ b/Heart/DataBaseSpace/dbcachekey.cpp @@ -9,7 +9,7 @@ #include "dbcachekey.h" #include -namespace NP { +namespace QH { DBCacheKey *DBCacheKey::instance() { static auto ptr = new DBCacheKey(); diff --git a/Heart/DataBaseSpace/dbcachekey.h b/Heart/DataBaseSpace/dbcachekey.h index 916197f..42ddab6 100644 --- a/Heart/DataBaseSpace/dbcachekey.h +++ b/Heart/DataBaseSpace/dbcachekey.h @@ -15,7 +15,7 @@ #include #include -namespace NP { +namespace QH { /** * @brief The DBCacheKey class - is database main key value diff --git a/Heart/DataBaseSpace/iobjectprovider.cpp b/Heart/DataBaseSpace/iobjectprovider.cpp index 2de298e..5023780 100644 --- a/Heart/DataBaseSpace/iobjectprovider.cpp +++ b/Heart/DataBaseSpace/iobjectprovider.cpp @@ -7,7 +7,7 @@ #include "iobjectprovider.h" -namespace NP { +namespace QH { iObjectProvider::iObjectProvider() = default; iObjectProvider::~iObjectProvider() = default; diff --git a/Heart/DataBaseSpace/iobjectprovider.h b/Heart/DataBaseSpace/iobjectprovider.h index 43bdd3f..2ef1aa6 100644 --- a/Heart/DataBaseSpace/iobjectprovider.h +++ b/Heart/DataBaseSpace/iobjectprovider.h @@ -13,7 +13,7 @@ #include #include -namespace NP { +namespace QH { class AbstractData; diff --git a/Heart/DataBaseSpace/packages/dbobject.cpp b/Heart/DataBaseSpace/packages/dbobject.cpp index 17dc206..81d6bda 100644 --- a/Heart/DataBaseSpace/packages/dbobject.cpp +++ b/Heart/DataBaseSpace/packages/dbobject.cpp @@ -16,7 +16,7 @@ #include #include -namespace NP { +namespace QH { DBObject::DBObject(const QString &tableName) { clear(); diff --git a/Heart/DataBaseSpace/packages/dbobject.h b/Heart/DataBaseSpace/packages/dbobject.h index 78c759d..cc5e422 100644 --- a/Heart/DataBaseSpace/packages/dbobject.h +++ b/Heart/DataBaseSpace/packages/dbobject.h @@ -17,7 +17,7 @@ class QSqlQuery; -namespace NP { +namespace QH { /** * @brief The PrepareResult enum - result of work prepare sql query @@ -204,9 +204,9 @@ private: }; } -Q_DECLARE_METATYPE(const NP::DBObject*) -Q_DECLARE_METATYPE(NP::DBObject*) -Q_DECLARE_METATYPE(QList*); -Q_DECLARE_METATYPE(QList*); +Q_DECLARE_METATYPE(const QH::DBObject*) +Q_DECLARE_METATYPE(QH::DBObject*) +Q_DECLARE_METATYPE(QList*); +Q_DECLARE_METATYPE(QList*); #endif // DBOBJECT_H diff --git a/Heart/DataBaseSpace/packages/memberpermisionobject.cpp b/Heart/DataBaseSpace/packages/memberpermisionobject.cpp index 9a51877..19f5213 100644 --- a/Heart/DataBaseSpace/packages/memberpermisionobject.cpp +++ b/Heart/DataBaseSpace/packages/memberpermisionobject.cpp @@ -11,7 +11,7 @@ #include #include -namespace NP { +namespace QH { MemberPermisionObject::MemberPermisionObject(): DBObject("MemberPermisions") { diff --git a/Heart/DataBaseSpace/packages/memberpermisionobject.h b/Heart/DataBaseSpace/packages/memberpermisionobject.h index a8e0ebd..47135cf 100644 --- a/Heart/DataBaseSpace/packages/memberpermisionobject.h +++ b/Heart/DataBaseSpace/packages/memberpermisionobject.h @@ -13,7 +13,7 @@ #include "permisiondata.h" #include "permission.h" -namespace NP { +namespace QH { /** * @brief The NodesPermisionObject class - database object of permisions of node diff --git a/Heart/DataBaseSpace/packages/networkmember.cpp b/Heart/DataBaseSpace/packages/networkmember.cpp index 74985bb..a0c2503 100644 --- a/Heart/DataBaseSpace/packages/networkmember.cpp +++ b/Heart/DataBaseSpace/packages/networkmember.cpp @@ -14,7 +14,7 @@ #include -namespace NP { +namespace QH { NetworkMember::NetworkMember():DBObject("NetworkMembers") { diff --git a/Heart/DataBaseSpace/packages/networkmember.h b/Heart/DataBaseSpace/packages/networkmember.h index c79181f..53f3bd5 100644 --- a/Heart/DataBaseSpace/packages/networkmember.h +++ b/Heart/DataBaseSpace/packages/networkmember.h @@ -12,7 +12,7 @@ #include "dbobject.h" -namespace NP { +namespace QH { /** * @brief The NodeObject class - database structure of node diff --git a/Heart/DataBaseSpace/packages/websocket.cpp b/Heart/DataBaseSpace/packages/websocket.cpp index 44b8ad5..5f8dc95 100644 --- a/Heart/DataBaseSpace/packages/websocket.cpp +++ b/Heart/DataBaseSpace/packages/websocket.cpp @@ -9,7 +9,7 @@ #include #include -namespace NP { +namespace QH { WebSocket::WebSocket(): AbstractData(){ diff --git a/Heart/DataBaseSpace/packages/websocket.h b/Heart/DataBaseSpace/packages/websocket.h index 976e39d..f0bf3de 100644 --- a/Heart/DataBaseSpace/packages/websocket.h +++ b/Heart/DataBaseSpace/packages/websocket.h @@ -12,7 +12,7 @@ #include "request.h" -namespace NP { +namespace QH { /** * @brief The WebSocketRequest enum diff --git a/Heart/DataBaseSpace/packages/websocketsubscriptions.cpp b/Heart/DataBaseSpace/packages/websocketsubscriptions.cpp index 84ac995..00f2f68 100644 --- a/Heart/DataBaseSpace/packages/websocketsubscriptions.cpp +++ b/Heart/DataBaseSpace/packages/websocketsubscriptions.cpp @@ -9,14 +9,14 @@ #include -namespace NP { +namespace QH { WebSocketSubscriptions::WebSocketSubscriptions() { } -WebSocketSubscriptions::WebSocketSubscriptions(const NP::Package &package): +WebSocketSubscriptions::WebSocketSubscriptions(const QH::Package &package): WebSocketSubscriptions() { fromBytes(package.data); diff --git a/Heart/DataBaseSpace/packages/websocketsubscriptions.h b/Heart/DataBaseSpace/packages/websocketsubscriptions.h index 9a43281..65694bc 100644 --- a/Heart/DataBaseSpace/packages/websocketsubscriptions.h +++ b/Heart/DataBaseSpace/packages/websocketsubscriptions.h @@ -14,7 +14,7 @@ #include -namespace NP { +namespace QH { /** * @brief The WebSocketSubscriptions class diff --git a/Heart/DataBaseSpace/permisiondata.cpp b/Heart/DataBaseSpace/permisiondata.cpp index dff732c..f540f6b 100644 --- a/Heart/DataBaseSpace/permisiondata.cpp +++ b/Heart/DataBaseSpace/permisiondata.cpp @@ -3,7 +3,7 @@ #include #include -namespace NP { +namespace QH { bool operator ==(const PermisionData &left, const PermisionData &right) { return left._id == right._id && left._address == right._address; diff --git a/Heart/DataBaseSpace/permisiondata.h b/Heart/DataBaseSpace/permisiondata.h index 9570a0c..3fc0f5b 100644 --- a/Heart/DataBaseSpace/permisiondata.h +++ b/Heart/DataBaseSpace/permisiondata.h @@ -5,7 +5,7 @@ #include #include "dbaddress.h" -namespace NP { +namespace QH { /** * @brief The PermisionData class- this class provide unique key for permison of subject (id) to object (address). diff --git a/Heart/DataBaseSpace/permission.h b/Heart/DataBaseSpace/permission.h index 1720296..8ddf671 100644 --- a/Heart/DataBaseSpace/permission.h +++ b/Heart/DataBaseSpace/permission.h @@ -1,6 +1,6 @@ #ifndef PERMISIONS_H #define PERMISIONS_H -namespace NP { +namespace QH { /** * @brief The Permission enum diff --git a/Heart/DataBaseSpace/sqldbcache.cpp b/Heart/DataBaseSpace/sqldbcache.cpp index 2bf7570..5969fb4 100644 --- a/Heart/DataBaseSpace/sqldbcache.cpp +++ b/Heart/DataBaseSpace/sqldbcache.cpp @@ -18,7 +18,7 @@ #include -namespace NP { +namespace QH { void SqlDBCache::globalUpdateDataBasePrivate(qint64 currentTime) { diff --git a/Heart/DataBaseSpace/sqldbcache.h b/Heart/DataBaseSpace/sqldbcache.h index 073c520..41441f8 100644 --- a/Heart/DataBaseSpace/sqldbcache.h +++ b/Heart/DataBaseSpace/sqldbcache.h @@ -19,7 +19,7 @@ #include "config.h" #include "basedefines.h" -namespace NP { +namespace QH { class SqlDBWriter; class DBObject; diff --git a/Heart/DataBaseSpace/sqldbwriter.cpp b/Heart/DataBaseSpace/sqldbwriter.cpp index 7255196..4642cb4 100644 --- a/Heart/DataBaseSpace/sqldbwriter.cpp +++ b/Heart/DataBaseSpace/sqldbwriter.cpp @@ -21,7 +21,7 @@ #include #include -namespace NP { +namespace QH { bool SqlDBWriter::exec(QSqlQuery *sq,const QString& sqlFile) { QFile f(sqlFile); diff --git a/Heart/DataBaseSpace/sqldbwriter.h b/Heart/DataBaseSpace/sqldbwriter.h index e164b09..018cb4f 100644 --- a/Heart/DataBaseSpace/sqldbwriter.h +++ b/Heart/DataBaseSpace/sqldbwriter.h @@ -22,7 +22,7 @@ class QSqlDatabase; class PlayerDBData; -namespace NP { +namespace QH { /** * @brief The SqlDBWriter class @@ -64,13 +64,13 @@ public: * @brief saveObject * @return */ - bool saveObject(const NP::DBObject *ptr) override; + bool saveObject(const QH::DBObject *ptr) override; /** * @brief deleteObject * @return */ - bool deleteObject(const NP::DBObject *ptr) override; + bool deleteObject(const QH::DBObject *ptr) override; /** * @brief databaseLocation - return location of database. @@ -128,7 +128,7 @@ protected: * @param ptr * @return true if function finished seccussful */ - virtual bool saveQuery(const NP::DBObject *ptr) const; + virtual bool saveQuery(const QH::DBObject *ptr) const; /** * @brief selectQuery generate select query to database from parameters @@ -140,7 +140,7 @@ protected: */ virtual bool selectQuery(const DBObject &requestObject, QList &result); - virtual bool deleteQuery(const NP::DBObject *deleteObject) const; + virtual bool deleteQuery(const QH::DBObject *deleteObject) const; private: diff --git a/Heart/DataBaseSpace/websocketcontroller.cpp b/Heart/DataBaseSpace/websocketcontroller.cpp index dc4f1bd..1540491 100644 --- a/Heart/DataBaseSpace/websocketcontroller.cpp +++ b/Heart/DataBaseSpace/websocketcontroller.cpp @@ -11,7 +11,7 @@ #include #include -namespace NP { +namespace QH { WebSocketController::WebSocketController(DataBaseNode *node) { diff --git a/Heart/DataBaseSpace/websocketcontroller.h b/Heart/DataBaseSpace/websocketcontroller.h index 9040350..e460117 100644 --- a/Heart/DataBaseSpace/websocketcontroller.h +++ b/Heart/DataBaseSpace/websocketcontroller.h @@ -15,7 +15,7 @@ #include #include -namespace NP { +namespace QH { class AbstractNodeInfo; class DataBaseNode; diff --git a/Heart/NetworkSpace/consensus.cpp b/Heart/NetworkSpace/consensus.cpp index 29b0d41..8754765 100644 --- a/Heart/NetworkSpace/consensus.cpp +++ b/Heart/NetworkSpace/consensus.cpp @@ -1,6 +1,6 @@ #include "consensus.h" -namespace NP { +namespace QH { const QStringList Consensus::Nodes = { "QuasarApp.ddns.net" diff --git a/Heart/NetworkSpace/consensus.h b/Heart/NetworkSpace/consensus.h index baef1e9..af24c9c 100644 --- a/Heart/NetworkSpace/consensus.h +++ b/Heart/NetworkSpace/consensus.h @@ -4,7 +4,7 @@ #include "heart_global.h" #include -namespace NP { +namespace QH { /** * @brief The Consensus namespace - a bundle of general rules constants for behavior of nodes network. diff --git a/Heart/NetworkSpace/networknode.cpp b/Heart/NetworkSpace/networknode.cpp index 648408f..644b258 100644 --- a/Heart/NetworkSpace/networknode.cpp +++ b/Heart/NetworkSpace/networknode.cpp @@ -35,9 +35,9 @@ #define THIS_NODE "this_node_key" -namespace NP { +namespace QH { -NetworkNode::NetworkNode(NP::SslMode mode, QObject *ptr): +NetworkNode::NetworkNode(QH::SslMode mode, QObject *ptr): DataBaseNode(mode, ptr) { _nodeKeys = new KeyStorage(new QSecretRSA2048()); diff --git a/Heart/NetworkSpace/networknode.h b/Heart/NetworkSpace/networknode.h index dd5edd3..0f20ef6 100644 --- a/Heart/NetworkSpace/networknode.h +++ b/Heart/NetworkSpace/networknode.h @@ -14,7 +14,7 @@ #include -namespace NP { +namespace QH { class NetworkMember; class MemberPermisionObject; diff --git a/Heart/NetworkSpace/networknodeinfo.cpp b/Heart/NetworkSpace/networknodeinfo.cpp index 7be1158..7226a33 100644 --- a/Heart/NetworkSpace/networknodeinfo.cpp +++ b/Heart/NetworkSpace/networknodeinfo.cpp @@ -10,7 +10,7 @@ #include #include -namespace NP { +namespace QH { NetworkNodeInfo::NetworkNodeInfo(QAbstractSocket *tcp, const HostAddress* address): diff --git a/Heart/NetworkSpace/networknodeinfo.h b/Heart/NetworkSpace/networknodeinfo.h index b66112c..ca544a9 100644 --- a/Heart/NetworkSpace/networknodeinfo.h +++ b/Heart/NetworkSpace/networknodeinfo.h @@ -15,7 +15,7 @@ #include class QAbstractSocket; -namespace NP { +namespace QH { class DbAddress; diff --git a/Heart/NetworkSpace/packages/badnoderequest.cpp b/Heart/NetworkSpace/packages/badnoderequest.cpp index b85ba75..181072f 100644 --- a/Heart/NetworkSpace/packages/badnoderequest.cpp +++ b/Heart/NetworkSpace/packages/badnoderequest.cpp @@ -6,7 +6,7 @@ */ #include "badnoderequest.h" -namespace NP { +namespace QH { BadNodeRequest::BadNodeRequest() { diff --git a/Heart/NetworkSpace/packages/badnoderequest.h b/Heart/NetworkSpace/packages/badnoderequest.h index f0b0fae..67e2ccc 100644 --- a/Heart/NetworkSpace/packages/badnoderequest.h +++ b/Heart/NetworkSpace/packages/badnoderequest.h @@ -12,7 +12,7 @@ #include -namespace NP { +namespace QH { /** * @brief The BadNodeRequest class - bad request command for bae node level diff --git a/Heart/NetworkSpace/packages/knowaddresses.cpp b/Heart/NetworkSpace/packages/knowaddresses.cpp index cc78236..1d5aed3 100644 --- a/Heart/NetworkSpace/packages/knowaddresses.cpp +++ b/Heart/NetworkSpace/packages/knowaddresses.cpp @@ -2,7 +2,7 @@ #include -namespace NP { +namespace QH { KnowAddresses::KnowAddresses() { diff --git a/Heart/NetworkSpace/packages/knowaddresses.h b/Heart/NetworkSpace/packages/knowaddresses.h index a4c8e59..1306943 100644 --- a/Heart/NetworkSpace/packages/knowaddresses.h +++ b/Heart/NetworkSpace/packages/knowaddresses.h @@ -5,7 +5,7 @@ #include #include -namespace NP { +namespace QH { /** * @brief The KnowAddresses class - this class is package for send the list of know addresses of node to other node object. diff --git a/Heart/NetworkSpace/packages/longping.cpp b/Heart/NetworkSpace/packages/longping.cpp index 37931a2..d742281 100644 --- a/Heart/NetworkSpace/packages/longping.cpp +++ b/Heart/NetworkSpace/packages/longping.cpp @@ -1,6 +1,6 @@ #include "longping.h" -namespace NP { +namespace QH { LongPing::LongPing(const BaseId& sender) { @@ -27,7 +27,7 @@ bool LongPing::copyFrom(const AbstractData * other) { return true; } -QDataStream &NP::LongPing::fromStream(QDataStream &stream) { +QDataStream &QH::LongPing::fromStream(QDataStream &stream) { Ping::fromStream(stream); stream >> _senderID; return stream; diff --git a/Heart/NetworkSpace/packages/longping.h b/Heart/NetworkSpace/packages/longping.h index bbd8db8..027bffe 100644 --- a/Heart/NetworkSpace/packages/longping.h +++ b/Heart/NetworkSpace/packages/longping.h @@ -4,7 +4,7 @@ #include "ping.h" #include -namespace NP { +namespace QH { /** * @brief The LongPing class - test class for big network with return addresse diff --git a/Heart/NetworkSpace/packages/networkrequest.cpp b/Heart/NetworkSpace/packages/networkrequest.cpp index 0563c40..9531544 100644 --- a/Heart/NetworkSpace/packages/networkrequest.cpp +++ b/Heart/NetworkSpace/packages/networkrequest.cpp @@ -1,7 +1,7 @@ #include "networkrequest.h" #include -namespace NP { +namespace QH { NetworkRequest::NetworkRequest() { diff --git a/Heart/NetworkSpace/packages/networkrequest.h b/Heart/NetworkSpace/packages/networkrequest.h index 23b5d88..8d40d0a 100644 --- a/Heart/NetworkSpace/packages/networkrequest.h +++ b/Heart/NetworkSpace/packages/networkrequest.h @@ -6,7 +6,7 @@ #include -namespace NP { +namespace QH { /** * @brief The NetworkRequest class - this is pakcage wraper for sending requests to network. diff --git a/Heart/NetworkSpace/packages/nodeobject.cpp b/Heart/NetworkSpace/packages/nodeobject.cpp index 77121bd..9a78a87 100644 --- a/Heart/NetworkSpace/packages/nodeobject.cpp +++ b/Heart/NetworkSpace/packages/nodeobject.cpp @@ -1,5 +1,5 @@ #include "nodeobject.h" -namespace NP { +namespace QH { NodeObject::NodeObject() { diff --git a/Heart/NetworkSpace/packages/nodeobject.h b/Heart/NetworkSpace/packages/nodeobject.h index ebff06a..d4e0f54 100644 --- a/Heart/NetworkSpace/packages/nodeobject.h +++ b/Heart/NetworkSpace/packages/nodeobject.h @@ -3,7 +3,7 @@ #include #include -namespace NP { +namespace QH { /** * @brief The NodeObject class diff --git a/Heart/NetworkSpace/packages/transportdata.cpp b/Heart/NetworkSpace/packages/transportdata.cpp index 0c4c355..2bf7b1b 100644 --- a/Heart/NetworkSpace/packages/transportdata.cpp +++ b/Heart/NetworkSpace/packages/transportdata.cpp @@ -9,7 +9,7 @@ #include #include #include -namespace NP { +namespace QH { TransportData::TransportData() { diff --git a/Heart/NetworkSpace/packages/transportdata.h b/Heart/NetworkSpace/packages/transportdata.h index f8ce744..3c9dc97 100644 --- a/Heart/NetworkSpace/packages/transportdata.h +++ b/Heart/NetworkSpace/packages/transportdata.h @@ -13,7 +13,7 @@ #include "hostaddress.h" -namespace NP { +namespace QH { class NETWORKPROTOCOLSHARED_EXPORT TransportData: public AbstractData, public SenderData { diff --git a/Heart/NetworkSpace/router.cpp b/Heart/NetworkSpace/router.cpp index d1fd9dc..97daa5c 100644 --- a/Heart/NetworkSpace/router.cpp +++ b/Heart/NetworkSpace/router.cpp @@ -3,7 +3,7 @@ #include #include -namespace NP { +namespace QH { Router::Router() { } diff --git a/Heart/NetworkSpace/router.h b/Heart/NetworkSpace/router.h index fa6cf5b..4735f44 100644 --- a/Heart/NetworkSpace/router.h +++ b/Heart/NetworkSpace/router.h @@ -6,7 +6,7 @@ #include #include -namespace NP { +namespace QH { /** * @brief The Router class - this class contains routes of nodes and optimise exists routes diff --git a/Heart/NetworkSpace/senderdata.cpp b/Heart/NetworkSpace/senderdata.cpp index ed7a6d2..14236dd 100644 --- a/Heart/NetworkSpace/senderdata.cpp +++ b/Heart/NetworkSpace/senderdata.cpp @@ -6,7 +6,7 @@ */ #include "senderdata.h" -namespace NP { +namespace QH { SenderData::SenderData() { diff --git a/Heart/NetworkSpace/senderdata.h b/Heart/NetworkSpace/senderdata.h index 6fd2787..b11fff5 100644 --- a/Heart/NetworkSpace/senderdata.h +++ b/Heart/NetworkSpace/senderdata.h @@ -9,7 +9,7 @@ #define SENDERDATA_H #include "baseid.h" -namespace NP { +namespace QH { /** * @brief The SenderData class - this is base interface class for get sender id of data base objects diff --git a/Heart/NetworkSpace/sign.cpp b/Heart/NetworkSpace/sign.cpp index 96f0f05..2aa02fc 100644 --- a/Heart/NetworkSpace/sign.cpp +++ b/Heart/NetworkSpace/sign.cpp @@ -1,5 +1,5 @@ #include "sign.h" -namespace NP { +namespace QH { Sign::Sign() { diff --git a/Heart/NetworkSpace/sign.h b/Heart/NetworkSpace/sign.h index ac821bf..3ed391d 100644 --- a/Heart/NetworkSpace/sign.h +++ b/Heart/NetworkSpace/sign.h @@ -5,7 +5,7 @@ #include "heart_global.h" -namespace NP { +namespace QH { /** * @brief The Sign class - this class contains sign of child data package. diff --git a/Heart/heart.cpp b/Heart/heart.cpp index f6cd684..219699b 100644 --- a/Heart/heart.cpp +++ b/Heart/heart.cpp @@ -10,6 +10,6 @@ #include #include -namespace NP { +namespace QH { } diff --git a/Heart/heart.h b/Heart/heart.h index 2dd3cc0..295ec44 100644 --- a/Heart/heart.h +++ b/Heart/heart.h @@ -12,12 +12,12 @@ #include "abstractnode.h" /** - * NP - Network protocol + * QH - Network protocol * defirent values: * SP - shared pointer * WP - weak pointer */ -namespace NP { +namespace QH { } #endif // NETWORKPROTOCOL_H diff --git a/HeartTests/AbstractSpace/abstractnodetest.cpp b/HeartTests/AbstractSpace/abstractnodetest.cpp index e237d66..1900dd2 100644 --- a/HeartTests/AbstractSpace/abstractnodetest.cpp +++ b/HeartTests/AbstractSpace/abstractnodetest.cpp @@ -6,30 +6,30 @@ #include #include -class TestingClient: public NP::AbstractNode { +class TestingClient: public QH::AbstractNode { // AbstractNode interface public: - const NP::Ping& getPing() const { + const QH::Ping& getPing() const { return _ping; } protected: - void incomingData(NP::AbstractData *pkg, const NP::HostAddress &sender) { + void incomingData(QH::AbstractData *pkg, const QH::HostAddress &sender) { Q_UNUSED(sender); - auto ping = dynamic_cast(pkg); + auto ping = dynamic_cast(pkg); if (ping) _ping.copyFrom(ping); } private: - NP::Ping _ping; + QH::Ping _ping; }; AbstractNodeTest::AbstractNodeTest() { - _nodeA = new NP::AbstractNode(); + _nodeA = new QH::AbstractNode(); _nodeB = new TestingClient(); } @@ -55,7 +55,7 @@ bool AbstractNodeTest::connectTest() { bool AbstractNodeTest::sendDataTest() { auto request = [this](){ - return _nodeB->ping(NP::HostAddress(TEST_LOCAL_HOST, TEST_PORT)); + return _nodeB->ping(QH::HostAddress(TEST_LOCAL_HOST, TEST_PORT)); }; auto client = dynamic_cast(_nodeB); @@ -70,7 +70,7 @@ bool AbstractNodeTest::sendDataTest() { template bool validationCrypto() { // create crypto oject - auto crypto = new NP::KeyStorage(new Crypto()); + auto crypto = new QH::KeyStorage(new Crypto()); // get test pair keys @@ -100,7 +100,7 @@ bool validationCrypto() { delete crypto; // second initialisin of crypto object - crypto = new NP::KeyStorage(new Crypto()); + crypto = new QH::KeyStorage(new Crypto()); if (!crypto->initDefaultStorageLocation()) { delete crypto; return false; @@ -137,7 +137,7 @@ bool validationCrypto() { delete crypto; - crypto = new NP::KeyStorage(new Crypto()); + crypto = new QH::KeyStorage(new Crypto()); if (!crypto->initDefaultStorageLocation()) { delete crypto; return false; @@ -149,7 +149,7 @@ bool validationCrypto() { bool AbstractNodeTest::testICtypto() { // check - if (!validationCrypto()) { + if (!validationCrypto()) { return false; } diff --git a/HeartTests/AbstractSpace/abstractnodetest.h b/HeartTests/AbstractSpace/abstractnodetest.h index 395ca2d..6febeeb 100644 --- a/HeartTests/AbstractSpace/abstractnodetest.h +++ b/HeartTests/AbstractSpace/abstractnodetest.h @@ -16,8 +16,8 @@ public: void test(); private: - NP::AbstractNode *_nodeA = nullptr; - NP::AbstractNode *_nodeB = nullptr; + QH::AbstractNode *_nodeA = nullptr; + QH::AbstractNode *_nodeB = nullptr; bool connectTest(); bool sendDataTest(); diff --git a/HeartTests/AbstractSpace/testutils.cpp b/HeartTests/AbstractSpace/testutils.cpp index 36ff67c..93d4750 100644 --- a/HeartTests/AbstractSpace/testutils.cpp +++ b/HeartTests/AbstractSpace/testutils.cpp @@ -46,12 +46,12 @@ bool TestUtils::wait(const std::function &forWait, int msec) const { } bool TestUtils::connectFunc( - NP::AbstractNode *cli, + QH::AbstractNode *cli, const QString& address, unsigned short port) const { auto wraper = [&cli, address, port]() { - cli->addNode(NP::HostAddress{address, port}); + cli->addNode(QH::HostAddress{address, port}); return true; }; diff --git a/HeartTests/AbstractSpace/testutils.h b/HeartTests/AbstractSpace/testutils.h index 18b5e61..a19bff3 100644 --- a/HeartTests/AbstractSpace/testutils.h +++ b/HeartTests/AbstractSpace/testutils.h @@ -12,7 +12,7 @@ public: virtual ~TestUtils(); bool wait(const std::function &forWait, int msec) const; - bool connectFunc(NP::AbstractNode *cli, + bool connectFunc(QH::AbstractNode *cli, const QString &address, unsigned short port) const; diff --git a/HeartTests/DataBaseSpace/basenodetest.cpp b/HeartTests/DataBaseSpace/basenodetest.cpp index 773cef2..fd66fc0 100644 --- a/HeartTests/DataBaseSpace/basenodetest.cpp +++ b/HeartTests/DataBaseSpace/basenodetest.cpp @@ -8,29 +8,29 @@ #include #include -class TestingBaseClient: public NP::DataBaseNode { +class TestingBaseClient: public QH::DataBaseNode { // AbstractNode interface public: - const NP::Ping& getPing() const { + const QH::Ping& getPing() const { return _ping; } protected: - void incomingData(NP::AbstractData *pkg, const NP::HostAddress& sender) { + void incomingData(QH::AbstractData *pkg, const QH::HostAddress& sender) { Q_UNUSED(sender); - auto ping = dynamic_cast(pkg); + auto ping = dynamic_cast(pkg); if (ping) _ping.copyFrom(ping); } private: - NP::Ping _ping; + QH::Ping _ping; }; -class BadTstClient: public NP::DataBaseNode { +class BadTstClient: public QH::DataBaseNode { }; @@ -38,7 +38,7 @@ BaseNodeTest::BaseNodeTest() { _client1 = new TestingBaseClient(); _client2 = new TestingBaseClient(); - _server = new NP::DataBaseNode(); + _server = new QH::DataBaseNode(); } @@ -58,7 +58,7 @@ void BaseNodeTest::test() { } bool BaseNodeTest::powerTest() { - auto _nodeAPtr = new NP::DataBaseNode(); + auto _nodeAPtr = new QH::DataBaseNode(); if (!_nodeAPtr->run(TEST_LOCAL_HOST, TEST_PORT, "powerTest")) { return false; @@ -83,17 +83,17 @@ bool BaseNodeTest::dbTest() { bool BaseNodeTest::connectNetworkTest() { - auto client1 = dynamic_cast(_client1); - auto client2 = dynamic_cast(_client2); - auto server = dynamic_cast(_server); + auto client1 = dynamic_cast(_client1); + auto client2 = dynamic_cast(_client2); + auto server = dynamic_cast(_server); if (!server->run(TEST_LOCAL_HOST, TEST_PORT, "ServerDataBaseNode")) { return false; } auto addNodeRequest = [client1, client2]() { - client1->addNode(NP::HostAddress(TEST_LOCAL_HOST, TEST_PORT)); - client2->addNode(NP::HostAddress(TEST_LOCAL_HOST, TEST_PORT)); + client1->addNode(QH::HostAddress(TEST_LOCAL_HOST, TEST_PORT)); + client2->addNode(QH::HostAddress(TEST_LOCAL_HOST, TEST_PORT)); return true; }; @@ -109,8 +109,8 @@ bool BaseNodeTest::connectNetworkTest() { // need to wait for add node auto request = [client1, client2]() { - return client1->ping(NP::HostAddress(TEST_LOCAL_HOST, TEST_PORT)) && - client2->ping(NP::HostAddress(TEST_LOCAL_HOST, TEST_PORT)); + return client1->ping(QH::HostAddress(TEST_LOCAL_HOST, TEST_PORT)) && + client2->ping(QH::HostAddress(TEST_LOCAL_HOST, TEST_PORT)); }; auto tstclient1 = dynamic_cast(client1); diff --git a/HeartTests/DataBaseSpace/basenodetest.h b/HeartTests/DataBaseSpace/basenodetest.h index c1427a0..55a163d 100644 --- a/HeartTests/DataBaseSpace/basenodetest.h +++ b/HeartTests/DataBaseSpace/basenodetest.h @@ -17,9 +17,9 @@ public: void test(); private: - NP::AbstractNode *_server = nullptr; - NP::AbstractNode *_client1 = nullptr; - NP::AbstractNode *_client2 = nullptr; + QH::AbstractNode *_server = nullptr; + QH::AbstractNode *_client1 = nullptr; + QH::AbstractNode *_client2 = nullptr; /** diff --git a/HeartTests/DataBaseSpace/basenodeunittests.cpp b/HeartTests/DataBaseSpace/basenodeunittests.cpp index 1efaa94..0f3fcee 100644 --- a/HeartTests/DataBaseSpace/basenodeunittests.cpp +++ b/HeartTests/DataBaseSpace/basenodeunittests.cpp @@ -17,8 +17,8 @@ QByteArray randomArray(int length) { return data; } -const NP::NetworkMember* randomMember() { - NP::NetworkMember *res = new NP::NetworkMember(); +const QH::NetworkMember* randomMember() { + QH::NetworkMember *res = new QH::NetworkMember(); res->setAuthenticationData(randomArray(64)); res->setTrust(0); @@ -28,7 +28,7 @@ const NP::NetworkMember* randomMember() { return res; } -BaseNodeUnitTests::BaseNodeUnitTests():NP::DataBaseNode(), +BaseNodeUnitTests::BaseNodeUnitTests():QH::DataBaseNode(), testObjec(randomMember()) { } @@ -121,7 +121,7 @@ bool BaseNodeUnitTests::testUpdate() { return false; } - auto clone = objectFromDataBase->clone().staticCast(); + auto clone = objectFromDataBase->clone().staticCast(); clone->setTrust(20); diff --git a/HeartTests/DataBaseSpace/basenodeunittests.h b/HeartTests/DataBaseSpace/basenodeunittests.h index 0f7d727..4079576 100644 --- a/HeartTests/DataBaseSpace/basenodeunittests.h +++ b/HeartTests/DataBaseSpace/basenodeunittests.h @@ -7,11 +7,11 @@ * @brief The DbTestsNode class - this implementation of node gor testing database */ -namespace NP { +namespace QH { class NetworkMember; }; -class BaseNodeUnitTests: public NP::DataBaseNode +class BaseNodeUnitTests: public QH::DataBaseNode { public: BaseNodeUnitTests(); @@ -46,7 +46,7 @@ private: */ bool testChangeTrust(); - const NP::NetworkMember *testObjec = nullptr; + const QH::NetworkMember *testObjec = nullptr; }; diff --git a/HeartTests/DataBaseSpace/basetestutils.h b/HeartTests/DataBaseSpace/basetestutils.h index f9f4d14..51ed3b2 100644 --- a/HeartTests/DataBaseSpace/basetestutils.h +++ b/HeartTests/DataBaseSpace/basetestutils.h @@ -2,7 +2,7 @@ #define BASETESTUTILS_H #include -namespace NP { +namespace QH { class DataBaseNode; class BaseId; } diff --git a/HeartTests/NetworkSpace/networknodetest.cpp b/HeartTests/NetworkSpace/networknodetest.cpp index 2913fac..2b617b0 100644 --- a/HeartTests/NetworkSpace/networknodetest.cpp +++ b/HeartTests/NetworkSpace/networknodetest.cpp @@ -7,31 +7,31 @@ #include #include -class TestingNetworkClient: public NP::NetworkNode { +class TestingNetworkClient: public QH::NetworkNode { // AbstractNode interface public: - const NP::Ping& getPing() const { + const QH::Ping& getPing() const { return _ping; } protected: - void incomingData(NP::AbstractData *pkg, const NP::BaseId &sender) { + void incomingData(QH::AbstractData *pkg, const QH::BaseId &sender) { Q_UNUSED(sender); - auto ping = dynamic_cast(pkg); + auto ping = dynamic_cast(pkg); if (ping) _ping.copyFrom(ping); } private: - NP::Ping _ping; + QH::Ping _ping; }; NetworkNodeTest::NetworkNodeTest() { _nodeA = new TestingNetworkClient(); - _nodeB = new NP::NetworkNode(); + _nodeB = new QH::NetworkNode(); _nodeC = new TestingNetworkClient(); } @@ -55,7 +55,7 @@ void NetworkNodeTest::test() { } bool NetworkNodeTest::powerTest() { - auto _nodeAPtr = new NP::NetworkNode(); + auto _nodeAPtr = new QH::NetworkNode(); if (!_nodeAPtr->run(TEST_LOCAL_HOST, TEST_PORT, "powerTest")) { return false; @@ -84,9 +84,9 @@ bool NetworkNodeTest::connectNetworkTest() { int nodeCPort = TEST_PORT + 2; - auto _nodeAPtr = dynamic_cast(_nodeA); - auto _nodeBPtr = dynamic_cast(_nodeB); - auto _nodeCPtr = dynamic_cast(_nodeC); + auto _nodeAPtr = dynamic_cast(_nodeA); + auto _nodeBPtr = dynamic_cast(_nodeB); + auto _nodeCPtr = dynamic_cast(_nodeC); if (!_nodeAPtr->run(TEST_LOCAL_HOST, nodeAPort, "TestNodeA")) { return false; @@ -104,8 +104,8 @@ bool NetworkNodeTest::connectNetworkTest() { auto addNodeRequest = [_nodeAPtr, nodeBPort, nodeCPort, _nodeBPtr, nodeC]() { - _nodeAPtr->addNode(NP::HostAddress(TEST_LOCAL_HOST, nodeBPort)); - _nodeBPtr->addNode(NP::HostAddress(TEST_LOCAL_HOST, nodeCPort)); + _nodeAPtr->addNode(QH::HostAddress(TEST_LOCAL_HOST, nodeBPort)); + _nodeBPtr->addNode(QH::HostAddress(TEST_LOCAL_HOST, nodeCPort)); return true; }; diff --git a/HeartTests/NetworkSpace/networknodetest.h b/HeartTests/NetworkSpace/networknodetest.h index c9cbb3b..1803f66 100644 --- a/HeartTests/NetworkSpace/networknodetest.h +++ b/HeartTests/NetworkSpace/networknodetest.h @@ -16,9 +16,9 @@ public: void test(); private: - NP::AbstractNode *_nodeA = nullptr; - NP::AbstractNode *_nodeB = nullptr; - NP::AbstractNode *_nodeC = nullptr; + QH::AbstractNode *_nodeA = nullptr; + QH::AbstractNode *_nodeB = nullptr; + QH::AbstractNode *_nodeC = nullptr; diff --git a/HeartTests/NetworkSpace/networknodeunittests.cpp b/HeartTests/NetworkSpace/networknodeunittests.cpp index 35137cd..39339a5 100644 --- a/HeartTests/NetworkSpace/networknodeunittests.cpp +++ b/HeartTests/NetworkSpace/networknodeunittests.cpp @@ -6,7 +6,7 @@ #define DB_NODE_NAME "DbTestNetworkNode" -NetworkNodeUnitTests::NetworkNodeUnitTests():NP::NetworkNode() { +NetworkNodeUnitTests::NetworkNodeUnitTests():QH::NetworkNode() { } @@ -52,7 +52,7 @@ bool NetworkNodeUnitTests::testReadWrite() { return false; } - NP::NodeObject testObjec = thisNode(); + QH::NodeObject testObjec = thisNode(); auto objectFromDataBase = db()->getObject(testObjec); @@ -92,7 +92,7 @@ bool NetworkNodeUnitTests::testUpdate() { return false; } - NP::NodeObject testObjec = thisNode(); + QH::NodeObject testObjec = thisNode(); auto objectFromDataBase = db()->getObject(testObjec); @@ -100,7 +100,7 @@ bool NetworkNodeUnitTests::testUpdate() { return false; } - auto clone = objectFromDataBase->clone().staticCast(); + auto clone = objectFromDataBase->clone().staticCast(); clone->setTrust(20); @@ -136,13 +136,13 @@ bool NetworkNodeUnitTests::testChangeTrust() { return false; } - NP::NodeObject testObjec = thisNode(); + QH::NodeObject testObjec = thisNode(); if(!changeTrust(testObjec.getId(), -10)) { return false; }; - auto objectFromDataBase = static_cast(db()->getObjectRaw(testObjec)); + auto objectFromDataBase = static_cast(db()->getObjectRaw(testObjec)); if (objectFromDataBase && objectFromDataBase->trust() != 10) { return false; @@ -154,7 +154,7 @@ bool NetworkNodeUnitTests::testChangeTrust() { return false; } - objectFromDataBase = static_cast(db()->getObjectRaw(testObjec)); + objectFromDataBase = static_cast(db()->getObjectRaw(testObjec)); if (!objectFromDataBase || objectFromDataBase->trust() != 10) { return false; @@ -164,7 +164,7 @@ bool NetworkNodeUnitTests::testChangeTrust() { return false; }; - objectFromDataBase = static_cast(db()->getObjectRaw(testObjec)); + objectFromDataBase = static_cast(db()->getObjectRaw(testObjec)); if (objectFromDataBase && objectFromDataBase->trust() != 0) { return false; @@ -176,7 +176,7 @@ bool NetworkNodeUnitTests::testChangeTrust() { return false; } - objectFromDataBase = static_cast(db()->getObjectRaw(testObjec)); + objectFromDataBase = static_cast(db()->getObjectRaw(testObjec)); if (!objectFromDataBase || objectFromDataBase->trust() != 0) { return false; diff --git a/HeartTests/NetworkSpace/networknodeunittests.h b/HeartTests/NetworkSpace/networknodeunittests.h index 615594c..864a4bb 100644 --- a/HeartTests/NetworkSpace/networknodeunittests.h +++ b/HeartTests/NetworkSpace/networknodeunittests.h @@ -6,7 +6,7 @@ /** * @brief The DbTestsNode class - this implementation of node gor testing database */ -class NetworkNodeUnitTests: public NP::NetworkNode +class NetworkNodeUnitTests: public QH::NetworkNode { public: NetworkNodeUnitTests(); diff --git a/HeartTests/NetworkSpace/networktestutils.cpp b/HeartTests/NetworkSpace/networktestutils.cpp index 507e6f7..4916542 100644 --- a/HeartTests/NetworkSpace/networktestutils.cpp +++ b/HeartTests/NetworkSpace/networktestutils.cpp @@ -13,11 +13,11 @@ NetworkTestUtils::~NetworkTestUtils() { } } -NP::NetworkNode *NetworkTestUtils::initNewNode() const { +QH::NetworkNode *NetworkTestUtils::initNewNode() const { int port = nextPort(); QString name = (coreNode)? QString("TestNode-%0").arg(port): QString("CoreNode-%0").arg(port); - auto node = new NP::NetworkNode(); + auto node = new QH::NetworkNode(); if (!node->run(TEST_LOCAL_HOST, port, name)) { delete node; @@ -27,7 +27,7 @@ NP::NetworkNode *NetworkTestUtils::initNewNode() const { return node; } -const NP::NetworkNode *NetworkTestUtils::getCoreNode() { +const QH::NetworkNode *NetworkTestUtils::getCoreNode() { if (!coreNode) coreNode = initNewNode(); @@ -35,7 +35,7 @@ const NP::NetworkNode *NetworkTestUtils::getCoreNode() { return coreNode; } -bool NetworkTestUtils::deployNewNode(NP::NetworkNode* node) const { +bool NetworkTestUtils::deployNewNode(QH::NetworkNode* node) const { if (!node) return false; @@ -60,21 +60,21 @@ bool NetworkTestUtils::deployNewNode(NP::NetworkNode* node) const { return true; } -QHash +QHash NetworkTestUtils::generateNetworkNode(int count) const { - QHash result; - QSet tmp; + QHash result; + QSet tmp; auto deinit = [&tmp]() { - for (NP::NetworkNode * node : tmp) { + for (QH::NetworkNode * node : tmp) { delete node; } tmp.clear(); }; for (int i = 0; i < count; ++i) { - NP::NetworkNode *tmpNode = initNewNode(); + QH::NetworkNode *tmpNode = initNewNode(); if (tmpNode) tmp.insert(tmpNode); } @@ -84,7 +84,7 @@ NetworkTestUtils::generateNetworkNode(int count) const { return {}; } - for (NP::NetworkNode *node: tmp) { + for (QH::NetworkNode *node: tmp) { if (!deployNewNode(node)) { deinit(); return {}; diff --git a/HeartTests/NetworkSpace/networktestutils.h b/HeartTests/NetworkSpace/networktestutils.h index e50df43..0a782ae 100644 --- a/HeartTests/NetworkSpace/networktestutils.h +++ b/HeartTests/NetworkSpace/networktestutils.h @@ -2,7 +2,7 @@ #define NETWORKTESTUTILS_H #include -namespace NP { +namespace QH { class NetworkNode; class BaseId; } @@ -13,17 +13,17 @@ public: NetworkTestUtils(); ~NetworkTestUtils(); - bool deployNewNode(NP::NetworkNode* node) const; - QHash generateNetworkNode(int count) const; + bool deployNewNode(QH::NetworkNode* node) const; + QHash generateNetworkNode(int count) const; - NP::NetworkNode *initNewNode() const; + QH::NetworkNode *initNewNode() const; protected: - const NP::NetworkNode* getCoreNode(); + const QH::NetworkNode* getCoreNode(); private: int nextPort() const; - NP::NetworkNode* coreNode = nullptr; + QH::NetworkNode* coreNode = nullptr; }; #endif // NETWORKTESTUTILS_H diff --git a/README.md b/README.md index 9a3577e..4c42065 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,128 @@ # QuasarApp Heart -QuasarApp Heart - it is base back for C++/Qt projects. +QuasarApp Heart - it is base backend for C++/Qt projects. + +## Futures +This library consists of two levels (AbstractNode level and DataBaseNode level). - [X] Support ssl sockets - [X] Support initialize database - [X] Support work in database - [ ] Sopport decentralized network mode -## Futures -This library consists of two levels (AbstractNode level and DataBaseNode level). - ### AbstractNode level (1) #### Description The AbstractNode level implement only base functons of create new work threads and parsing packages. Example of use AbstractNode level ```cpp -EXAMPLE + +class MyPackage: public QH::AbstractData +{ +public: + MyPackage(); + + // constructor for create object from package + MyPackage(const Package& from): QH::AbstractData(from) { + + }; + + // override this method for validation your package class + bool isValid() const { + return AbstractData::isValid(); + }; / + // override this method for copy object data from other to this object + bool copyFrom(const AbstractData *other) { + if (!AbstractData::copyFrom(other)) + return false; + + auto otherObject = dynamic_cast(other); + if (!otherObject) + return false; + + this->_data = otherObject->_data; + return true; + }; + + // your data for for server of client + std::string _data = ""; + +protected: + // StreamBase interface override this methods for serialization your package + QDataStream &fromStream(QDataStream &stream) { + AbstractData::fromStream(stream); + stream >> _data; + return stream; + } + QDataStream &toStream(QDataStream &stream) const { + AbstractData::toStream(stream); + stream << _data; + return stream; + } + +}; + +class TestingServer: public QH::AbstractNode { + + +protected: + // override this method for processed received data. + ParserResult DataBaseNode::parsePackage(const Package &pkg, + const AbstractNodeInfo *sender) { + + auto parentResult = AbstractNode::parsePackage(pkg, sender); + if (parentResult != ParserResult::NotProcessed) { + return parentResult; + } + + if (H_16() == pkg.hdr.command) { + MyPackage obj(pkg); + + BaseId requesterId = getSender(sender, &obj); + + if (!obj.isValid()) { + badRequest(sender->networkAddress(), pkg.hdr); + return ParserResult::Error; + } + + obj._data = "responce for client " + + SendData(&obj, sender->networkAddress(), &pkg.hdr); + return ParserResult::Processed; + } + return ParserResult::NotProcessed; + + } +}; + + +class TestingClient: public QH::AbstractNode { + + +protected: + ParserResult DataBaseNode::parsePackage(const Package &pkg, + const AbstractNodeInfo *sender) { + + auto parentResult = AbstractNode::parsePackage(pkg, sender); + if (parentResult != ParserResult::NotProcessed) { + return parentResult; + } + + if (H_16() == pkg.hdr.command) { + MyPackage obj(pkg); + + std::cout << obj._data; + ... + return ParserResult::Processed; + } + return ParserResult::NotProcessed; + + } + + bool sendMyPackage() { + Ping cmd; + return sendData(&cmd, address); + } +}; ``` For more information see QuasarApp Heart documentation.