Rename classes, master -> client, slave -> server

Change-Id: I87011ffd423842cf9dbe5babc0801c95b47c9a86
Reviewed-by: Ralf Nolden <nolden@kde.org>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>

38 files changed, 89 insertions, 89 deletions

diff --git a/examples/serialbus/modbus/master/mainwindow.cpp b/examples/serialbus/modbus/master/mainwindow.cpp
index d5c34c7..1e3db4c 100644
--- a/examples/serialbus/modbus/master/mainwindow.cpp
+++ b/examples/serialbus/modbus/master/mainwindow.cpp
@@ -91,7 +91,7 @@ void MainWindow::on_connectType_currentIndexChanged(int index)
         ui->connectButton->setDisabled(true);
         ui->errorLabel->setText(tr("Could not create modbus master."));
     } else {
-        connect(modbusDevice, &QModbusMaster::stateChanged,
+        connect(modbusDevice, &QModbusClient::stateChanged,
                 this, &MainWindow::onStateChanged);
     }
 }
diff --git a/examples/serialbus/modbus/master/mainwindow.h b/examples/serialbus/modbus/master/mainwindow.h
index f0fa847..e6b99e3 100644
--- a/examples/serialbus/modbus/master/mainwindow.h
+++ b/examples/serialbus/modbus/master/mainwindow.h
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QModbusMaster;
+class QModbusClient;
 class QModbusReply;
 
 namespace Ui {
@@ -79,7 +79,7 @@ private slots:
 private:
     Ui::MainWindow *ui;
     QModbusReply* lastRequest;
-    QModbusMaster* modbusDevice;
+    QModbusClient* modbusDevice;
 };
 
 #endif // MAINWINDOW_H
diff --git a/examples/serialbus/modbus/slave/mainwindow.cpp b/examples/serialbus/modbus/slave/mainwindow.cpp
index cced9ba..e301f8d 100644
--- a/examples/serialbus/modbus/slave/mainwindow.cpp
+++ b/examples/serialbus/modbus/slave/mainwindow.cpp
@@ -85,7 +85,7 @@ void MainWindow::on_connectType_currentIndexChanged(int index)
         ui->connectButton->setDisabled(true);
         ui->errorLabel->setText(tr("Could not create modbus slave."));
     } else {
-        connect(modbusDevice, &QModbusMaster::stateChanged,
+        connect(modbusDevice, &QModbusClient::stateChanged,
                 this, &MainWindow::onStateChanged);
     }
 }
@@ -103,9 +103,9 @@ void MainWindow::on_connectButton_clicked()
 
         modbusDevice->setMap(reg);
 
-        connect(modbusDevice, &QModbusSlave::slaveWritten,
+        connect(modbusDevice, &QModbusServer::slaveWritten,
                 this, &MainWindow::updateWidgets);
-        connect(modbusDevice, &QModbusSlave::stateChanged,
+        connect(modbusDevice, &QModbusServer::stateChanged,
                 this, &MainWindow::onStateChanged);
     }
 
diff --git a/examples/serialbus/modbus/slave/mainwindow.h b/examples/serialbus/modbus/slave/mainwindow.h
index 72d7ced..e6fdef4 100644
--- a/examples/serialbus/modbus/slave/mainwindow.h
+++ b/examples/serialbus/modbus/slave/mainwindow.h
@@ -43,7 +43,7 @@
 
 #include <QButtonGroup>
 #include <QMainWindow>
-#include <QModbusSlave>
+#include <QModbusServer>
 
 QT_BEGIN_NAMESPACE
 
@@ -81,7 +81,7 @@ private:
     void setupWidgetContainers();
 
     Ui::MainWindow *ui;
-    QModbusSlave* modbusDevice;
+    QModbusServer* modbusDevice;
 
     QButtonGroup coilButtons;
     QButtonGroup discreteButtons;
diff --git a/src/plugins/modbus/libmodbus/libmodbusmaster.cpp b/src/plugins/modbus/libmodbus/libmodbusmaster.cpp
index 2cbf1e0..8af9f7e 100644
--- a/src/plugins/modbus/libmodbus/libmodbusmaster.cpp
+++ b/src/plugins/modbus/libmodbus/libmodbusmaster.cpp
@@ -46,7 +46,7 @@
 QT_BEGIN_NAMESPACE
 
 LibModBusMaster::LibModBusMaster() :
-    QModbusMaster(),
+    QModbusClient(),
     connected(false)
 {
 }
diff --git a/src/plugins/modbus/libmodbus/libmodbusmaster.h b/src/plugins/modbus/libmodbus/libmodbusmaster.h
index 6024515..93759fc 100644
--- a/src/plugins/modbus/libmodbus/libmodbusmaster.h
+++ b/src/plugins/modbus/libmodbus/libmodbusmaster.h
@@ -49,7 +49,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class LibModBusMaster : public QModbusMaster
+class LibModBusMaster : public QModbusClient
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/modbus/libmodbus/libmodbusslave.cpp b/src/plugins/modbus/libmodbus/libmodbusslave.cpp
index 2c9a941..2864f5b 100644
--- a/src/plugins/modbus/libmodbus/libmodbusslave.cpp
+++ b/src/plugins/modbus/libmodbus/libmodbusslave.cpp
@@ -55,7 +55,7 @@
 QT_BEGIN_NAMESPACE
 
 LibModBusSlave::LibModBusSlave() :
-    QModbusSlave(),
+    QModbusServer(),
     context(0),
     mapping(modbus_mapping_new(0,0,0,0)),
     connected(false),
diff --git a/src/plugins/modbus/libmodbus/libmodbusslave.h b/src/plugins/modbus/libmodbus/libmodbusslave.h
index 32be67a..c275718 100644
--- a/src/plugins/modbus/libmodbus/libmodbusslave.h
+++ b/src/plugins/modbus/libmodbus/libmodbusslave.h
@@ -77,7 +77,7 @@ Q_SIGNALS:
     void slaveWritten(QModbusRegister::RegisterType table, int address, int size);
 };
 
-class LibModBusSlave : public QModbusSlave
+class LibModBusSlave : public QModbusServer
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/modbus/libmodbus/main.cpp b/src/plugins/modbus/libmodbus/main.cpp
index 44bd6a1..0d02df5 100644
--- a/src/plugins/modbus/libmodbus/main.cpp
+++ b/src/plugins/modbus/libmodbus/main.cpp
@@ -54,7 +54,7 @@ class ModBusPlugin : public QObject, public QModbusFactory
     Q_INTERFACES(QModbusFactory)
 
 public:
-    QModbusSlave *createSlave(QModbusDevice::ModBusConnection type) const
+    QModbusServer *createSlave(QModbusDevice::ModBusConnection type) const
     {
         if (type == QModbusDevice::Serial)
             return new LibModBusSlave();
@@ -63,7 +63,7 @@ public:
         return Q_NULLPTR;
     }
 
-    QModbusMaster *createMaster(QModbusDevice::ModBusConnection type) const
+    QModbusClient *createMaster(QModbusDevice::ModBusConnection type) const
     {
         if (type == QModbusDevice::Serial)
             return new LibModBusMaster();
diff --git a/src/serialbus/qmodbus.cpp b/src/serialbus/qmodbus.cpp
index f84ede3..6a4ea3e 100644
--- a/src/serialbus/qmodbus.cpp
+++ b/src/serialbus/qmodbus.cpp
@@ -132,7 +132,7 @@ QModbusPrivate setFactory(const QByteArray &plugin)
     Ownership of the returned backend is transferred to the caller.
     Returns \c null if no suitable device can be found.
  */
-QModbusSlave *QModbus::createSlave(const QByteArray &plugin,
+QModbusServer *QModbus::createSlave(const QByteArray &plugin,
                                    QModbusDevice::ModBusConnection type) const
 {
     if (!qModBusPlugins()->contains(plugin))
@@ -150,7 +150,7 @@ QModbusSlave *QModbus::createSlave(const QByteArray &plugin,
     Ownership of the returned backend is transferred to the caller.
     Returns \c null if no suitable device can be found.
  */
-QModbusMaster *QModbus::createMaster(const QByteArray &plugin,
+QModbusClient *QModbus::createMaster(const QByteArray &plugin,
                                      QModbusDevice::ModBusConnection type) const
 {
     if (!qModBusPlugins()->contains(plugin))
diff --git a/src/serialbus/qmodbus.h b/src/serialbus/qmodbus.h
index 7af619c..92417e0 100644
--- a/src/serialbus/qmodbus.h
+++ b/src/serialbus/qmodbus.h
@@ -54,9 +54,9 @@ public:
     static QModbus *instance();
     QList<QByteArray> plugins() const;
 
-    QModbusSlave *createSlave(const QByteArray &plugin,
+    QModbusServer *createSlave(const QByteArray &plugin,
         QModbusDevice::ModBusConnection type = QModbusDevice::Serial) const;
-    QModbusMaster *createMaster(const QByteArray &plugin,
+    QModbusClient *createMaster(const QByteArray &plugin,
         QModbusDevice::ModBusConnection type = QModbusDevice::Serial) const;
 
 private:
diff --git a/src/serialbus/qmodbusclient.cpp b/src/serialbus/qmodbusclient.cpp
index 35cd5d1..2bddb2a 100644
--- a/src/serialbus/qmodbusclient.cpp
+++ b/src/serialbus/qmodbusclient.cpp
@@ -40,42 +40,42 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QModbusMaster
+    \class QModbusClient
     \inmodule QtSerialBus
     \since 5.6
 
-    \brief The QModbusMaster class is the interface class for Modbus master device.
+    \brief The QModbusClient class is the interface class for Modbus master device.
 
-    QModbusMaster communicates with the Modbus backend providing users with a convenient API.
+    QModbusClient communicates with the Modbus backend providing users with a convenient API.
     The Modbus backend must be specified during the object creation.
 */
 
 /*!
     Constructs a Modbus master device with the specified \a parent.
  */
-QModbusMaster::QModbusMaster(QObject *parent)
-    : QModbusDevice(*new QModbusMasterPrivate, parent)
+QModbusClient::QModbusClient(QObject *parent)
+    : QModbusDevice(*new QModbusClientPrivate, parent)
 {
 }
 
 /*!
     \internal
 */
-QModbusMaster::~QModbusMaster()
+QModbusClient::~QModbusClient()
 {
 }
 
 /*!
     \internal
 */
-QModbusMaster::QModbusMaster(QModbusMasterPrivate &dd, QObject *parent) :
+QModbusClient::QModbusClient(QModbusClientPrivate &dd, QObject *parent) :
     QModbusDevice(dd, parent)
 {
 
 }
 
 /*!
-    \fn QModbusReply *QModbusMaster::write(const QModbusDataUnit &request, int slaveId)
+    \fn QModbusReply *QModbusClient::write(const QModbusDataUnit &request, int slaveId)
 
     Sends a request to modify the contents of the data pointed by \a request. Returns a
     new QModbusReply object, which emits the finished() signal whenever a positive response
@@ -84,7 +84,7 @@ QModbusMaster::QModbusMaster(QModbusMasterPrivate &dd, QObject *parent) :
  */
 
 /*!
-    \fn QModbusReply *QModbusMaster::read(const QModbusDataUnit &request, int slaveId)
+    \fn QModbusReply *QModbusClient::read(const QModbusDataUnit &request, int slaveId)
 
     Sends a request to read the contents of the data pointed by \a request. Returns a new QModbusReply object,
     which emits the finished() signal whenever data arrives. Modbus network may have multiple slaves,
diff --git a/src/serialbus/qmodbusclient.h b/src/serialbus/qmodbusclient.h
index de29d91..2905371 100644
--- a/src/serialbus/qmodbusclient.h
+++ b/src/serialbus/qmodbusclient.h
@@ -46,22 +46,22 @@
 
 QT_BEGIN_NAMESPACE
 
-class QModbusMasterPrivate;
+class QModbusClientPrivate;
 
-class Q_SERIALBUS_EXPORT QModbusMaster : public QModbusDevice
+class Q_SERIALBUS_EXPORT QModbusClient : public QModbusDevice
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QModbusMaster)
+    Q_DECLARE_PRIVATE(QModbusClient)
 public:
 
-    explicit QModbusMaster(QObject *parent = 0);
-    virtual ~QModbusMaster();
+    explicit QModbusClient(QObject *parent = 0);
+    virtual ~QModbusClient();
 
     virtual QModbusReply *write(const QModbusDataUnit &request, int slaveId = 1) = 0;
     virtual QModbusReply *read(const QModbusDataUnit &request, int slaveId = 1) = 0;
 
 protected:
-    QModbusMaster(QModbusMasterPrivate &dd, QObject *parent = Q_NULLPTR);
+    QModbusClient(QModbusClientPrivate &dd, QObject *parent = Q_NULLPTR);
 };
 
 QT_END_NAMESPACE
diff --git a/src/serialbus/qmodbusclient_p.h b/src/serialbus/qmodbusclient_p.h
index 655a555..c72117e 100644
--- a/src/serialbus/qmodbusclient_p.h
+++ b/src/serialbus/qmodbusclient_p.h
@@ -53,11 +53,11 @@
 
 QT_BEGIN_NAMESPACE
 
-class QModbusMasterPrivate : public QModbusDevicePrivate
+class QModbusClientPrivate : public QModbusDevicePrivate
 {
-    Q_DECLARE_PUBLIC(QModbusMaster)
+    Q_DECLARE_PUBLIC(QModbusClient)
 public:
-    QModbusMasterPrivate()
+    QModbusClientPrivate()
     {
     }
 };
diff --git a/src/serialbus/qmodbusdevice.cpp b/src/serialbus/qmodbusdevice.cpp
index a3ac49b..509731a 100644
--- a/src/serialbus/qmodbusdevice.cpp
+++ b/src/serialbus/qmodbusdevice.cpp
@@ -46,8 +46,8 @@ QT_BEGIN_NAMESPACE
     \inmodule QtSerialBus
     \since 5.6
 
-    \brief The QModbusDevice class is the base class for Modbus classes, \l QModbusSlave
-    and \l QModbusMaster.
+    \brief The QModbusDevice class is the base class for Modbus classes, \l QModbusServer
+    and \l QModbusClient.
  */
 
 /*!
diff --git a/src/serialbus/qmodbusfactory.h b/src/serialbus/qmodbusfactory.h
index 659645a..722e2af 100644
--- a/src/serialbus/qmodbusfactory.h
+++ b/src/serialbus/qmodbusfactory.h
@@ -49,8 +49,8 @@ QT_BEGIN_NAMESPACE
 class Q_SERIALBUS_EXPORT QModbusFactory
 {
 public:
-    virtual QModbusSlave *createSlave(QModbusDevice::ModBusConnection type) const = 0;
-    virtual QModbusMaster *createMaster(QModbusDevice::ModBusConnection type) const = 0;
+    virtual QModbusServer *createSlave(QModbusDevice::ModBusConnection type) const = 0;
+    virtual QModbusClient *createMaster(QModbusDevice::ModBusConnection type) const = 0;
 
 protected:
     virtual ~QModbusFactory() {}
diff --git a/src/serialbus/qmodbusregister.cpp b/src/serialbus/qmodbusregister.cpp
index de66b1d..f5d10aa 100644
--- a/src/serialbus/qmodbusregister.cpp
+++ b/src/serialbus/qmodbusregister.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
     \since 5.6
 
     \brief QModbusRegister is a container class indicating the size of
-    the ModBus register maintained by a QModbusSlave instance.
+    the ModBus register maintained by a QModbusServer instance.
 
  */
 
diff --git a/src/serialbus/qmodbusreply.cpp b/src/serialbus/qmodbusreply.cpp
index 5d9c56a..44d2df8 100644
--- a/src/serialbus/qmodbusreply.cpp
+++ b/src/serialbus/qmodbusreply.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
     \since 5.6
 
     \brief The QCanBusReply class contains the data and address for the request sent with
-    QModbusMaster.
+    QModbusClient.
  */
 
 /*!
diff --git a/src/serialbus/qmodbusserialmaster.cpp b/src/serialbus/qmodbusserialmaster.cpp
index 424d7a9..7046353 100644
--- a/src/serialbus/qmodbusserialmaster.cpp
+++ b/src/serialbus/qmodbusserialmaster.cpp
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
     Constructs a serial Modbus master with the specified \a parent.
  */
 QModbusSerialMaster::QModbusSerialMaster(QObject *parent)
-    : QModbusMaster(*new QModbusSerialMasterPrivate, parent)
+    : QModbusClient(*new QModbusSerialMasterPrivate, parent)
 {
     Q_D(QModbusSerialMaster);
     d->setupMaster();
@@ -99,7 +99,7 @@ bool QModbusSerialMaster::connectDevice(const QString &deviceName)
 */
 QModbusSerialMaster::QModbusSerialMaster(QModbusSerialMasterPrivate &dd,
                                          QObject *parent)
-    : QModbusMaster(dd, parent)
+    : QModbusClient(dd, parent)
 {
     Q_D(QModbusSerialMaster);
     d->setupMaster();
diff --git a/src/serialbus/qmodbusserialmaster.h b/src/serialbus/qmodbusserialmaster.h
index cdf70a8..fa5df72 100644
--- a/src/serialbus/qmodbusserialmaster.h
+++ b/src/serialbus/qmodbusserialmaster.h
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 
 class QModbusSerialMasterPrivate;
 
-class Q_SERIALBUS_EXPORT QModbusSerialMaster : public QModbusMaster
+class Q_SERIALBUS_EXPORT QModbusSerialMaster : public QModbusClient
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QModbusSerialMaster)
diff --git a/src/serialbus/qmodbusserialmaster_p.h b/src/serialbus/qmodbusserialmaster_p.h
index 7c50d26..602d09a 100644
--- a/src/serialbus/qmodbusserialmaster_p.h
+++ b/src/serialbus/qmodbusserialmaster_p.h
@@ -57,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QModbusSerialMasterPrivate : public QModbusMasterPrivate
+class QModbusSerialMasterPrivate : public QModbusClientPrivate
 {
     Q_DECLARE_PUBLIC(QModbusSerialMaster)
 public:
@@ -97,7 +97,7 @@ public:
     void handleStateChanged(QModbusDevice::ModBusDeviceState);
     void handleErrorOccurred(QModbusDevice::ModBusError);
 
-    QModbusMaster* pluginMaster;
+    QModbusClient* pluginMaster;
 };
 
 QT_END_NAMESPACE
diff --git a/src/serialbus/qmodbusserialslave.cpp b/src/serialbus/qmodbusserialslave.cpp
index 27caa99..a9c3050 100644
--- a/src/serialbus/qmodbusserialslave.cpp
+++ b/src/serialbus/qmodbusserialslave.cpp
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
     Constructs a serial Modbus slave with the specified \a parent.
  */
 QModbusSerialSlave::QModbusSerialSlave(QObject *parent)
-    : QModbusSlave(*new QModbusSerialSlavePrivate, parent)
+    : QModbusServer(*new QModbusSerialSlavePrivate, parent)
 {
     Q_D(QModbusSerialSlave);
     d->setupMaster();
@@ -98,7 +98,7 @@ bool QModbusSerialSlave::connectDevice()
  */
 QModbusSerialSlave::QModbusSerialSlave(QModbusSerialSlavePrivate &dd,
                                        QObject *parent)
-    : QModbusSlave(dd, parent)
+    : QModbusServer(dd, parent)
 {
     Q_D(QModbusSerialSlave);
     d->setupMaster();
diff --git a/src/serialbus/qmodbusserialslave.h b/src/serialbus/qmodbusserialslave.h
index 6a00999..6336c1b 100644
--- a/src/serialbus/qmodbusserialslave.h
+++ b/src/serialbus/qmodbusserialslave.h
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 
 class QModbusSerialSlavePrivate;
 
-class Q_SERIALBUS_EXPORT QModbusSerialSlave : public QModbusSlave
+class Q_SERIALBUS_EXPORT QModbusSerialSlave : public QModbusServer
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QModbusSerialSlave)
diff --git a/src/serialbus/qmodbusserialslave_p.h b/src/serialbus/qmodbusserialslave_p.h
index 4df2305..47e24d0 100644
--- a/src/serialbus/qmodbusserialslave_p.h
+++ b/src/serialbus/qmodbusserialslave_p.h
@@ -57,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QModbusSerialSlavePrivate : public QModbusSlavePrivate
+class QModbusSerialSlavePrivate : public QModbusServerPrivate
 {
     Q_DECLARE_PUBLIC(QModbusSerialSlave)
 public:
@@ -101,7 +101,7 @@ public:
     void handleStateChanged(QModbusDevice::ModBusDeviceState state);
     void handleErrorOccurred(QModbusDevice::ModBusError);
 
-    QModbusSlave* pluginMaster;
+    QModbusServer* pluginMaster;
 };
 
 QT_END_NAMESPACE
diff --git a/src/serialbus/qmodbusserver.cpp b/src/serialbus/qmodbusserver.cpp
index 15a3628..6667552 100644
--- a/src/serialbus/qmodbusserver.cpp
+++ b/src/serialbus/qmodbusserver.cpp
@@ -40,14 +40,14 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QModbusSlave
+    \class QModbusServer
     \inmodule QtSerialBus
     \since 5.6
 
-    \brief The QModbusSlave class is the interface class for Modbus.
+    \brief The QModbusServer class is the interface class for Modbus.
 
     Modbus networks can have multiple slaves. Slaves are read/written by a
-    master device represented by \l QModbusMaster. QModbusSlave communicates
+    master device represented by \l QModbusClient. QModbusServer communicates
     with a Modbus backend, providing users with a convenient API.
     The Modbus backend must be specified during the object creation.
  */
@@ -55,28 +55,28 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs a Modbus slave with the specified \a parent.
  */
-QModbusSlave::QModbusSlave(QObject *parent) :
-    QModbusDevice(*new QModbusSlavePrivate, parent)
+QModbusServer::QModbusServer(QObject *parent) :
+    QModbusDevice(*new QModbusServerPrivate, parent)
 {
 }
 
 /*!
     \internal
 */
-QModbusSlave::~QModbusSlave()
+QModbusServer::~QModbusServer()
 {
 }
 
 /*!
     \internal
  */
-QModbusSlave::QModbusSlave(QModbusSlavePrivate &dd, QObject *parent) :
+QModbusServer::QModbusServer(QModbusServerPrivate &dd, QObject *parent) :
     QModbusDevice(dd, parent)
 {
 }
 
 /*!
-    \fn bool QModbusSlave::setMap(const QModbusRegister &newRegister) = 0
+    \fn bool QModbusServer::setMap(const QModbusRegister &newRegister) = 0
 
     Sets the registered map structure for requests from other ModBus masters to \a newRegister.
     The register values are initialized with zero. Returns \c true on success; otherwise \c false.
@@ -88,7 +88,7 @@ QModbusSlave::QModbusSlave(QModbusSlavePrivate &dd, QObject *parent) :
  */
 
 /*!
-    \fn int QModbusSlave::slaveId() const
+    \fn int QModbusServer::slaveId() const
     Multiple Modbus devices can be connected together on the same physical link.
     Slave id is a unique identifier that each slave must have, and it is used
     to filter out incoming messages.
@@ -99,7 +99,7 @@ QModbusSlave::QModbusSlave(QModbusSlavePrivate &dd, QObject *parent) :
  */
 
 /*!
-    \fn void QModbusSlave::setSlaveId(int id)
+    \fn void QModbusServer::setSlaveId(int id)
     Multiple Modbus devices can be connected together on the same physical link.
     So it is important that each slave is identified by a unique id.
 
@@ -109,7 +109,7 @@ QModbusSlave::QModbusSlave(QModbusSlavePrivate &dd, QObject *parent) :
  */
 
 /*!
-    \fn bool QModbusSlave::data(QModbusRegister::RegisterType table, quint16 address, quint16 *data)
+    \fn bool QModbusServer::data(QModbusRegister::RegisterType table, quint16 address, quint16 *data)
 
     Reads data stored in the slave. Slave has four tables (\a table) and each have a unique
     \a address field, which is used to read \a data from the desired field.
@@ -120,7 +120,7 @@ QModbusSlave::QModbusSlave(QModbusSlavePrivate &dd, QObject *parent) :
  */
 
 /*!
-    \fn bool QModbusSlave::setData(QModbusRegister::RegisterType table, quint16 address, quint16 data)
+    \fn bool QModbusServer::setData(QModbusRegister::RegisterType table, quint16 address, quint16 data)
 
     Writes data to the slave. Slave has four tables (\a table) and each have a unique
     \a address field, which is used to write \a data to the desired field.
@@ -130,13 +130,13 @@ QModbusSlave::QModbusSlave(QModbusSlavePrivate &dd, QObject *parent) :
  */
 
 /*!
-    \fn void QModbusSlave::slaveRead()
+    \fn void QModbusServer::slaveRead()
 
     This signal is emitted when master has read one or more fields of data from the slave.
  */
 
 /*!
-    \fn void QModbusSlave::slaveWritten(QModbusRegister::RegisterType table, int address, int size)
+    \fn void QModbusServer::slaveWritten(QModbusRegister::RegisterType table, int address, int size)
 
     This signal is emitted when master has written one or more fields of data to the slave.
     Signal contains information about the fields that were written:
diff --git a/src/serialbus/qmodbusserver.h b/src/serialbus/qmodbusserver.h
index 059528a..1c542bd 100644
--- a/src/serialbus/qmodbusserver.h
+++ b/src/serialbus/qmodbusserver.h
@@ -47,17 +47,17 @@
 
 QT_BEGIN_NAMESPACE
 
-class QModbusSlavePrivate;
+class QModbusServerPrivate;
 
-class Q_SERIALBUS_EXPORT QModbusSlave : public QModbusDevice
+class Q_SERIALBUS_EXPORT QModbusServer : public QModbusDevice
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QModbusSlave)
+    Q_DECLARE_PRIVATE(QModbusServer)
 
 public:
 
-    explicit QModbusSlave(QObject *parent = 0);
-    virtual ~QModbusSlave();
+    explicit QModbusServer(QObject *parent = 0);
+    virtual ~QModbusServer();
 
     virtual bool setMap(const QModbusRegister &newRegister) = 0;
 
@@ -73,7 +73,7 @@ Q_SIGNALS:
     void slaveWritten(QModbusRegister::RegisterType table, int address, int size);
 
 protected:
-    QModbusSlave(QModbusSlavePrivate &dd, QObject *parent = Q_NULLPTR);
+    QModbusServer(QModbusServerPrivate &dd, QObject *parent = Q_NULLPTR);
 };
 
 QT_END_NAMESPACE
diff --git a/src/serialbus/qmodbusserver_p.h b/src/serialbus/qmodbusserver_p.h
index b6733f2..e5089db 100644
--- a/src/serialbus/qmodbusserver_p.h
+++ b/src/serialbus/qmodbusserver_p.h
@@ -53,11 +53,11 @@
 
 QT_BEGIN_NAMESPACE
 
-class QModbusSlavePrivate : public QModbusDevicePrivate
+class QModbusServerPrivate : public QModbusDevicePrivate
 {
-    Q_DECLARE_PUBLIC(QModbusSlave)
+    Q_DECLARE_PUBLIC(QModbusServer)
 public:
-    QModbusSlavePrivate()
+    QModbusServerPrivate()
     {
     }
 };
diff --git a/src/serialbus/qmodbustcpclient.cpp b/src/serialbus/qmodbustcpclient.cpp
index 1735630..5ad11a5 100644
--- a/src/serialbus/qmodbustcpclient.cpp
+++ b/src/serialbus/qmodbustcpclient.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
     Constructs a QModbusTcpClient with the specified \a parent.
  */
 QModbusTcpClient::QModbusTcpClient(QObject *parent)
-    : QModbusMaster(*new QModbusTcpClientPrivate, parent)
+    : QModbusClient(*new QModbusTcpClientPrivate, parent)
 {
 }
 
@@ -68,7 +68,7 @@ QModbusTcpClient::~QModbusTcpClient()
     \internal
 */
 QModbusTcpClient::QModbusTcpClient(QModbusTcpClientPrivate &dd, QObject *parent)
-    : QModbusMaster(dd, parent)
+    : QModbusClient(dd, parent)
 {
 }
 
diff --git a/src/serialbus/qmodbustcpclient.h b/src/serialbus/qmodbustcpclient.h
index 40d5ed8..7dee859 100644
--- a/src/serialbus/qmodbustcpclient.h
+++ b/src/serialbus/qmodbustcpclient.h
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 class QModbusTcpClientPrivate;
 
-class Q_SERIALBUS_EXPORT QModbusTcpClient : public QModbusMaster
+class Q_SERIALBUS_EXPORT QModbusTcpClient : public QModbusClient
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QModbusTcpClient)
diff --git a/src/serialbus/qmodbustcpclient_p.h b/src/serialbus/qmodbustcpclient_p.h
index 8ff2fa6..1010cfb 100644
--- a/src/serialbus/qmodbustcpclient_p.h
+++ b/src/serialbus/qmodbustcpclient_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QModbusTcpClientPrivate : public QModbusMasterPrivate
+class QModbusTcpClientPrivate : public QModbusClientPrivate
 {
     Q_DECLARE_PUBLIC(QModbusTcpClient)
 
diff --git a/src/serialbus/qmodbustcpserver.cpp b/src/serialbus/qmodbustcpserver.cpp
index e73a892..27b84a9 100644
--- a/src/serialbus/qmodbustcpserver.cpp
+++ b/src/serialbus/qmodbustcpserver.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
     Constructs a QModbusTcpServer with the specified \a parent.
  */
 QModbusTcpServer::QModbusTcpServer(QObject *parent) :
-    QModbusSlave(*new QModbusTcpServerPrivate, parent)
+    QModbusServer(*new QModbusTcpServerPrivate, parent)
 {
 }
 
@@ -70,7 +70,7 @@ QModbusTcpServer::~QModbusTcpServer()
     \internal
  */
 QModbusTcpServer::QModbusTcpServer(QModbusTcpServerPrivate &dd, QObject *parent) :
-    QModbusSlave(dd, parent)
+    QModbusServer(dd, parent)
 {
 }
 
diff --git a/src/serialbus/qmodbustcpserver.h b/src/serialbus/qmodbustcpserver.h
index c0f9051..5103361 100644
--- a/src/serialbus/qmodbustcpserver.h
+++ b/src/serialbus/qmodbustcpserver.h
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 class QModbusTcpServerPrivate;
 
-class Q_SERIALBUS_EXPORT QModbusTcpServer : public QModbusSlave
+class Q_SERIALBUS_EXPORT QModbusTcpServer : public QModbusServer
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QModbusTcpServer)
diff --git a/src/serialbus/qmodbustcpserver_p.h b/src/serialbus/qmodbustcpserver_p.h
index 639f6dd..b12b6a7 100644
--- a/src/serialbus/qmodbustcpserver_p.h
+++ b/src/serialbus/qmodbustcpserver_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QModbusTcpServerPrivate : public QModbusSlavePrivate
+class QModbusTcpServerPrivate : public QModbusServerPrivate
 {
     Q_DECLARE_PUBLIC(QModbusTcpServer)
 
diff --git a/tests/auto/plugins/genericmodbus/dummymaster.cpp b/tests/auto/plugins/genericmodbus/dummymaster.cpp
index 713f26c..2336d27 100644
--- a/tests/auto/plugins/genericmodbus/dummymaster.cpp
+++ b/tests/auto/plugins/genericmodbus/dummymaster.cpp
@@ -37,7 +37,7 @@
 #include "dummymaster.h"
 
 DummyMaster::DummyMaster(QObject *parent) :
-    QModbusMaster(parent)
+    QModbusClient(parent)
 {
 }
 
diff --git a/tests/auto/plugins/genericmodbus/dummymaster.h b/tests/auto/plugins/genericmodbus/dummymaster.h
index 30920aa..6989605 100644
--- a/tests/auto/plugins/genericmodbus/dummymaster.h
+++ b/tests/auto/plugins/genericmodbus/dummymaster.h
@@ -39,7 +39,7 @@
 
 #include <QtSerialBus/qmodbusclient.h>
 
-class DummyMaster : public QModbusMaster
+class DummyMaster : public QModbusClient
 {
     Q_OBJECT
 public:
diff --git a/tests/auto/plugins/genericmodbus/dummyslave.cpp b/tests/auto/plugins/genericmodbus/dummyslave.cpp
index 67c7848..4ebff45 100644
--- a/tests/auto/plugins/genericmodbus/dummyslave.cpp
+++ b/tests/auto/plugins/genericmodbus/dummyslave.cpp
@@ -39,7 +39,7 @@
 #include <QIODevice>
 
 DummySlave::DummySlave(QObject *parent) :
-    QModbusSlave(parent)
+    QModbusServer(parent)
 {
 }
 
diff --git a/tests/auto/plugins/genericmodbus/dummyslave.h b/tests/auto/plugins/genericmodbus/dummyslave.h
index dd5186f..a415057 100644
--- a/tests/auto/plugins/genericmodbus/dummyslave.h
+++ b/tests/auto/plugins/genericmodbus/dummyslave.h
@@ -41,7 +41,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QIODevice)
 
-class DummySlave : public QModbusSlave
+class DummySlave : public QModbusServer
 {
     Q_OBJECT
 public:
diff --git a/tests/auto/plugins/genericmodbus/main.cpp b/tests/auto/plugins/genericmodbus/main.cpp
index 79a2854..c6b5740 100644
--- a/tests/auto/plugins/genericmodbus/main.cpp
+++ b/tests/auto/plugins/genericmodbus/main.cpp
@@ -53,7 +53,7 @@ class GenericBusPlugin : public QObject, public QModbusFactory
 
 
 public:
-    QModbusSlave *createSlave(QModbusDevice::ModBusConnection type) const
+    QModbusServer *createSlave(QModbusDevice::ModBusConnection type) const
     {
         if (type == QModbusDevice::Serial)
             return new DummySlave();
@@ -64,7 +64,7 @@ public:
         return Q_NULLPTR;
     }
 
-    QModbusMaster *createMaster(QModbusDevice::ModBusConnection type) const
+    QModbusClient *createMaster(QModbusDevice::ModBusConnection type) const
     {
         if (type == QModbusDevice::Serial)
             return new DummyMaster();