complex macros with ;

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();
 

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_Sended);
-	EVENT(K_SendFail)
+	EVENT(K_SendFail);
-	EVENT(K_Received)
+	EVENT(K_Received);
-	EVENT(K_ReceiveFail)
+	EVENT(K_ReceiveFail);
-	EVENT(K_ChangedGlobal)
+	EVENT(K_ChangedGlobal);
 	EVENT_HANDLER2(void, K_DirectChange, PIDeque<int>, path, PIString, value);
 
-	EVENT(X_Sended)
+	EVENT(X_Sended);
-	EVENT(X_SendFail)
+	EVENT(X_SendFail);
-	EVENT(X_Received)
+	EVENT(X_Received);
-	EVENT(X_ReceiveFail)
+	EVENT(X_ReceiveFail);
-	EVENT(X_ChangedGlobal)
+	EVENT(X_ChangedGlobal);
-	EVENT1(X_ReceivedX, PIVector<PIDeque<int> >, pathes)
+	EVENT1(X_ReceivedX, PIVector<PIDeque<int> >, pathes);
 
-	EVENT(C_Sended)
+	EVENT(C_Sended);
-	EVENT(C_SendFail)
+	EVENT(C_SendFail);
-	EVENT(C_Received)
+	EVENT(C_Received);
-	EVENT(C_ReceiveFail)
+	EVENT(C_ReceiveFail);
-	EVENT(C_ChangedGlobal)
+	EVENT(C_ChangedGlobal);
 
-	EVENT(M_Sended)
+	EVENT(M_Sended);
-	EVENT(M_SendFail)
+	EVENT(M_SendFail);
-	EVENT(M_Received)
+	EVENT(M_Received);
-	EVENT(M_ReceiveFail)
+	EVENT(M_ReceiveFail);
-	EVENT(M_ChangedGlobal)
+	EVENT(M_ChangedGlobal);
-	EVENT3(M_Message, PIDeque<int>, path, int, type, PIString, msg)
+	EVENT3(M_Message, PIDeque<int>, path, int, type, PIString, msg);
 
 	void cd_write    (CDSection * cd, PIIODevice * d);
 	void cd_read     (CDSection * cd, PIIODevice * d);

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(sended);
-	EVENT(sendFailed)
+	EVENT(sendFailed);
-	EVENT(received)
+	EVENT(received);
-	EVENT(receiveFailed)
+	EVENT(receiveFailed);
-	EVENT(changedGlobal)
+	EVENT(changedGlobal);
 	EVENT_HANDLER(void, send);
 	EVENT_HANDLER(void, request);
 

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);

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<int>, path, int, type, PIString, msg)
+	EVENT3(messageReceived, PIDeque<int>, path, int, type, PIString, msg);
 
 private:
 	PICout createPICout(const CDType & m) const;

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(keepNamesRequest, bool*, xn);
-	EVENT1(receivedX, PIVector<PIDeque<int> >, pathes)
+	EVENT1(receivedX, PIVector<PIDeque<int> >, pathes);
 
 	void enable(const CDType & x) {setEnabled(x, true);}
 	void disable(const CDType & x) {setEnabled(x, false);}

libs/core/cdutilstest.cpp

@@ -11,11 +11,11 @@ using namespace CDUtils;
 
 class Core : public PIObject
 {
-	PIOBJECT(Core)
+	PIOBJECT(Core);
-	public:
+public:
-		Core() {
+	Core() {
 		CDCore::instance()->initApp();
-//		piCout << "testCore";
+		//		piCout << "testCore";
 		CONNECTU(&timer, tickEvent, this, timerDone);
 		CONNECTU(&X, received, this, xrecv);
 		CONNECTU(&C, received, this, crecv);

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__;}

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();