complex macros with ;

libs/main/io_utils/pibasetransfer.h

@@ -31,7 +31,7 @@
 
 class PIP_EXPORT PIBaseTransfer: public PIObject
 {
-	PIOBJECT_SUBCLASS(PIBaseTransfer, PIObject)
+	PIOBJECT_SUBCLASS(PIBaseTransfer, PIObject);
 public:
 	PIBaseTransfer();
 	~PIBaseTransfer();
@@ -84,13 +84,13 @@ public:
 	EVENT_HANDLER(void, pause) {setPause(true);}
 	EVENT_HANDLER(void, resume) {setPause(false);}
 	
-	EVENT(receiveStarted)
-	EVENT(paused)
-	EVENT(resumed)
-	EVENT1(receiveFinished, bool, ok)
-	EVENT(sendStarted)
-	EVENT1(sendFinished, bool, ok)
-	EVENT1(sendRequest, PIByteArray &, data)
+	EVENT(receiveStarted);
+	EVENT(paused);
+	EVENT(resumed);
+	EVENT1(receiveFinished, bool, ok);
+	EVENT(sendStarted);
+	EVENT1(sendFinished, bool, ok);
+	EVENT1(sendRequest, PIByteArray &, data);
 
 protected:
 	void buildSession(PIVector<Part> parts);
@@ -115,7 +115,7 @@ private:
 	};
 # pragma pack(pop)
 	
-	BINARY_STREAM_FRIEND(PIBaseTransfer::StartRequest)
+	BINARY_STREAM_FRIEND(PIBaseTransfer::StartRequest);
 
 	void processData(int id, PIByteArray &data);
 	PIByteArray build_packet(int id);

libs/main/io_utils/pibroadcast.h

@@ -32,7 +32,7 @@
 
 
 class PIP_IO_UTILS_EXPORT PIBroadcast: public PIThread, public PIEthUtilBase {
-	PIOBJECT_SUBCLASS(PIBroadcast, PIThread)
+	PIOBJECT_SUBCLASS(PIBroadcast, PIThread);
 public:
 
 	//! %PIBroadcast channels, can be used independently
@@ -114,7 +114,7 @@ public:
 	//! Send packet
 	void send(const PIByteArray & data);
 
-	EVENT1(receiveEvent, PIByteArray, data)
+	EVENT1(receiveEvent, PIByteArray, data);
 
 	//! \events
 	//! \{

libs/main/io_utils/piconnection.h

@@ -34,7 +34,7 @@ class PIConfig;
 
 class PIP_EXPORT PIConnection: public PIObject
 {
-	PIOBJECT_SUBCLASS(PIConnection, PIObject)
+	PIOBJECT_SUBCLASS(PIConnection, PIObject);
 public:
 	//! Constructs connection with name "name", or with default name = "connection"
 	PIConnection(const PIString & name = PIStringAscii("connection"));
@@ -279,7 +279,7 @@ public:
 	static bool isFakeMode();
 	
 	class PIP_EXPORT DevicePool: public PIThread {
-		PIOBJECT_SUBCLASS(DevicePool, PIThread)
+		PIOBJECT_SUBCLASS(DevicePool, PIThread);
 		friend void __DevicePool_threadReadDP(void * ddp);
 		friend class PIConnection;
 	protected:
@@ -317,9 +317,9 @@ public:
 		bool fake;
 	};
 	
-	EVENT2(dataReceivedEvent, const PIString &, from, const PIByteArray &, data)
-	EVENT2(packetReceivedEvent, const PIString &, from, const PIByteArray &, data)
-	EVENT3(qualityChanged, const PIIODevice * , dev, PIDiagnostics::Quality, new_quality, PIDiagnostics::Quality, old_quality)
+	EVENT2(dataReceivedEvent, const PIString &, from, const PIByteArray &, data);
+	EVENT2(packetReceivedEvent, const PIString &, from, const PIByteArray &, data);
+	EVENT3(qualityChanged, const PIIODevice * , dev, PIDiagnostics::Quality, new_quality, PIDiagnostics::Quality, old_quality);
 	
 //! \events
 //! \{
@@ -377,7 +377,7 @@ private:
 	};
 	
 	class PIP_EXPORT Sender: public PITimer {
-		PIOBJECT_SUBCLASS(Sender, PIObject)
+		PIOBJECT_SUBCLASS(Sender, PIObject);
 	public:
 		Sender(PIConnection * parent_ = 0);
 		~Sender() {stop();}

libs/main/io_utils/pidatatransfer.h

@@ -31,7 +31,7 @@
 
 class PIP_EXPORT PIDataTransfer: public PIBaseTransfer
 {
-	PIOBJECT_SUBCLASS(PIDataTransfer, PIBaseTransfer)
+	PIOBJECT_SUBCLASS(PIDataTransfer, PIBaseTransfer);
 public:
 	PIDataTransfer() {;}
 	~PIDataTransfer() {;}

libs/main/io_utils/pidiagnostics.h

@@ -32,10 +32,10 @@
 
 class PIP_EXPORT PIDiagnostics: public PITimer
 {
-	PIOBJECT_SUBCLASS(PIDiagnostics, PITimer)
+	PIOBJECT_SUBCLASS(PIDiagnostics, PITimer);
 	friend class PIConnection;
 public:
-	NO_COPY_CLASS(PIDiagnostics)
+	NO_COPY_CLASS(PIDiagnostics);
 	
 	//! Constructs an empty diagnostics and if "start_" start it
 	PIDiagnostics(bool start_ = true);
@@ -99,7 +99,7 @@ public:
 	EVENT_HANDLER2(void, received, int, size, bool, correct);
 	EVENT_HANDLER1(void, sended, int, size);
 	
-	EVENT2(qualityChanged, PIDiagnostics::Quality, new_quality, PIDiagnostics::Quality, old_quality)
+	EVENT2(qualityChanged, PIDiagnostics::Quality, new_quality, PIDiagnostics::Quality, old_quality);
 	
 //! \handlers
 //! \{

libs/main/io_utils/pifiletransfer.h

@@ -33,7 +33,7 @@
 
 class PIP_EXPORT PIFileTransfer: public PIBaseTransfer
 {
-	PIOBJECT_SUBCLASS(PIFileTransfer, PIBaseTransfer)
+	PIOBJECT_SUBCLASS(PIFileTransfer, PIBaseTransfer);
 public:
 	PIFileTransfer();
 	~PIFileTransfer();
@@ -82,11 +82,11 @@ public:
 	const llong * bytesFileAll_ptr() const {return &bytes_file_all;}
 	const llong * bytesFileCur_ptr() const {return &bytes_file_cur;}
 
-	EVENT(receiveFilesStarted)
-	EVENT1(receiveFilesFinished, bool, ok)
-	EVENT(sendFilesStarted)
-	EVENT1(sendFilesFinished, bool, ok)
-	EVENT3(receiveFilesRequest, PIStringList, files, llong, total_bytes, bool *, ok)
+	EVENT(receiveFilesStarted);
+	EVENT1(receiveFilesFinished, bool, ok);
+	EVENT(sendFilesStarted);
+	EVENT1(sendFilesFinished, bool, ok);
+	EVENT3(receiveFilesRequest, PIStringList, files, llong, total_bytes, bool *, ok);
 	
 private:
 	static const char sign[];

libs/main/io_utils/pipacketextractor.h

@@ -33,7 +33,7 @@ typedef bool (*PacketExtractorCheckFunc)(void * , uchar * , uchar * , int );
 
 class PIP_EXPORT PIPacketExtractor: public PIIODevice
 {
-	PIIODEVICE(PIPacketExtractor, "pckext")
+	PIIODEVICE(PIPacketExtractor, "pckext");
 	friend class PIConnection;
 public:
 
@@ -127,7 +127,7 @@ public:
 	//! Add data to extractor, raise \a packetReceived() if packet is ready
 	void appendData(const PIByteArray & data) {appendData(data.data(), data.size_s());}
 
-	EVENT2(packetReceived, uchar * , data, int, size)
+	EVENT2(packetReceived, uchar * , data, int, size);
 
 //! \events
 //! \{

libs/main/io_utils/pistreampacker.h

@@ -86,8 +86,8 @@ public:
 	//! and \a sendRequest() event to \"dev\" \a PIIODevice::write() handler
 	void assignDevice(PIIODevice * dev);
 
-	EVENT1(packetReceiveEvent, PIByteArray &, data)
-	EVENT1(sendRequest, PIByteArray, data)
+	EVENT1(packetReceiveEvent, PIByteArray &, data);
+	EVENT1(sendRequest, PIByteArray, data);
 
 	//! \handlers
 	//! \{