summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2017-07-04 18:02:25 +0200
committerAndré Hartmann <aha_1980@gmx.de>2017-07-10 19:12:29 +0000
commit6234d0d3b3516594382db9197c2369a6f84d5c4d (patch)
tree7bf56e037f12fd5ddc1a4bb3fea1cfaaeebe48d4
parent25325b9ad1416119a69fca02ba331544ca4956a6 (diff)
CAN-Example: Rename all occurrences of "backend" to "plugin"
The first parameter of QCanBus::createDevice() is called "plugin", so use this term in our examples to avoid confusion. Change-Id: I2fc28731d3763e037c18a7030205dad5d54183cd 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/connectdialog.cpp14
-rw-r--r--examples/serialbus/can/connectdialog.h4
-rw-r--r--examples/serialbus/can/connectdialog.ui6
-rw-r--r--examples/serialbus/can/mainwindow.cpp12
4 files changed, 18 insertions, 18 deletions
diff --git a/examples/serialbus/can/connectdialog.cpp b/examples/serialbus/can/connectdialog.cpp
index e8088e3..326dcac 100644
--- a/examples/serialbus/can/connectdialog.cpp
+++ b/examples/serialbus/can/connectdialog.cpp
@@ -68,14 +68,14 @@ ConnectDialog::ConnectDialog(QWidget *parent) :
connect(m_ui->cancelButton, &QPushButton::clicked, this, &ConnectDialog::cancel);
connect(m_ui->useConfigurationBox, &QCheckBox::clicked,
m_ui->configurationBox, &QGroupBox::setEnabled);
- connect(m_ui->backendListBox, &QComboBox::currentTextChanged,
- this, &ConnectDialog::backendChanged);
+ connect(m_ui->pluginListBox, &QComboBox::currentTextChanged,
+ this, &ConnectDialog::pluginChanged);
connect(m_ui->interfaceListBox, &QComboBox::currentTextChanged,
this, &ConnectDialog::interfaceChanged);
m_ui->rawFilterEdit->hide();
m_ui->rawFilterLabel->hide();
- m_ui->backendListBox->addItems(QCanBus::instance()->plugins());
+ m_ui->pluginListBox->addItems(QCanBus::instance()->plugins());
updateSettings();
}
@@ -90,10 +90,10 @@ ConnectDialog::Settings ConnectDialog::settings() const
return m_currentSettings;
}
-void ConnectDialog::backendChanged(const QString &backend)
+void ConnectDialog::pluginChanged(const QString &plugin)
{
m_ui->interfaceListBox->clear();
- m_interfaces = QCanBus::instance()->availableDevices(backend);
+ m_interfaces = QCanBus::instance()->availableDevices(plugin);
for (const QCanBusDeviceInfo &info : qAsConst(m_interfaces))
m_ui->interfaceListBox->addItem(info.name());
}
@@ -146,7 +146,7 @@ QString ConnectDialog::configurationValue(QCanBusDevice::ConfigurationKey key)
void ConnectDialog::revertSettings()
{
- m_ui->backendListBox->setCurrentText(m_currentSettings.backendName);
+ m_ui->pluginListBox->setCurrentText(m_currentSettings.pluginName);
m_ui->interfaceListBox->setCurrentText(m_currentSettings.deviceInterfaceName);
m_ui->useConfigurationBox->setChecked(m_currentSettings.useConfigurationEnabled);
@@ -171,7 +171,7 @@ void ConnectDialog::revertSettings()
void ConnectDialog::updateSettings()
{
- m_currentSettings.backendName = m_ui->backendListBox->currentText();
+ m_currentSettings.pluginName = m_ui->pluginListBox->currentText();
m_currentSettings.deviceInterfaceName = m_ui->interfaceListBox->currentText();
m_currentSettings.useConfigurationEnabled = m_ui->useConfigurationBox->isChecked();
diff --git a/examples/serialbus/can/connectdialog.h b/examples/serialbus/can/connectdialog.h
index ba90ba6..4e3e2c6 100644
--- a/examples/serialbus/can/connectdialog.h
+++ b/examples/serialbus/can/connectdialog.h
@@ -62,7 +62,7 @@ public:
typedef QPair<QCanBusDevice::ConfigurationKey, QVariant> ConfigurationItem;
struct Settings {
- QString backendName;
+ QString pluginName;
QString deviceInterfaceName;
QList<ConfigurationItem> configurations;
bool useConfigurationEnabled = false;
@@ -74,7 +74,7 @@ public:
Settings settings() const;
private slots:
- void backendChanged(const QString &backend);
+ void pluginChanged(const QString &plugin);
void interfaceChanged(const QString &interface);
void ok();
void cancel();
diff --git a/examples/serialbus/can/connectdialog.ui b/examples/serialbus/can/connectdialog.ui
index aad6bef..def6e59 100644
--- a/examples/serialbus/can/connectdialog.ui
+++ b/examples/serialbus/can/connectdialog.ui
@@ -55,13 +55,13 @@
</layout>
</item>
<item row="0" column="0">
- <widget class="QGroupBox" name="selectBackendBox">
+ <widget class="QGroupBox" name="selectPluginBox">
<property name="title">
- <string>Select CAN backend</string>
+ <string>Select CAN plugin</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
- <widget class="QComboBox" name="backendListBox"/>
+ <widget class="QComboBox" name="pluginListBox"/>
</item>
</layout>
</widget>
diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp
index 8754947..dec1dae 100644
--- a/examples/serialbus/can/mainwindow.cpp
+++ b/examples/serialbus/can/mainwindow.cpp
@@ -113,11 +113,11 @@ void MainWindow::connectDevice()
const ConnectDialog::Settings p = m_connectDialog->settings();
QString errorString;
- m_canDevice = QCanBus::instance()->createDevice(p.backendName, p.deviceInterfaceName,
+ m_canDevice = QCanBus::instance()->createDevice(p.pluginName, p.deviceInterfaceName,
&errorString);
if (!m_canDevice) {
showStatusMessage(tr("Error creating device '%1', reason: '%2'")
- .arg(p.backendName).arg(errorString));
+ .arg(p.pluginName).arg(errorString));
return;
}
@@ -146,12 +146,12 @@ void MainWindow::connectDevice()
QVariant bitRate = m_canDevice->configurationParameter(QCanBusDevice::BitRateKey);
if (bitRate.isValid()) {
- showStatusMessage(tr("Backend: %1, connected to %2 at %3 kBit/s")
- .arg(p.backendName).arg(p.deviceInterfaceName)
+ showStatusMessage(tr("Plugin: %1, connected to %2 at %3 kBit/s")
+ .arg(p.pluginName).arg(p.deviceInterfaceName)
.arg(bitRate.toInt() / 1000));
} else {
- showStatusMessage(tr("Backend: %1, connected to %2")
- .arg(p.backendName).arg(p.deviceInterfaceName));
+ showStatusMessage(tr("Plugin: %1, connected to %2")
+ .arg(p.pluginName).arg(p.deviceInterfaceName));
}
}
}