diff options
author | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2015-09-28 17:01:21 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2015-09-28 15:26:01 +0000 |
commit | 2da177b63f7439dbd02d28fc1512765fd5d98027 (patch) | |
tree | e897d1cfe26ffbe85c838d10262b912cb014d5ac /examples/serialbus/modbus/slave | |
parent | 88483560d0c40408e8bc92d2c66f6954b7c9cc8b (diff) |
Rename code|docs, master -> client, slave -> server.
Change-Id: Ic317d9ffbd2f6197558c1f92fe37660b1de5fe76
Reviewed-by: Ralf Nolden <nolden@kde.org>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'examples/serialbus/modbus/slave')
-rw-r--r-- | examples/serialbus/modbus/slave/mainwindow.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/examples/serialbus/modbus/slave/mainwindow.cpp b/examples/serialbus/modbus/slave/mainwindow.cpp index e301f8d..e002476 100644 --- a/examples/serialbus/modbus/slave/mainwindow.cpp +++ b/examples/serialbus/modbus/slave/mainwindow.cpp @@ -78,12 +78,15 @@ void MainWindow::on_connectType_currentIndexChanged(int index) if (type == QModbusDevice::Serial) { modbusDevice = new QModbusSerialSlave(this); } else if (type == QModbusDevice::Tcp) { - modbusDevice = QModbus::instance()->createSlave("libmodbus", type); + modbusDevice = QModbus::instance()->createServer("libmodbus", type); } if (!modbusDevice) { ui->connectButton->setDisabled(true); - ui->errorLabel->setText(tr("Could not create modbus slave.")); + if (type == QModbusDevice::Serial) + ui->errorLabel->setText(tr("Could not create Modbus slave.")); + else + ui->errorLabel->setText(tr("Could not create Modbus server.")); } else { connect(modbusDevice, &QModbusClient::stateChanged, this, &MainWindow::onStateChanged); @@ -103,7 +106,7 @@ void MainWindow::on_connectButton_clicked() modbusDevice->setMap(reg); - connect(modbusDevice, &QModbusServer::slaveWritten, + connect(modbusDevice, &QModbusServer::dataWritten, this, &MainWindow::updateWidgets); connect(modbusDevice, &QModbusServer::stateChanged, this, &MainWindow::onStateChanged); |