Correct running on qt5

Author: sanny32

omodsim/modbusmultiserver.cpp

@@ -11,16 +11,6 @@ ModbusMultiServer::ModbusMultiServer(QObject *parent)
     : QObject{parent}
     ,_workerThread(new QThread(this))
 {
-    {
-        static int reg = qRegisterMetaType<QModbusRequest>();
-        Q_UNUSED(reg);
-    }
-
-    {
-        static int reg = qRegisterMetaType<QModbusResponse>();
-        Q_UNUSED(reg);
-    }
-
     moveToThread(_workerThread);
     _workerThread->start();
 

omodsim/modbusmultiserver.h

@@ -1,9 +1,7 @@
 #ifndef MODBUSMULTISERVER_H
 #define MODBUSMULTISERVER_H
 
-#include <QObject>
 #include <QThread>
-#include <QTcpSocket>
 #include <QModbusServer>
 #include "modbusdataunitmap.h"
 #include "modbuswriteparams.h"
@@ -95,7 +93,5 @@ private slots:
     QMap<int, ModbusDataUnitMap> _modbusDataUnitMaps;
     QList<QSharedPointer<ModbusServer>> _modbusServerList;
 };
-Q_DECLARE_METATYPE(QModbusRequest)
-Q_DECLARE_METATYPE(QModbusResponse)
 
 #endif // MODBUSMULTISERVER_H

omodsim/modbusserver.cpp

@@ -14,6 +14,20 @@ ModbusServer::ModbusServer(QObject* parent)
     : QObject(parent)
     ,_counters()
 {
+    {
+        static int reg = qRegisterMetaType<QModbusRequest>();
+        Q_UNUSED(reg);
+    }
+
+    {
+        static int reg = qRegisterMetaType<QModbusResponse>();
+        Q_UNUSED(reg);
+    }
+
+    {
+        static int reg = qRegisterMetaType<QModbusDataUnit>();
+        Q_UNUSED(reg);
+    }
 }
 
 ///

omodsim/modbusserver.h

@@ -173,6 +173,10 @@ class ModbusServer : public QObject
     QHash<int, QString> _errorsString;
 };
 
+Q_DECLARE_METATYPE(QModbusRequest)
+Q_DECLARE_METATYPE(QModbusResponse)
+Q_DECLARE_METATYPE(QModbusDataUnit)
+
 Q_DECLARE_LOGGING_CATEGORY(QT_MODBUS)
 Q_DECLARE_LOGGING_CATEGORY(QT_MODBUS_LOW)
 

omodsim/translations/omodsim_ru.ts

@@ -2175,7 +2175,7 @@ MODBUS Point Type:
 <context>
     <name>ModbusMultiServer</name>
     <message>
-        <location filename="../modbusmultiserver.cpp" line="948"/>
+        <location filename="../modbusmultiserver.cpp" line="938"/>
         <source>Connection error. %1</source>
         <translation>Ошибка подключения. %1</translation>
     </message>

omodsim/translations/omodsim_zh.ts

@@ -2183,7 +2183,7 @@ MODBUS Point Type:
 <context>
     <name>ModbusMultiServer</name>
     <message>
-        <location filename="../modbusmultiserver.cpp" line="948"/>
+        <location filename="../modbusmultiserver.cpp" line="938"/>
         <source>Connection error. %1</source>
         <translation>连接错误 %1</translation>
     </message>