Adding missing meta types registrations

fpoussin · Aug 31, 2020 · e9652f8 · e9652f8
1 parent 34d9203
commit e9652f8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/usb/qusbdevice.cpp b/src/usb/qusbdevice.cpp
@@ -212,6 +212,8 @@ QUsbDevice::QUsbDevice(QObject *parent)
     m_status = statusOK;
     this->setLogLevel(m_log_level); // Apply log level to libusb
 
+    qRegisterMetaType<QUsbDevice::DeviceStatus>("QUsbDevice::DeviceStatus");
+
     Q_D(QUsbDevice);
     if (libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG) != 0) {
 

diff --git a/src/usb/qusbdevice.h b/src/usb/qusbdevice.h
@@ -134,7 +134,7 @@ class Q_USB_EXPORT QUsbDevice : public QObject
 private:
     void handleUsbError(int error_code);
 
-signals:
+Q_SIGNALS:
     void statusChanged(QUsbDevice::DeviceStatus status);
     void connectionChanged(bool connected);
 

diff --git a/src/usb/qusbendpoint.cpp b/src/usb/qusbendpoint.cpp
@@ -428,8 +428,11 @@ QUsbEndpoint::QUsbEndpoint(QUsbDevice *dev, QUsbEndpoint::Type type, quint8 ep)
     : QIODevice(*(new QUsbEndpointPrivate)), d_dummy(Q_NULLPTR), m_status(QUsbEndpoint::transferCanceled), m_dev(dev), m_type(type), m_ep(ep)
 {
     Q_CHECK_PTR(dev);
+    qRegisterMetaType<QUsbEndpoint::Status>("QUsbEndpoint::Status");
+
     Q_D(QUsbEndpoint);
     DbgPrintFuncName();
+
     setParent(dev);
 }
 

diff --git a/src/usb/qusbinfo.cpp b/src/usb/qusbinfo.cpp
@@ -121,10 +121,10 @@ QUsbInfo::QUsbInfo(QObject *parent)
     DbgPrintFuncName();
     int rc;
 
-    qRegisterMetaType<QUsbDevice::Id>("QUsbDevice::DeviceFilter");
-    qRegisterMetaType<QUsbDevice::Config>("QUsbDevice::DeviceConfig");
+    qRegisterMetaType<QUsbDevice::Id>("QUsbDevice::Id");
+    qRegisterMetaType<QUsbDevice::Config>("QUsbDevice::Config");
 
-    qRegisterMetaType<QUsbDevice::IdList>("QUsbDevice::FilterList");
+    qRegisterMetaType<QUsbDevice::IdList>("QUsbDevice::IdList");
     qRegisterMetaType<QUsbDevice::ConfigList>("QUsbDevice::ConfigList");
 
     rc = libusb_init(&d->m_ctx);