Merge pull request #15 from Holzhaus/bulk-controller-fix

controllers/bulk: Fix BulkController constructor
ferranpujolcamins · Apr 12, 2020 · 97d5623 · 97d5623
2 parents cfc4142 + e122b79
commit 97d5623
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp
@@ -69,11 +69,11 @@ static QString get_string(libusb_device_handle *handle, u_int8_t id) {
     return QString::fromLatin1((char*)buf);
 }
 
-BulkController::BulkController(UserSettingsPointer pConfig,
+BulkController::BulkController(
         libusb_context* context,
         libusb_device_handle* handle,
         struct libusb_device_descriptor* desc)
-        : Controller(pConfig),
+        : Controller(),
           m_context(context),
           m_phandle(handle),
           in_epaddr(0),

diff --git a/src/controllers/bulk/bulkcontroller.h b/src/controllers/bulk/bulkcontroller.h
@@ -42,7 +42,7 @@ class BulkReader : public QThread {
 class BulkController : public Controller {
     Q_OBJECT
   public:
-    BulkController(UserSettingsPointer pConfig,
+    BulkController(
             libusb_context* context,
             libusb_device_handle* handle,
             struct libusb_device_descriptor* desc);

diff --git a/src/controllers/bulk/bulkenumerator.cpp b/src/controllers/bulk/bulkenumerator.cpp
@@ -57,7 +57,7 @@ QList<Controller*> BulkEnumerator::queryDevices() {
             }
 
             BulkController* currentDevice =
-                    new BulkController(m_pConfig, m_context, handle, &desc);
+                    new BulkController(m_context, handle, &desc);
             m_devices.push_back(currentDevice);
         }
     }