diff options
author | Andre Hartmann <aha_1980@gmx.de> | 2021-07-21 20:07:30 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-23 08:27:37 +0000 |
commit | 84dd0c9dc17ec0a10b6746f641f7677ba3b3d11f (patch) | |
tree | 16ab2cfc718769422943e526902a56a2c2c79fb9 | |
parent | 9fcf3ea8c62eda1ba4b7c17da1a640756c89c56a (diff) |
QCanBusDevice: Consolidate createDeviceInfo()
This protected function is used from the CAN
plugins to create QCanBusDeviceInfo objects.
We want to add another parameter (plugin) to the
function in a follow-up commit, so let's first
remove unneeded overloads that were created during
Qt 5 times and only keep the very simple and the
all-embracing one.
While at it, remove the std::move calls as clang
gives performance warnings here:
socketcanbackend.cpp:149:23: error:
moving a temporary object prevents copy elision
socketcanbackend.cpp:149:23: note:
remove std::move call here
Change-Id: Ie83db3cd3a9d6b40b2da4a9ce736861a0ee8359f
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 98691947d1aa6fb3ab63c7b749bc6407fa01be8a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/plugins/canbus/passthrucan/passthrucanbackend.cpp | 2 | ||||
-rw-r--r-- | src/plugins/canbus/peakcan/peakcanbackend.cpp | 10 | ||||
-rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 6 | ||||
-rw-r--r-- | src/plugins/canbus/systeccan/systeccanbackend.cpp | 11 | ||||
-rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.cpp | 2 | ||||
-rw-r--r-- | src/plugins/canbus/vectorcan/vectorcanbackend.cpp | 4 | ||||
-rw-r--r-- | src/plugins/canbus/virtualcan/virtualcanbackend.cpp | 8 | ||||
-rw-r--r-- | src/serialbus/qcanbusdevice.cpp | 15 | ||||
-rw-r--r-- | src/serialbus/qcanbusdevice.h | 7 |
9 files changed, 24 insertions, 41 deletions
diff --git a/src/plugins/canbus/passthrucan/passthrucanbackend.cpp b/src/plugins/canbus/passthrucan/passthrucanbackend.cpp index f7ef6e3..3d1e817 100644 --- a/src/plugins/canbus/passthrucan/passthrucanbackend.cpp +++ b/src/plugins/canbus/passthrucan/passthrucanbackend.cpp @@ -177,7 +177,7 @@ QList<QCanBusDeviceInfo> PassThruCanBackend::interfaces() const QString name = canAdapterName(entries); if (!name.isEmpty()) - list.append(createDeviceInfo(name)); + list.append(createDeviceInfo(name, false, false)); entries.endGroup(); } diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp index aabfead..b725702 100644 --- a/src/plugins/canbus/peakcan/peakcanbackend.cpp +++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp @@ -161,9 +161,9 @@ QList<QCanBusDeviceInfo> PeakCanBackend::interfacesByChannelCondition() if (idStat == PCAN_ERROR_OK) alias = QString::number(deviceId); - result.append(std::move(createDeviceInfo(QLatin1String(pcanChannels[i].name), - QString(), QLatin1String(description), - alias, channel, false, isFd))); + result.append(createDeviceInfo(QLatin1String(pcanChannels[i].name), + QString(), QLatin1String(description), + alias, channel, false, isFd)); } } @@ -208,8 +208,8 @@ QList<QCanBusDeviceInfo> PeakCanBackend::interfacesByAttachedChannels(bool *ok) const int channel = info.controller_number; const bool isCanFd = (info.device_features & FEATURE_FD_CAPABLE); - result.append(std::move(createDeviceInfo(name, QString(), description, alias, - channel, false, isCanFd))); + result.append(createDeviceInfo(name, QString(), description, alias, + channel, false, isCanFd)); } } diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index 134596d..69dce97 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -146,9 +146,9 @@ QList<QCanBusDeviceInfo> SocketCanBackend::interfaces() const QString serial; const QString description = deviceDescription(deviceName); const int channel = deviceChannel(deviceName); - result.append(std::move(createDeviceInfo(deviceName, serial, description, - channel, isVirtual(deviceName), - isFlexibleDataRateCapable(deviceName)))); + result.append(createDeviceInfo(deviceName, serial, description, + QString(), channel, isVirtual(deviceName), + isFlexibleDataRateCapable(deviceName))); } std::sort(result.begin(), result.end(), diff --git a/src/plugins/canbus/systeccan/systeccanbackend.cpp b/src/plugins/canbus/systeccan/systeccanbackend.cpp index c5d8951..4daf48d 100644 --- a/src/plugins/canbus/systeccan/systeccanbackend.cpp +++ b/src/plugins/canbus/systeccan/systeccanbackend.cpp @@ -69,7 +69,8 @@ QCanBusDeviceInfo SystecCanBackend::createDeviceInfo(const QString &serialNumber int channelNumber) { const QString name = QString::fromLatin1("can%1.%2").arg(deviceNumber).arg(channelNumber); - return QCanBusDevice::createDeviceInfo(name, serialNumber, description, channelNumber, false, false); + return QCanBusDevice::createDeviceInfo(name, serialNumber, description, + QString(), channelNumber, false, false); } static QString descriptionString(uint productCode) @@ -100,11 +101,11 @@ static void DRV_CALLBACK_TYPE ucanEnumCallback(DWORD index, BOOL isUsed, const QString serialNumber = QString::number(hardwareInfo->m_dwSerialNr); const QString description = descriptionString(hardwareInfo->m_dwProductCode); - result->append(std::move(SystecCanBackend::createDeviceInfo(serialNumber, description, - hardwareInfo->m_bDeviceNr, 0))); + result->append(SystecCanBackend::createDeviceInfo(serialNumber, description, + hardwareInfo->m_bDeviceNr, 0)); if (USBCAN_CHECK_SUPPORT_TWO_CHANNEL(hardwareInfo)) { - result->append(std::move(SystecCanBackend::createDeviceInfo(serialNumber, description, - hardwareInfo->m_bDeviceNr, 1))); + result->append(SystecCanBackend::createDeviceInfo(serialNumber, description, + hardwareInfo->m_bDeviceNr, 1)); } initInfo->m_fTryNext = true; // continue enumerating with next device diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp index 4bd5a6a..3ace53d 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.cpp +++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp @@ -74,7 +74,7 @@ bool TinyCanBackend::canCreate(QString *errorReason) QList<QCanBusDeviceInfo> TinyCanBackend::interfaces() { QList<QCanBusDeviceInfo> result; - result.append(createDeviceInfo(QStringLiteral("can0.0"))); + result.append(createDeviceInfo(QStringLiteral("can0.0"), false, false)); return result; } diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp index db957cd..1300a27 100644 --- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp +++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp @@ -93,8 +93,8 @@ QList<QCanBusDeviceInfo> VectorCanBackend::interfaces() const QString name = QStringLiteral("can") + QString::number(i); const QString serial = QString::number(config.channel[i].serialNumber); const QString description = QLatin1String(config.channel[i].name); - result.append(std::move(createDeviceInfo(name, serial, description, channel, - isVirtual, isFd))); + result.append(createDeviceInfo(name, serial, description, QString(), + channel, isVirtual, isFd)); } VectorCanBackendPrivate::cleanupDriver(); diff --git a/src/plugins/canbus/virtualcan/virtualcanbackend.cpp b/src/plugins/canbus/virtualcan/virtualcanbackend.cpp index 351d177..5a7403b 100644 --- a/src/plugins/canbus/virtualcan/virtualcanbackend.cpp +++ b/src/plugins/canbus/virtualcan/virtualcanbackend.cpp @@ -305,10 +305,10 @@ QList<QCanBusDeviceInfo> VirtualCanBackend::interfaces() QList<QCanBusDeviceInfo> result; for (int channel = 0; channel < VirtualChannels; ++channel) { - result.append(std::move(createDeviceInfo( - QStringLiteral("can%1").arg(channel), QString(), - QStringLiteral("Qt Virtual CAN bus"), channel, - true, true))); + result.append(createDeviceInfo( + QStringLiteral("can%1").arg(channel), QString(), + QStringLiteral("Qt Virtual CAN bus"), QString(), + channel, true, true)); } return result; diff --git a/src/serialbus/qcanbusdevice.cpp b/src/serialbus/qcanbusdevice.cpp index 671896f..cb55c1a 100644 --- a/src/serialbus/qcanbusdevice.cpp +++ b/src/serialbus/qcanbusdevice.cpp @@ -958,21 +958,6 @@ QCanBusDeviceInfo QCanBusDevice::createDeviceInfo(const QString &name, bool isVi } /*! - \since 5.11 - Returns a QCanBusDeviceInfo created from the given parameters \a name, - \a serialNumber, \a description, \a channel, \a isVirtual, and \a - isFlexibleDataRateCapable. - \internal - */ -QCanBusDeviceInfo QCanBusDevice::createDeviceInfo(const QString &name, const QString &serialNumber, - const QString &description, int channel, - bool isVirtual, bool isFlexibleDataRateCapable) -{ - return createDeviceInfo(name, serialNumber, description, QString(), - channel, isVirtual, isFlexibleDataRateCapable); -} - -/*! \since 6.0 Returns a QCanBusDeviceInfo created from the given parameters \a name, \a serialNumber, \a description, \a alias, \a channel, \a isVirtual, diff --git a/src/serialbus/qcanbusdevice.h b/src/serialbus/qcanbusdevice.h index caef792..fed4fdf 100644 --- a/src/serialbus/qcanbusdevice.h +++ b/src/serialbus/qcanbusdevice.h @@ -182,11 +182,8 @@ protected: virtual void close() = 0; static QCanBusDeviceInfo createDeviceInfo(const QString &name, - bool isVirtual = false, - bool isFlexibleDataRateCapable = false); - static QCanBusDeviceInfo createDeviceInfo(const QString &name, const QString &serialNumber, - const QString &description, int channel, - bool isVirtual, bool isFlexibleDataRateCapable); + bool isVirtual, + bool isFlexibleDataRateCapable); static QCanBusDeviceInfo createDeviceInfo(const QString &name, const QString &serialNumber, const QString &description, const QString &alias, int channel, |