diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2017-07-06 20:19:35 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-07-10 19:28:52 +0000 |
| commit | fee04e6eb05386f391207c36a0444a158d21d909 (patch) | |
| tree | 2d5733dfbdcfd291b4d206eef0be4544b613a229 | |
| parent | 6234d0d3b3516594382db9197c2369a6f84d5c4d (diff) | |
CAN-Example: Inline very short function
Change-Id: Iccbf9091d138cedacc74b043db5f83b686b7c27e
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | examples/serialbus/can/mainwindow.cpp | 15 | ||||
| -rw-r--r-- | examples/serialbus/can/mainwindow.h | 1 |
2 files changed, 5 insertions, 11 deletions
diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp index dec1dae..7a8f78a 100644 --- a/examples/serialbus/can/mainwindow.cpp +++ b/examples/serialbus/can/mainwindow.cpp @@ -72,11 +72,6 @@ MainWindow::~MainWindow() delete m_ui; } -void MainWindow::showStatusMessage(const QString &message) -{ - m_status->setText(message); -} - void MainWindow::initActionsConnections() { m_ui->actionDisconnect->setEnabled(false); @@ -116,7 +111,7 @@ void MainWindow::connectDevice() m_canDevice = QCanBus::instance()->createDevice(p.pluginName, p.deviceInterfaceName, &errorString); if (!m_canDevice) { - showStatusMessage(tr("Error creating device '%1', reason: '%2'") + m_status->setText(tr("Error creating device '%1', reason: '%2'") .arg(p.pluginName).arg(errorString)); return; } @@ -134,7 +129,7 @@ void MainWindow::connectDevice() } if (!m_canDevice->connectDevice()) { - showStatusMessage(tr("Connection error: %1").arg(m_canDevice->errorString())); + m_status->setText(tr("Connection error: %1").arg(m_canDevice->errorString())); delete m_canDevice; m_canDevice = nullptr; @@ -146,11 +141,11 @@ void MainWindow::connectDevice() QVariant bitRate = m_canDevice->configurationParameter(QCanBusDevice::BitRateKey); if (bitRate.isValid()) { - showStatusMessage(tr("Plugin: %1, connected to %2 at %3 kBit/s") + m_status->setText(tr("Plugin: %1, connected to %2 at %3 kBit/s") .arg(p.pluginName).arg(p.deviceInterfaceName) .arg(bitRate.toInt() / 1000)); } else { - showStatusMessage(tr("Plugin: %1, connected to %2") + m_status->setText(tr("Plugin: %1, connected to %2") .arg(p.pluginName).arg(p.deviceInterfaceName)); } } @@ -170,7 +165,7 @@ void MainWindow::disconnectDevice() m_ui->sendMessagesBox->setEnabled(false); - showStatusMessage(tr("Disconnected")); + m_status->setText(tr("Disconnected")); } void MainWindow::framesWritten(qint64 count) diff --git a/examples/serialbus/can/mainwindow.h b/examples/serialbus/can/mainwindow.h index 7e9a4ff..8cd53a9 100644 --- a/examples/serialbus/can/mainwindow.h +++ b/examples/serialbus/can/mainwindow.h @@ -78,7 +78,6 @@ protected: void closeEvent(QCloseEvent *event) override; private: - void showStatusMessage(const QString &message); void initActionsConnections(); Ui::MainWindow *m_ui = nullptr; |