diff options
| author | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2016-01-28 10:51:52 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2016-01-29 13:02:06 +0000 |
| commit | e2c26722fad7ce4b034682ca697abfe4743ef19a (patch) | |
| tree | 407cb6fccb431e6d0e238de90e80eadf90f4e9f3 /examples | |
| parent | afc7548b720cf3a3f8c07e87cfee1fc455b71a3b (diff) | |
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>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/serialbus/modbus/adueditor/mainwindow.h | 3 | ||||
| -rw-r--r-- | examples/serialbus/modbus/adueditor/modbustcpclient_p.h | 2 |
2 files changed, 1 insertions, 4 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 { |