QuasarApp/Heart
4
1
Fork 0
mirror of https://github.com/QuasarApp/Heart.git synced 2025-04-29 11:14:37 +00:00
Code Issues Projects Releases Wiki Activity

fix handler method

Browse Source
This commit is contained in:
Andrei Yankovich 2021-09-25 20:44:58 +03:00
parent 7452f6b87b
commit aa0260b5e1
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Heart/AbstractSpace/abstractnode.h
View File

@ -329,7 +329,7 @@ protected:
// Or with the commandHandler method // Or with the commandHandler method
auto result = commandHandler<MyPackage>(&MyClass::processMyPackage, pkg, sender, pkgHeader); auto result = commandHandler<MyPackage>(this, &MyClass::processMyPackage, pkg, sender, pkgHeader);
if (result != QH::ParserResult::NotProcessed) { if (result != QH::ParserResult::NotProcessed) {
return result; return result;
} }
@ -559,16 +559,19 @@ protected:
* @brief commandHandler This method it is simple wrapper for the handle pacakges in the AbstractNode::parsePackage method. * @brief commandHandler This method it is simple wrapper for the handle pacakges in the AbstractNode::parsePackage method.
* Exmaple of use : * Exmaple of use :
* @code{cpp} * @code{cpp}
* auto result = commandHandler<MyPackage>(&MyClass::processMyPackage, pkg, sender, pkgHeader); * auto result = commandHandler<MyPackage>(this, &MyClass::processMyPackage, pkg, sender, pkgHeader);
if (result != QH::ParserResult::NotProcessed) { if (result != QH::ParserResult::NotProcessed) {
return result; return result;
} }
... ...
* @endcode * @endcode
* @tparam PackageClass This is class name that you want handle. All classes mist be inhert of the QH::PKG::AbstractData class. * @tparam PackageClass This is class name that you want handle. All classes mist be inhert of the QH::PKG::AbstractData class.
* @tparam HandlerType This is type of the handler object that will invoke @a HandlerMethod method.
* @tparam HandlerMethod This is name of the handler method. * @tparam HandlerMethod This is name of the handler method.
* The handler method should be support next signature: * The handler method should be support next signature:
* **bool Method(const QSharedPointer<QH::PKG::PackageClass> &, const QH::Header &pkgHeader, const QH::AbstractNodeInfo *sender)**. * **bool Method(const QSharedPointer<QH::PKG::PackageClass> &, const QH::Header &pkgHeader, const QH::AbstractNodeInfo *sender)**.
* @param handlerObject This is pointer to handler object.
* @param method This is handler method. * @param method This is handler method.
* @param pkg This is package data from the AbstractNode::parsePackage argumetns * @param pkg This is package data from the AbstractNode::parsePackage argumetns
* @param pkgHeader This is header of an incomming package. * @param pkgHeader This is header of an incomming package.
@ -578,9 +581,9 @@ protected:
* @see AbstractNode::parsePackage * @see AbstractNode::parsePackage
* @see ParserResult * @see ParserResult
*/ */
template<class PackageClass, class HandlerMethod> template<class PackageClass,class HandlerType, class HandlerMethod>
inline ParserResult commandHandler(HandlerMethod method, inline ParserResult commandHandler(HandlerType handlerObject, HandlerMethod method,
const QSharedPointer<QH::PKG::AbstractData> &pkg, const QSharedPointer<QH::PKG::AbstractData> &pkg,
const QH::AbstractNodeInfo *sender, const QH::AbstractNodeInfo *sender,
const QH::Header &pkgHeader) { const QH::Header &pkgHeader) {
@ -592,12 +595,14 @@ protected:
return QH::ParserResult::Error; return QH::ParserResult::Error;
} }
if(!(*method(data, sender, pkgHeader))) { if(!(handlerObject->*method)(data, sender, pkgHeader)) {
return QH::ParserResult::Error; return QH::ParserResult::Error;
} }
return QH::ParserResult::Processed; return QH::ParserResult::Processed;
} }
return QH::ParserResult::NotProcessed;
} }
protected slots: protected slots:

2
Heart/heart.h
View File

@ -80,7 +80,7 @@ protected:
return parentResult; return parentResult;
} }
auto result = commandHandler<MyPackage>(&MyClass::processMyPackage, pkg, sender, pkgHeader); auto result = commandHandler<MyPackage>(this, &MyClass::processMyPackage, pkg, sender, pkgHeader);
if (result != QH::ParserResult::NotProcessed) { if (result != QH::ParserResult::NotProcessed) {
return result; return result;
} }

2
README.md
View File

@ -107,7 +107,7 @@ protected:
return parentResult; return parentResult;
} }
auto result = commandHandler<MyPackage>(&MyClass::processMyPackage, pkg, sender, pkgHeader); auto result = commandHandler<MyPackage>(this, &MyClass::processMyPackage, pkg, sender, pkgHeader);
if (result != QH::ParserResult::NotProcessed) { if (result != QH::ParserResult::NotProcessed) {
return result; return result;
} }