QCanBus: Changed createDevice() API to use only QString

The old implementation used QByteArray and QString,
and it could be hard to remember which type belongs where.

For completeness, plugins() now returns QStringList instead
of QList<QByteArray>.

[ChangeLog][QCanBus] Changed the signature of createDevice()
to use only QString parameters. Further, plugins() now returns
a QStringList.

Task-number: QTBUG-53642
Change-Id: Ief5ed9c87fba36744d6b96483095fab26e0d332c
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

5 files changed, 14 insertions, 12 deletions

diff --git a/examples/serialbus/can/connectdialog.cpp b/examples/serialbus/can/connectdialog.cpp
index 7495832..cdf3cc5 100644
--- a/examples/serialbus/can/connectdialog.cpp
+++ b/examples/serialbus/can/connectdialog.cpp
@@ -223,7 +223,7 @@ void ConnectDialog::updateSettings()
 
 void ConnectDialog::fillBackends()
 {
-    foreach (const QByteArray &backend, QCanBus::instance()->plugins())
+    foreach (const QString &backend, QCanBus::instance()->plugins())
         m_ui->backendListBox->addItem(backend);
 }
 
diff --git a/src/serialbus/qcanbus.cpp b/src/serialbus/qcanbus.cpp
index 4fa7520..2d3940e 100644
--- a/src/serialbus/qcanbus.cpp
+++ b/src/serialbus/qcanbus.cpp
@@ -64,7 +64,7 @@ public:
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, qFactoryLoader,
     (QCanBusFactory_iid, QLatin1String("/canbus")))
 
-typedef QMap<QByteArray, QCanBusPrivate> QCanBusPluginStore;
+typedef QMap<QString, QCanBusPrivate> QCanBusPluginStore;
 Q_GLOBAL_STATIC(QCanBusPluginStore, qCanBusPlugins)
 
 static QCanBus *globalInstance = nullptr;
@@ -80,8 +80,7 @@ static void loadPlugins()
         QCanBusPrivate d;
         d.index = i;
         d.meta = obj;
-        qCanBusPlugins()->insert(
-                    obj.value(QStringLiteral("Key")).toString().toLatin1(), d);
+        qCanBusPlugins()->insert(obj.value(QStringLiteral("Key")).toString(), d);
     }
 }
 
@@ -108,22 +107,25 @@ QCanBus *QCanBus::instance()
 }
 
 /*!
+    \since 5.8
+
     Returns a list of identifiers for all loaded plugins.
 */
-QList<QByteArray> QCanBus::plugins() const
+QStringList QCanBus::plugins() const
 {
     return qCanBusPlugins()->keys();
 }
 
 /*!
+    \since 5.8
+
     Creates a CAN bus device. \a plugin is the name of the plugin as returned by the \l plugins()
     method. \a interfaceName is the CAN bus interface name.
 
     Ownership of the returned backend is transferred to the caller.
     Returns \c null if no suitable device can be found.
 */
-QCanBusDevice *QCanBus::createDevice(const QByteArray &plugin,
-                                     const QString &interfaceName) const
+QCanBusDevice *QCanBus::createDevice(const QString &plugin, const QString &interfaceName) const
 {
     if (!qCanBusPlugins()->contains(plugin))
         return nullptr;
diff --git a/src/serialbus/qcanbus.h b/src/serialbus/qcanbus.h
index 97bf35e..6adf2b4 100644
--- a/src/serialbus/qcanbus.h
+++ b/src/serialbus/qcanbus.h
@@ -51,9 +51,9 @@ class Q_SERIALBUS_EXPORT QCanBus : public QObject
 
 public:
     static QCanBus *instance();
-    QList<QByteArray> plugins() const;
+    QStringList plugins() const;
 
-    QCanBusDevice *createDevice(const QByteArray &plugin,
+    QCanBusDevice *createDevice(const QString &plugin,
                                 const QString &interfaceName) const;
 
 private:
diff --git a/src/tools/canbusutil/canbusutil.cpp b/src/tools/canbusutil/canbusutil.cpp
index 8f70f07..4fc2912 100644
--- a/src/tools/canbusutil/canbusutil.cpp
+++ b/src/tools/canbusutil/canbusutil.cpp
@@ -89,7 +89,7 @@ void CanBusUtil::printUsage()
 
 void CanBusUtil::printPlugins()
 {
-    QList<QByteArray> plugins = canBus->plugins();
+    const QStringList plugins = canBus->plugins();
     output << "Plugins: " << endl;
     for (int i = 0; i < plugins.size(); i++)
         output << plugins.at(i) << endl;
@@ -223,7 +223,7 @@ bool CanBusUtil::parsePayloadField(QString payload, bool &rtrFrame,
 bool CanBusUtil::connectCanDevice()
 {
     bool foundPlugin = false;
-    QList<QByteArray> plugins = canBus->plugins();
+    const QStringList plugins = canBus->plugins();
     for (int i = 0; i < plugins.size(); i++)
     {
         if (plugins.at(i) == pluginName) {
diff --git a/tests/auto/qcanbus/tst_qcanbus.cpp b/tests/auto/qcanbus/tst_qcanbus.cpp
index b549f09..08047e8 100644
--- a/tests/auto/qcanbus/tst_qcanbus.cpp
+++ b/tests/auto/qcanbus/tst_qcanbus.cpp
@@ -77,7 +77,7 @@ void tst_QCanBus::initTestCase()
 
 void tst_QCanBus::plugins()
 {
-    QList<QByteArray> pluginList = bus->plugins();
+    const QStringList pluginList = bus->plugins();
     QVERIFY(!pluginList.isEmpty());
     QVERIFY(pluginList.contains("generic"));