From 4d9029babe75bddf677707ec36c9d55fb5a62a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Mon, 25 Jul 2022 16:22:16 +0300 Subject: [PATCH] complex macros with ; --- libs/core/cdutils_c.h | 2 +- libs/core/cdutils_core.h | 46 +++++++++++++++++------------------ libs/core/cdutils_interface.h | 12 ++++----- libs/core/cdutils_k.h | 4 +-- libs/core/cdutils_m.h | 4 +-- libs/core/cdutils_x.h | 6 ++--- libs/core/cdutilstest.cpp | 8 +++--- libs/qt/qcd_core.h | 2 +- libs/qt/qcd_view.h | 2 +- 9 files changed, 43 insertions(+), 43 deletions(-) diff --git a/libs/core/cdutils_c.h b/libs/core/cdutils_c.h index 6492e22..bb67da2 100644 --- a/libs/core/cdutils_c.h +++ b/libs/core/cdutils_c.h @@ -29,7 +29,7 @@ namespace CDUtils { class CD_CORE_EXPORT CInterface: public Interface { - PIOBJECT_SUBCLASS(CInterface, Interface) + PIOBJECT_SUBCLASS(CInterface, Interface); public: CInterface(); diff --git a/libs/core/cdutils_core.h b/libs/core/cdutils_core.h index 93e7f7f..f7ca302 100644 --- a/libs/core/cdutils_core.h +++ b/libs/core/cdutils_core.h @@ -43,7 +43,7 @@ public: class CD_CORE_EXPORT CDCore: public PIObject { - PIOBJECT(CDUtils::CDCore) + PIOBJECT(CDUtils::CDCore); friend class __Core_Initializer__; friend class CDSection; friend class Interface; @@ -52,32 +52,32 @@ public: static CDCore * instance(); static bool destroy(); - EVENT(K_Sended) - EVENT(K_SendFail) - EVENT(K_Received) - EVENT(K_ReceiveFail) - EVENT(K_ChangedGlobal) + EVENT(K_Sended); + EVENT(K_SendFail); + EVENT(K_Received); + EVENT(K_ReceiveFail); + EVENT(K_ChangedGlobal); EVENT_HANDLER2(void, K_DirectChange, PIDeque, path, PIString, value); - EVENT(X_Sended) - EVENT(X_SendFail) - EVENT(X_Received) - EVENT(X_ReceiveFail) - EVENT(X_ChangedGlobal) - EVENT1(X_ReceivedX, PIVector >, pathes) + EVENT(X_Sended); + EVENT(X_SendFail); + EVENT(X_Received); + EVENT(X_ReceiveFail); + EVENT(X_ChangedGlobal); + EVENT1(X_ReceivedX, PIVector >, pathes); - EVENT(C_Sended) - EVENT(C_SendFail) - EVENT(C_Received) - EVENT(C_ReceiveFail) - EVENT(C_ChangedGlobal) + EVENT(C_Sended); + EVENT(C_SendFail); + EVENT(C_Received); + EVENT(C_ReceiveFail); + EVENT(C_ChangedGlobal); - EVENT(M_Sended) - EVENT(M_SendFail) - EVENT(M_Received) - EVENT(M_ReceiveFail) - EVENT(M_ChangedGlobal) - EVENT3(M_Message, PIDeque, path, int, type, PIString, msg) + EVENT(M_Sended); + EVENT(M_SendFail); + EVENT(M_Received); + EVENT(M_ReceiveFail); + EVENT(M_ChangedGlobal); + EVENT3(M_Message, PIDeque, path, int, type, PIString, msg); void cd_write (CDSection * cd, PIIODevice * d); void cd_read (CDSection * cd, PIIODevice * d); diff --git a/libs/core/cdutils_interface.h b/libs/core/cdutils_interface.h index 7a7b5b9..2d58261 100644 --- a/libs/core/cdutils_interface.h +++ b/libs/core/cdutils_interface.h @@ -32,7 +32,7 @@ class CDCore; class CD_CORE_EXPORT Interface: public PIObject { - PIOBJECT(CDUtils::Interface) + PIOBJECT(CDUtils::Interface); public: Interface(CDType::cdT type_); @@ -72,11 +72,11 @@ public: void writeFile(); bool inProgress(); - EVENT(sended) - EVENT(sendFailed) - EVENT(received) - EVENT(receiveFailed) - EVENT(changedGlobal) + EVENT(sended); + EVENT(sendFailed); + EVENT(received); + EVENT(receiveFailed); + EVENT(changedGlobal); EVENT_HANDLER(void, send); EVENT_HANDLER(void, request); diff --git a/libs/core/cdutils_k.h b/libs/core/cdutils_k.h index 11499ff..a5cb007 100644 --- a/libs/core/cdutils_k.h +++ b/libs/core/cdutils_k.h @@ -29,11 +29,11 @@ namespace CDUtils { class CD_CORE_EXPORT KInterface: public Interface { - PIOBJECT_SUBCLASS(KInterface, Interface) + PIOBJECT_SUBCLASS(KInterface, Interface); public: KInterface(); - EVENT1(keepNamesRequest, bool*, kn) + EVENT1(keepNamesRequest, bool*, kn); void directChange(const CDType & k); void directChange(const CDType & k, double v); diff --git a/libs/core/cdutils_m.h b/libs/core/cdutils_m.h index 171747f..df0ef9d 100644 --- a/libs/core/cdutils_m.h +++ b/libs/core/cdutils_m.h @@ -29,7 +29,7 @@ namespace CDUtils { class CD_CORE_EXPORT MInterface: public Interface { - PIOBJECT_SUBCLASS(MInterface, Interface) + PIOBJECT_SUBCLASS(MInterface, Interface); public: MInterface(); @@ -42,7 +42,7 @@ public: void messageBox(const CDType & m, const PIString & msg); - EVENT3(messageReceived, PIDeque, path, int, type, PIString, msg) + EVENT3(messageReceived, PIDeque, path, int, type, PIString, msg); private: PICout createPICout(const CDType & m) const; diff --git a/libs/core/cdutils_x.h b/libs/core/cdutils_x.h index 5d832e3..5df8e28 100644 --- a/libs/core/cdutils_x.h +++ b/libs/core/cdutils_x.h @@ -29,12 +29,12 @@ namespace CDUtils { class CD_CORE_EXPORT XInterface: public Interface { - PIOBJECT_SUBCLASS(XInterface, Interface) + PIOBJECT_SUBCLASS(XInterface, Interface); public: XInterface(); - EVENT1(keepNamesRequest, bool*, xn) - EVENT1(receivedX, PIVector >, pathes) + EVENT1(keepNamesRequest, bool*, xn); + EVENT1(receivedX, PIVector >, pathes); void enable(const CDType & x) {setEnabled(x, true);} void disable(const CDType & x) {setEnabled(x, false);} diff --git a/libs/core/cdutilstest.cpp b/libs/core/cdutilstest.cpp index d284b49..5c64489 100644 --- a/libs/core/cdutilstest.cpp +++ b/libs/core/cdutilstest.cpp @@ -11,11 +11,11 @@ using namespace CDUtils; class Core : public PIObject { - PIOBJECT(Core) - public: - Core() { + PIOBJECT(Core); +public: + Core() { CDCore::instance()->initApp(); -// piCout << "testCore"; + // piCout << "testCore"; CONNECTU(&timer, tickEvent, this, timerDone); CONNECTU(&X, received, this, xrecv); CONNECTU(&C, received, this, crecv); diff --git a/libs/qt/qcd_core.h b/libs/qt/qcd_core.h index 82ec374..551ea9d 100644 --- a/libs/qt/qcd_core.h +++ b/libs/qt/qcd_core.h @@ -43,7 +43,7 @@ public: class CD_QT_EXPORT QCDCore: public QObject, public PIObject { Q_OBJECT - PIOBJECT(QCDCore) + PIOBJECT(QCDCore); friend class __QCore_Initializer__; public: static QCDCore * instance() {return __QCore_Initializer__::__instance__;} diff --git a/libs/qt/qcd_view.h b/libs/qt/qcd_view.h index 69aa541..26924a5 100644 --- a/libs/qt/qcd_view.h +++ b/libs/qt/qcd_view.h @@ -35,7 +35,7 @@ class QSortFilterProxyModel; class CD_QT_EXPORT CDView: public QTreeView, public PIObject { Q_OBJECT - PIOBJECT(CDView) + PIOBJECT(CDView); public: explicit CDView(QWidget *parent = 0); ~CDView();