Finally rename all remaining slave* occurrences to server*.

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

3 files changed, 16 insertions, 16 deletions

diff --git a/tests/auto/qmodbusadu/tst_qmodbusadu.cpp b/tests/auto/qmodbusadu/tst_qmodbusadu.cpp
index ee17b74..f5b0f7a 100644
--- a/tests/auto/qmodbusadu/tst_qmodbusadu.cpp
+++ b/tests/auto/qmodbusadu/tst_qmodbusadu.cpp
@@ -63,10 +63,10 @@ private slots:
     void testSlaveAddress()
     {
         QModbusSerialAdu adu(QModbusSerialAdu::Ascii, ":f0010300120008f2\r\n");
-        QCOMPARE(adu.slaveAddress(), 240);
+        QCOMPARE(adu.serverAddress(), 240);
 
         adu = QModbusSerialAdu(QModbusSerialAdu::Rtu, QByteArray::fromHex("f00103001200080f1d"));
-        QCOMPARE(adu.slaveAddress(), 240);
+        QCOMPARE(adu.serverAddress(), 240);
     }
 
     void testPdu()
diff --git a/tests/auto/qmodbusreply/tst_qmodbusreply.cpp b/tests/auto/qmodbusreply/tst_qmodbusreply.cpp
index ecdc47a..25fd125 100644
--- a/tests/auto/qmodbusreply/tst_qmodbusreply.cpp
+++ b/tests/auto/qmodbusreply/tst_qmodbusreply.cpp
@@ -54,7 +54,7 @@ private slots:
 void tst_QModbusReply::tst_ctor()
 {
     QModbusReply r(1, this);
-    QCOMPARE(r.slaveAddress(), 1);
+    QCOMPARE(r.serverAddress(), 1);
     QCOMPARE(r.isFinished(), false);
     QCOMPARE(r.result().isValid(), false);
     QCOMPARE(r.protocolError(), QModbusPdu::ExtendedException);
@@ -62,7 +62,7 @@ void tst_QModbusReply::tst_ctor()
     QCOMPARE(r.error(), QModbusReply::NoError);
 
     QModbusReply r2(2, this);
-    QCOMPARE(r2.slaveAddress(), 2);
+    QCOMPARE(r2.serverAddress(), 2);
     QCOMPARE(r2.isFinished(), false);
     QCOMPARE(r2.result().isValid(), false);
     QCOMPARE(r2.protocolError(), QModbusPdu::ExtendedException);
@@ -73,11 +73,11 @@ void tst_QModbusReply::tst_ctor()
 void tst_QModbusReply::tst_setFinished()
 {
     QModbusReply replyTest(1);
-    QCOMPARE(replyTest.slaveAddress(), 1);
+    QCOMPARE(replyTest.serverAddress(), 1);
     QSignalSpy finishedSpy(&replyTest, SIGNAL(finished()));
     QSignalSpy errorSpy(&replyTest, SIGNAL(errorOccurred(QModbusReply::ReplyError)));
 
-    QCOMPARE(replyTest.slaveAddress(), 1);
+    QCOMPARE(replyTest.serverAddress(), 1);
     QCOMPARE(replyTest.isFinished(), false);
     QCOMPARE(replyTest.result().isValid(), false);
     QCOMPARE(replyTest.protocolError(), QModbusPdu::ExtendedException);
@@ -90,7 +90,7 @@ void tst_QModbusReply::tst_setFinished()
     replyTest.setFinished(true);
     QVERIFY(finishedSpy.count() == 1);
     QVERIFY(errorSpy.isEmpty());
-    QCOMPARE(replyTest.slaveAddress(), 1);
+    QCOMPARE(replyTest.serverAddress(), 1);
     QCOMPARE(replyTest.isFinished(), true);
     QCOMPARE(replyTest.result().isValid(), false);
     QCOMPARE(replyTest.protocolError(), QModbusPdu::ExtendedException);
@@ -100,7 +100,7 @@ void tst_QModbusReply::tst_setFinished()
     replyTest.setFinished(false);
     QVERIFY(finishedSpy.count() == 1); // no further singal
     QVERIFY(errorSpy.isEmpty());
-    QCOMPARE(replyTest.slaveAddress(), 1);
+    QCOMPARE(replyTest.serverAddress(), 1);
     QCOMPARE(replyTest.isFinished(), false);
     QCOMPARE(replyTest.result().isValid(), false);
     QCOMPARE(replyTest.protocolError(), QModbusPdu::ExtendedException);
@@ -126,7 +126,7 @@ void tst_QModbusReply::tst_setError()
     QFETCH(QString, errorText);
 
     QModbusReply replyTest(1);
-    QCOMPARE(replyTest.slaveAddress(), 1);
+    QCOMPARE(replyTest.serverAddress(), 1);
     QSignalSpy finishedSpy(&replyTest, SIGNAL(finished()));
     QSignalSpy errorSpy(&replyTest, SIGNAL(errorOccurred(QModbusReply::ReplyError)));
 
@@ -163,7 +163,7 @@ void tst_QModbusReply::tst_setProtocolError()
     QFETCH(QString, errorText);
 
     QModbusReply replyTest(1);
-    QCOMPARE(replyTest.slaveAddress(), 1);
+    QCOMPARE(replyTest.serverAddress(), 1);
     QSignalSpy finishedSpy(&replyTest, SIGNAL(finished()));
     QSignalSpy errorSpy(&replyTest, SIGNAL(errorOccurred(QModbusReply::ReplyError)));
 
@@ -195,7 +195,7 @@ void tst_QModbusReply::tst_setResult()
     QCOMPARE(unit.values(), reference);
 
     QModbusReply replyTest(1);
-    QCOMPARE(replyTest.slaveAddress(), 1);
+    QCOMPARE(replyTest.serverAddress(), 1);
     QSignalSpy finishedSpy(&replyTest, SIGNAL(finished()));
     QSignalSpy errorSpy(&replyTest, SIGNAL(errorOccurred(QModbusReply::ReplyError)));
 
diff --git a/tests/auto/qmodbusserver/tst_qmodbusserver.cpp b/tests/auto/qmodbusserver/tst_qmodbusserver.cpp
index 95d5e97..6ab535f 100644
--- a/tests/auto/qmodbusserver/tst_qmodbusserver.cpp
+++ b/tests/auto/qmodbusserver/tst_qmodbusserver.cpp
@@ -1034,12 +1034,12 @@ private slots:
         }
     }
 
-    void tst_slaveAddress()
+    void tst_serverAddress()
     {
-        server.setSlaveAddress(56);
-        QCOMPARE(server.slaveAddress(), 56);
-        server.setSlaveAddress(1);
-        QCOMPARE(server.slaveAddress(), 1);
+        server.setServerAddress(56);
+        QCOMPARE(server.serverAddress(), 56);
+        server.setServerAddress(1);
+        QCOMPARE(server.serverAddress(), 1);
     }
 
     void tst_diagnosticRegister()