Merge remote-tracking branch 'gerrit/5.8' into dev

Change-Id: I99abea2d39afbc095e9d7cb661507937b450fdf4

2 files changed, 18 insertions, 29 deletions

diff --git a/src/plugins/canbus/peakcan/peakcan_symbols_p.h b/src/plugins/canbus/peakcan/peakcan_symbols_p.h
index cb90599..456be17 100644
--- a/src/plugins/canbus/peakcan/peakcan_symbols_p.h
+++ b/src/plugins/canbus/peakcan/peakcan_symbols_p.h
@@ -258,7 +258,7 @@ typedef struct tagTPCANTimestamp
     static fp_##symbolName symbolName;
 
 #define RESOLVE_SYMBOL(symbolName) \
-    symbolName = (fp_##symbolName)resolveSymbol(pcanLibrary, #symbolName); \
+    symbolName = (fp_##symbolName)pcanLibrary->resolve(#symbolName); \
     if (!symbolName) \
         return false;
 
@@ -273,23 +273,12 @@ GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_GetValue, TPCANHandle, TPCANParameter,
 GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_SetValue, TPCANHandle, TPCANParameter, void *, quint32)
 GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_GetErrorText, TPCANStatus, quint16, char *)
 
-inline QFunctionPointer resolveSymbol(QLibrary *pcanLibrary, const char *symbolName)
-{
-    QFunctionPointer symbolFunctionPointer = pcanLibrary->resolve(symbolName);
-    if (!symbolFunctionPointer)
-        qWarning("Failed to resolve the pcanbasic symbol: %s", symbolName);
-
-    return symbolFunctionPointer;
-}
-
 inline bool resolveSymbols(QLibrary *pcanLibrary)
 {
     if (!pcanLibrary->isLoaded()) {
         pcanLibrary->setFileName(QStringLiteral("pcanbasic"));
-        if (!pcanLibrary->load()) {
-            qWarning("Failed to load the library: %s", qPrintable(pcanLibrary->fileName()));
+        if (!pcanLibrary->load())
             return false;
-        }
     }
 
     RESOLVE_SYMBOL(CAN_Initialize)
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp
index 06a2d4b..eb2d4b9 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.cpp
+++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp
@@ -288,37 +288,37 @@ bool PeakCanBackendPrivate::setConfigurationParameter(int key, const QVariant &v
 
 static int channelIndexFromName(const QString &interfaceName)
 {
-    if (interfaceName == QStringLiteral("usbbus1"))
+    if (interfaceName == QStringLiteral("usb0"))
         return PCAN_USBBUS1;
-    else if (interfaceName == QStringLiteral("usbbus2"))
+    else if (interfaceName == QStringLiteral("usb1"))
         return PCAN_USBBUS2;
-    else if (interfaceName == QStringLiteral("usbbus3"))
+    else if (interfaceName == QStringLiteral("usb2"))
         return PCAN_USBBUS3;
-    else if (interfaceName == QStringLiteral("usbbus4"))
+    else if (interfaceName == QStringLiteral("usb3"))
         return PCAN_USBBUS4;
-    else if (interfaceName == QStringLiteral("usbbus5"))
+    else if (interfaceName == QStringLiteral("usb4"))
         return PCAN_USBBUS5;
-    else if (interfaceName == QStringLiteral("usbbus6"))
+    else if (interfaceName == QStringLiteral("usb5"))
         return PCAN_USBBUS6;
-    else if (interfaceName == QStringLiteral("usbbus7"))
+    else if (interfaceName == QStringLiteral("usb6"))
         return PCAN_USBBUS7;
-    else if (interfaceName == QStringLiteral("usbbus8"))
+    else if (interfaceName == QStringLiteral("usb7"))
         return PCAN_USBBUS8;
-    else if (interfaceName == QStringLiteral("pcibus1"))
+    else if (interfaceName == QStringLiteral("pci0"))
         return PCAN_PCIBUS1;
-    else if (interfaceName == QStringLiteral("pcibus2"))
+    else if (interfaceName == QStringLiteral("pci1"))
         return PCAN_PCIBUS2;
-    else if (interfaceName == QStringLiteral("pcibus3"))
+    else if (interfaceName == QStringLiteral("pci2"))
         return PCAN_PCIBUS3;
-    else if (interfaceName == QStringLiteral("pcibus4"))
+    else if (interfaceName == QStringLiteral("pci3"))
         return PCAN_PCIBUS4;
-    else if (interfaceName == QStringLiteral("pcibus5"))
+    else if (interfaceName == QStringLiteral("pci4"))
         return PCAN_PCIBUS5;
-    else if (interfaceName == QStringLiteral("pcibus6"))
+    else if (interfaceName == QStringLiteral("pci5"))
         return PCAN_PCIBUS6;
-    else if (interfaceName == QStringLiteral("pcibus7"))
+    else if (interfaceName == QStringLiteral("pci6"))
         return PCAN_PCIBUS7;
-    else if (interfaceName == QStringLiteral("pcibus8"))
+    else if (interfaceName == QStringLiteral("pci7"))
         return PCAN_PCIBUS8;
     else // TODO: Add other indexes here
         return PCAN_NONEBUS;