summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2022-10-11 13:37:04 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-10-12 07:29:12 +0000
commite0624bd3ae33fdbf2f13651060b6f4b7e149f6a6 (patch)
tree9f9dddb71a68c3af923f58a56980c9409f06c1b3
parenta9f228dc1ca32b45e49121678cd6d32cfaf51cd1 (diff)
Brush up the CAN example
- Fix the documentation URL - Fix clazy warnings about multi-arg Change-Id: I86589b8b57c467624ba78e81b4d099834460149d Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> (cherry picked from commit 11a33d1140acf42fdca01f42c0c4ed01e2c5ee07) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/serialbus/can/mainwindow.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp
index 298d80a..c9aef31 100644
--- a/examples/serialbus/can/mainwindow.cpp
+++ b/examples/serialbus/can/mainwindow.cpp
@@ -117,7 +117,7 @@ void MainWindow::initActionsConnections()
connect(m_ui->actionAboutQt, &QAction::triggered, qApp, &QApplication::aboutQt);
connect(m_ui->actionClearLog, &QAction::triggered, m_model, &ReceivedFramesModel::clear);
connect(m_ui->actionPluginDocumentation, &QAction::triggered, this, []() {
- QDesktopServices::openUrl(QUrl("http://doc.qt.io/qt-5/qtcanbus-backends.html#can-bus-plugins"));
+ QDesktopServices::openUrl(QUrl("http://doc.qt.io/qt-6/qtcanbus-backends.html#can-bus-plugins"));
});
}
@@ -150,7 +150,7 @@ void MainWindow::connectDevice()
&errorString));
if (!m_canDevice) {
m_status->setText(tr("Error creating device '%1', reason: '%2'")
- .arg(p.pluginName).arg(errorString));
+ .arg(p.pluginName, errorString));
return;
}
@@ -186,16 +186,16 @@ void MainWindow::connectDevice()
m_canDevice->configurationParameter(QCanBusDevice::DataBitRateKey);
if (isCanFd && dataBitRate.isValid()) {
m_status->setText(tr("Plugin: %1, connected to %2 at %3 / %4 kBit/s")
- .arg(p.pluginName).arg(p.deviceInterfaceName)
+ .arg(p.pluginName, p.deviceInterfaceName)
.arg(bitRate.toInt() / 1000).arg(dataBitRate.toInt() / 1000));
} else {
m_status->setText(tr("Plugin: %1, connected to %2 at %3 kBit/s")
- .arg(p.pluginName).arg(p.deviceInterfaceName)
+ .arg(p.pluginName, p.deviceInterfaceName)
.arg(bitRate.toInt() / 1000));
}
} else {
m_status->setText(tr("Plugin: %1, connected to %2")
- .arg(p.pluginName).arg(p.deviceInterfaceName));
+ .arg(p.pluginName, p.deviceInterfaceName));
}
if (m_canDevice->hasBusStatus())