Cleanup constructors and destructors.

- replace Q_DECL_EQ_DEFAULT/DELETE with explicit '= default/delete'
- DebugHandler: no default ctor necessary
- QModbusCommEvent: fix = default that should have been = delete
- remove defaulted ctors/ dtors, where possible, matching the current
  module style

Change-Id: I7d6fd5b8404cbb5c2741927ec676c6f8a1f75c22
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

12 files changed, 11 insertions, 29 deletions

diff --git a/examples/serialbus/modbus/adueditor/mainwindow.h b/examples/serialbus/modbus/adueditor/mainwindow.h
index b37fbb1..4870a25 100644
--- a/examples/serialbus/modbus/adueditor/mainwindow.h
+++ b/examples/serialbus/modbus/adueditor/mainwindow.h
@@ -53,8 +53,7 @@ QT_END_NAMESPACE;
 class DebugHandler
 {
 public:
-    DebugHandler() Q_DECL_EQ_DEFAULT;
-    DebugHandler(QtMessageHandler newMessageHandler)
+    explicit DebugHandler(QtMessageHandler newMessageHandler)
         : oldMessageHandler(qInstallMessageHandler(newMessageHandler))
     {}
     ~DebugHandler() { qInstallMessageHandler(oldMessageHandler); }
diff --git a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
index af20d66..050985f 100644
--- a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
+++ b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
@@ -55,8 +55,6 @@ class ModbusTcpClientPrivate : private QModbusTcpClientPrivate
     Q_DECLARE_PUBLIC(ModbusTcpClient)
 
 public:
-    ModbusTcpClientPrivate() Q_DECL_EQ_DEFAULT;
-
     QModbusReply *enqueueRequest(const QModbusRequest &request, int, const QModbusDataUnit &unit,
                                  QModbusReply::ReplyType type) Q_DECL_OVERRIDE
     {
diff --git a/src/serialbus/qmodbusclient_p.h b/src/serialbus/qmodbusclient_p.h
index f3d4b8c..f7f6a36 100644
--- a/src/serialbus/qmodbusclient_p.h
+++ b/src/serialbus/qmodbusclient_p.h
@@ -61,9 +61,6 @@ class Q_AUTOTEST_EXPORT QModbusClientPrivate : public QModbusDevicePrivate
     Q_DECLARE_PUBLIC(QModbusClient)
 
 public:
-    QModbusClientPrivate() Q_DECL_EQ_DEFAULT;
-    virtual ~QModbusClientPrivate() Q_DECL_EQ_DEFAULT;
-
     QModbusReply *sendRequest(const QModbusRequest &request, int serverAddress,
                               const QModbusDataUnit *const unit);
     QModbusRequest createReadRequest(const QModbusDataUnit &data) const;
@@ -106,7 +103,7 @@ public:
     int m_responseTimeoutDuration = 1000;
 
     struct QueueElement {
-        QueueElement() Q_DECL_EQ_DEFAULT;
+        QueueElement() = default;
         QueueElement(QModbusReply *r, const QModbusRequest &req, const QModbusDataUnit &u, int num,
                 int timeout = -1)
             : reply(r), requestPdu(req), unit(u), numberOfRetries(num)
diff --git a/src/serialbus/qmodbuscommevent_p.h b/src/serialbus/qmodbuscommevent_p.h
index 84d6f30..4cf730a 100644
--- a/src/serialbus/qmodbuscommevent_p.h
+++ b/src/serialbus/qmodbuscommevent_p.h
@@ -103,7 +103,6 @@ public:
     }
 
 private:
-    QModbusCommEvent() Q_DECL_EQ_DEFAULT;
     quint8 m_eventByte;
 };
 
diff --git a/src/serialbus/qmodbusdataunit.h b/src/serialbus/qmodbusdataunit.h
index 97830ce..9b767c5 100644
--- a/src/serialbus/qmodbusdataunit.h
+++ b/src/serialbus/qmodbusdataunit.h
@@ -54,7 +54,7 @@ public:
         HoldingRegisters
     };
 
-    QModbusDataUnit() Q_DECL_EQ_DEFAULT;
+    QModbusDataUnit() = default;
 
     explicit QModbusDataUnit(RegisterType type)
         : QModbusDataUnit(type, 0, 0)
diff --git a/src/serialbus/qmodbusdevice_p.h b/src/serialbus/qmodbusdevice_p.h
index 91b169e..f9d46e2 100644
--- a/src/serialbus/qmodbusdevice_p.h
+++ b/src/serialbus/qmodbusdevice_p.h
@@ -61,8 +61,6 @@ class QModbusDevicePrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QModbusDevice)
 
 public:
-    QModbusDevicePrivate() Q_DECL_EQ_DEFAULT;
-
     QModbusDevice::State state = QModbusDevice::UnconnectedState;
     QModbusDevice::Error error = QModbusDevice::NoError;
     QString errorString;
diff --git a/src/serialbus/qmodbuspdu.h b/src/serialbus/qmodbuspdu.h
index 14a113d..4e48b30 100644
--- a/src/serialbus/qmodbuspdu.h
+++ b/src/serialbus/qmodbuspdu.h
@@ -84,8 +84,8 @@ public:
         UndefinedFunctionCode = 0x100
     };
 
-    QModbusPdu() Q_DECL_EQ_DEFAULT;
-    virtual ~QModbusPdu() Q_DECL_EQ_DEFAULT;
+    QModbusPdu() = default;
+    virtual ~QModbusPdu() = default;
 
     bool isValid() const {
         return (m_code >= ReadCoils && m_code < UndefinedFunctionCode)
@@ -137,14 +137,13 @@ public:
 #endif
 
 protected:
-
     QModbusPdu(FunctionCode code, const QByteArray &newData)
         : m_code(code)
         , m_data(newData)
     {}
 
-    QModbusPdu(const QModbusPdu &) Q_DECL_EQ_DEFAULT;
-    QModbusPdu &operator=(const QModbusPdu &) Q_DECL_EQ_DEFAULT;
+    QModbusPdu(const QModbusPdu &) = default;
+    QModbusPdu &operator=(const QModbusPdu &) = default;
 
     // qdoc cannot deal with variadic templates
     template <typename ... Args>
@@ -204,7 +203,7 @@ Q_SERIALBUS_EXPORT QDataStream &operator<<(QDataStream &stream, const QModbusPdu
 class QModbusRequest : public QModbusPdu
 {
 public:
-    QModbusRequest() Q_DECL_EQ_DEFAULT;
+    QModbusRequest() = default;
     QModbusRequest(const QModbusPdu &pdu)
         : QModbusPdu(pdu)
     {}
@@ -227,7 +226,7 @@ Q_SERIALBUS_EXPORT QDataStream &operator>>(QDataStream &stream, QModbusRequest &
 class QModbusResponse : public QModbusPdu
 {
 public:
-    QModbusResponse() Q_DECL_EQ_DEFAULT;
+    QModbusResponse() = default;
     QModbusResponse(const QModbusPdu &pdu)
         : QModbusPdu(pdu)
     {}
@@ -249,7 +248,7 @@ public:
 class QModbusExceptionResponse : public QModbusResponse
 {
 public:
-    QModbusExceptionResponse() Q_DECL_EQ_DEFAULT;
+    QModbusExceptionResponse() = default;
     QModbusExceptionResponse(const QModbusPdu &pdu)
         : QModbusResponse(pdu)
     {}
diff --git a/src/serialbus/qmodbusreply.cpp b/src/serialbus/qmodbusreply.cpp
index 373dd0e..2a8ee19 100644
--- a/src/serialbus/qmodbusreply.cpp
+++ b/src/serialbus/qmodbusreply.cpp
@@ -44,9 +44,8 @@ QT_BEGIN_NAMESPACE
 class QModbusReplyPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QModbusReply)
-public:
-    QModbusReplyPrivate() Q_DECL_EQ_DEFAULT;
 
+public:
     QModbusDataUnit m_unit;
     int m_serverAddress = 1;
     bool m_finished = false;
diff --git a/src/serialbus/qmodbusrtuserialslave_p.h b/src/serialbus/qmodbusrtuserialslave_p.h
index d8df260..1979b25 100644
--- a/src/serialbus/qmodbusrtuserialslave_p.h
+++ b/src/serialbus/qmodbusrtuserialslave_p.h
@@ -66,8 +66,6 @@ class QModbusRtuSerialSlavePrivate : public QModbusServerPrivate
     Q_DECLARE_PUBLIC(QModbusRtuSerialSlave)
 
 public:
-    QModbusRtuSerialSlavePrivate() Q_DECL_EQ_DEFAULT;
-
     void setupSerialPort()
     {
         Q_Q(QModbusRtuSerialSlave);
diff --git a/src/serialbus/qmodbustcpclient_p.h b/src/serialbus/qmodbustcpclient_p.h
index 7c890bd..d196bb5 100644
--- a/src/serialbus/qmodbustcpclient_p.h
+++ b/src/serialbus/qmodbustcpclient_p.h
@@ -65,8 +65,6 @@ class QModbusTcpClientPrivate : public QModbusClientPrivate
     Q_DECLARE_PUBLIC(QModbusTcpClient)
 
 public:
-    QModbusTcpClientPrivate() Q_DECL_EQ_DEFAULT;
-
     void setupTcpSocket()
     {
         Q_Q(QModbusTcpClient);
diff --git a/src/serialbus/qmodbustcpserver_p.h b/src/serialbus/qmodbustcpserver_p.h
index 9de51b9..c7f393c 100644
--- a/src/serialbus/qmodbustcpserver_p.h
+++ b/src/serialbus/qmodbustcpserver_p.h
@@ -69,8 +69,6 @@ class QModbusTcpServerPrivate : public QModbusServerPrivate
     Q_DECLARE_PUBLIC(QModbusTcpServer)
 
 public:
-    QModbusTcpServerPrivate() Q_DECL_EQ_DEFAULT;
-
     /*
         This function is a workaround since 2nd level lambda below cannot
         call protected QModbusTcpServer::processRequest(..) function on VS2013.
diff --git a/tests/auto/qmodbusserver/tst_qmodbusserver.cpp b/tests/auto/qmodbusserver/tst_qmodbusserver.cpp
index ee4bd94..114063a 100644
--- a/tests/auto/qmodbusserver/tst_qmodbusserver.cpp
+++ b/tests/auto/qmodbusserver/tst_qmodbusserver.cpp
@@ -1086,7 +1086,6 @@ private slots:
         class InheritanceTestServer : public QModbusServer
         {
         public:
-            InheritanceTestServer() Q_DECL_EQ_DEFAULT;
             void close() Q_DECL_OVERRIDE {}
             bool open() Q_DECL_OVERRIDE { return true; }