Remove Modbus and ModbusDevice prefix.

The naming is already obvious, no need to duplicate the protocol
or base class name.

Change-Id: I855c65379992c93c3abaf5c2be57cd192a23fb11
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

9 files changed, 33 insertions, 34 deletions

diff --git a/examples/serialbus/modbus/adueditor/mainwindow.cpp b/examples/serialbus/modbus/adueditor/mainwindow.cpp
index 5cfb9cd..d63740b 100644
--- a/examples/serialbus/modbus/adueditor/mainwindow.cpp
+++ b/examples/serialbus/modbus/adueditor/mainwindow.cpp
@@ -176,12 +176,12 @@ void MainWindow::on_connectButton_clicked()
     m_device->setTimeout(timeoutSpin->value());
     m_device->setNumberOfRetries(retriesSpin->value());
 
-    connect(m_device, &QModbusDevice::errorOccurred, this, [this](QModbusDevice::ModbusError) {
+    connect(m_device, &QModbusDevice::errorOccurred, this, [this](QModbusDevice::Error) {
         qDebug().noquote() << QStringLiteral("Error: %1").arg(m_device->errorString());
         emit disconnectButton->clicked();
     }, Qt::QueuedConnection);
 
-    connect(m_device, &QModbusDevice::stateChanged, [this](QModbusDevice::ModbusDeviceState state) {
+    connect(m_device, &QModbusDevice::stateChanged, [this](QModbusDevice::State state) {
         switch (state) {
         case QModbusDevice::UnconnectedState:
             qDebug().noquote() << QStringLiteral("State: Entered unconnected state.");
diff --git a/examples/serialbus/modbus/master/mainwindow.cpp b/examples/serialbus/modbus/master/mainwindow.cpp
index 2b7c316..98cade6 100644
--- a/examples/serialbus/modbus/master/mainwindow.cpp
+++ b/examples/serialbus/modbus/master/mainwindow.cpp
@@ -123,8 +123,7 @@ void MainWindow::on_connectType_currentIndexChanged(int index)
             ui->portEdit->setText(QLatin1Literal("127.0.0.1:502"));
     }
 
-    connect(modbusDevice, &QModbusClient::errorOccurred,
-            [this](QModbusDevice::ModbusError){
+    connect(modbusDevice, &QModbusClient::errorOccurred, [this](QModbusDevice::Error) {
         statusBar()->showMessage(modbusDevice->errorString(), 5000);
     });
 
diff --git a/examples/serialbus/modbus/slave/mainwindow.cpp b/examples/serialbus/modbus/slave/mainwindow.cpp
index fec51eb..7553e9c 100644
--- a/examples/serialbus/modbus/slave/mainwindow.cpp
+++ b/examples/serialbus/modbus/slave/mainwindow.cpp
@@ -137,7 +137,7 @@ void MainWindow::on_connectType_currentIndexChanged(int index)
     }
 }
 
-void MainWindow::handleDeviceError(QModbusDevice::ModbusError newError)
+void MainWindow::handleDeviceError(QModbusDevice::Error newError)
 {
     if (newError == QModbusDevice::NoError || !modbusDevice)
         return;
diff --git a/examples/serialbus/modbus/slave/mainwindow.h b/examples/serialbus/modbus/slave/mainwindow.h
index 115febb..178d294 100644
--- a/examples/serialbus/modbus/slave/mainwindow.h
+++ b/examples/serialbus/modbus/slave/mainwindow.h
@@ -79,7 +79,7 @@ private Q_SLOTS:
 
     void on_connectType_currentIndexChanged(int);
 
-    void handleDeviceError(QModbusDevice::ModbusError newError);
+    void handleDeviceError(QModbusDevice::Error newError);
 
 private:
     void initActions();
diff --git a/src/serialbus/qmodbusdevice.cpp b/src/serialbus/qmodbusdevice.cpp
index 5fee079..b30a8a4 100644
--- a/src/serialbus/qmodbusdevice.cpp
+++ b/src/serialbus/qmodbusdevice.cpp
@@ -185,7 +185,7 @@ void QModbusDevice::setConnectionParameter(int parameter, const QVariant &value)
 }
 
 /*!
-    \enum QModbusDevice::ModbusError
+    \enum QModbusDevice::Error
     This enum describes all the possible error conditions.
 
     \value NoError              No errors have occurred.
@@ -200,7 +200,7 @@ void QModbusDevice::setConnectionParameter(int parameter, const QVariant &value)
 */
 
 /*!
-    \enum QModbusDevice::ModbusDeviceState
+    \enum QModbusDevice::State
     This enum describes all possible device states.
 
     \value UnconnectedState The device is disconnected.
@@ -210,13 +210,13 @@ void QModbusDevice::setConnectionParameter(int parameter, const QVariant &value)
 */
 
 /*!
-    \fn QModbusDevice::errorOccurred(QModbusDevice::ModbusError error)
+    \fn QModbusDevice::errorOccurred(QModbusDevice::Error error)
 
     This signal is emitted when an error of the type, \a error, occurs.
 */
 
 /*!
-    \fn void QModbusDevice::stateChanged(QModbusDevice::ModbusDeviceState state)
+    \fn void QModbusDevice::stateChanged(QModbusDevice::State state)
 
     This signal is emitted every time the state of the device changes.
     The new state is represented by \a state.
@@ -265,7 +265,7 @@ void QModbusDevice::disconnectDevice()
     Sets the state of the device to \a newState. Modbus device implementations
     must use this function to update the device state.
 */
-void QModbusDevice::setState(QModbusDevice::ModbusDeviceState newState)
+void QModbusDevice::setState(QModbusDevice::State newState)
 {
     Q_D(QModbusDevice);
 
@@ -281,7 +281,7 @@ void QModbusDevice::setState(QModbusDevice::ModbusDeviceState newState)
 
     \sa setState(), stateChanged()
 */
-QModbusDevice::ModbusDeviceState QModbusDevice::state() const
+QModbusDevice::State QModbusDevice::state() const
 {
     return d_func()->state;
 }
@@ -291,9 +291,9 @@ QModbusDevice::ModbusDeviceState QModbusDevice::state() const
     must use this function in case of an error to set the \a error type and
     a descriptive \a errorText.
 
-    \sa QModbusDevice::ModbusError
+    \sa QModbusDevice::Error
 */
-void QModbusDevice::setError(const QString &errorText, QModbusDevice::ModbusError error)
+void QModbusDevice::setError(const QString &errorText, QModbusDevice::Error error)
 {
     Q_D(QModbusDevice);
 
@@ -305,9 +305,9 @@ void QModbusDevice::setError(const QString &errorText, QModbusDevice::ModbusErro
 /*!
     Returns the error state of the device.
 
-    \sa QModbusDevice::ModbusError
+    \sa QModbusDevice::Error
 */
-QModbusDevice::ModbusError QModbusDevice::error() const
+QModbusDevice::Error QModbusDevice::error() const
 {
     return d_func()->error;
 }
@@ -315,7 +315,7 @@ QModbusDevice::ModbusError QModbusDevice::error() const
 /*!
     Returns descriptive error text for the device error.
 
-    \sa QModbusDevice::ModbusError
+    \sa QModbusDevice::Error
 */
 QString QModbusDevice::errorString() const
 {
diff --git a/src/serialbus/qmodbusdevice.h b/src/serialbus/qmodbusdevice.h
index 9d4bd93..0c18def 100644
--- a/src/serialbus/qmodbusdevice.h
+++ b/src/serialbus/qmodbusdevice.h
@@ -51,7 +51,7 @@ class Q_SERIALBUS_EXPORT QModbusDevice : public QObject
     Q_DECLARE_PRIVATE(QModbusDevice)
 
 public:
-    enum ModbusError { //TODO review -> some values are reported via QModbusReply (e.g. WriteError)
+    enum Error { //TODO review -> some values are reported via QModbusReply (e.g. WriteError)
         NoError,
         ReadError,
         WriteError,
@@ -60,15 +60,15 @@ public:
         TimeoutError,
         UnknownError
     };
-    Q_ENUM(ModbusError)
+    Q_ENUM(Error)
 
-    enum ModbusDeviceState {
+    enum State {
         UnconnectedState,
         ConnectingState,
         ConnectedState,
         ClosingState
     };
-    Q_ENUM(ModbusDeviceState)
+    Q_ENUM(State)
 
     enum ConnectionParameter {
         SerialPortNameParameter,
@@ -94,26 +94,26 @@ public:
     bool connectDevice();
     void disconnectDevice();
 
-    ModbusDeviceState state() const;
+    State state() const;
 
-    ModbusError error() const;
+    Error error() const;
     QString errorString() const;
 
 Q_SIGNALS:
-    void errorOccurred(QModbusDevice::ModbusError error);
-    void stateChanged(QModbusDevice::ModbusDeviceState state);
+    void errorOccurred(QModbusDevice::Error error);
+    void stateChanged(QModbusDevice::State state);
 
 protected:
     QModbusDevice(QModbusDevicePrivate &dd, QObject *parent = Q_NULLPTR);
 
-    void setState(QModbusDevice::ModbusDeviceState newState);
-    void setError(const QString &errorText, QModbusDevice::ModbusError error);
+    void setState(QModbusDevice::State newState);
+    void setError(const QString &errorText, QModbusDevice::Error error);
     virtual bool open() = 0;
     virtual void close() = 0;
 };
 
-Q_DECLARE_TYPEINFO(QModbusDevice::ModbusError, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(QModbusDevice::ModbusDeviceState, Q_PRIMITIVE_TYPE);
+Q_DECLARE_TYPEINFO(QModbusDevice::Error, Q_PRIMITIVE_TYPE);
+Q_DECLARE_TYPEINFO(QModbusDevice::State, Q_PRIMITIVE_TYPE);
 Q_DECLARE_TYPEINFO(QModbusDevice::ConnectionParameter, Q_PRIMITIVE_TYPE);
 
 QT_END_NAMESPACE
diff --git a/src/serialbus/qmodbusdevice_p.h b/src/serialbus/qmodbusdevice_p.h
index 74923e3..a150f1c 100644
--- a/src/serialbus/qmodbusdevice_p.h
+++ b/src/serialbus/qmodbusdevice_p.h
@@ -62,8 +62,8 @@ class QModbusDevicePrivate : public QObjectPrivate
 public:
     QModbusDevicePrivate() Q_DECL_EQ_DEFAULT;
 
-    QModbusDevice::ModbusDeviceState state = QModbusDevice::UnconnectedState;
-    QModbusDevice::ModbusError error = QModbusDevice::NoError;
+    QModbusDevice::State state = QModbusDevice::UnconnectedState;
+    QModbusDevice::Error error = QModbusDevice::NoError;
     QString errorString;
 
     QString m_comPort;
diff --git a/src/serialbus/qmodbustcpserver_p.h b/src/serialbus/qmodbustcpserver_p.h
index 5a2e1e1..ba285b5 100644
--- a/src/serialbus/qmodbustcpserver_p.h
+++ b/src/serialbus/qmodbustcpserver_p.h
@@ -85,7 +85,7 @@ public:
         This function is a workaround since 2nd level lambda below cannot
         call protected QModbusDevice::setError(..) function on VS2013.
     */
-    void forwardError(const QString &errorText, QModbusDevice::ModbusError error)
+    void forwardError(const QString &errorText, QModbusDevice::Error error)
     {
         Q_Q(QModbusTcpServer);
         q->setError(errorText, error);
diff --git a/tests/auto/qmodbusdevice/tst_qmodbusdevice.cpp b/tests/auto/qmodbusdevice/tst_qmodbusdevice.cpp
index e2b6faf..6c924ba 100644
--- a/tests/auto/qmodbusdevice/tst_qmodbusdevice.cpp
+++ b/tests/auto/qmodbusdevice/tst_qmodbusdevice.cpp
@@ -45,7 +45,7 @@ class DummyDevice : public QModbusDevice
 public:
     DummyDevice()
     {
-        qRegisterMetaType<QModbusDevice::ModbusDeviceState>("QModbusDevice::ModbusDeviceState");
+        qRegisterMetaType<QModbusDevice::State>("QModbusDevice::State");
     }
 
 protected:
@@ -102,7 +102,7 @@ void tst_QModbusDevice::state()
 {
     device->setState(QModbusDevice::ConnectedState);
     QCOMPARE(device->state(), QModbusDevice::ConnectedState);
-    QSignalSpy spy(device, SIGNAL(stateChanged(QModbusDevice::ModbusDeviceState)));
+    QSignalSpy spy(device, SIGNAL(stateChanged(QModbusDevice::State)));
     device->setState(QModbusDevice::UnconnectedState);
     QCOMPARE(device->state(), QModbusDevice::UnconnectedState);
     device->setState(QModbusDevice::UnconnectedState);