diff options
author | Ferran Pujol Camins <ferranpujolcamins@gmail.com> | 2019-11-11 22:15:19 +0100 |
---|---|---|
committer | Ferran Pujol Camins <ferranpujolcamins@gmail.com> | 2019-11-11 22:15:19 +0100 |
commit | 85a37620c730d213841127ce01fdd6d85c95e47b (patch) | |
tree | 05f0e71f19c5e6c6000b9f47d55d502cfb37b36e /src/controllers/bulk/bulkcontroller.cpp | |
parent | fc22b257ee33398315ef0f8348fff0a08bca852c (diff) |
Pass UserSettings to Controller constructor
Diffstat (limited to 'src/controllers/bulk/bulkcontroller.cpp')
-rw-r--r-- | src/controllers/bulk/bulkcontroller.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp index d178d08487..01853742be 100644 --- a/src/controllers/bulk/bulkcontroller.cpp +++ b/src/controllers/bulk/bulkcontroller.cpp @@ -68,15 +68,15 @@ static QString get_string(libusb_device_handle *handle, u_int8_t id) { return QString::fromLatin1((char*)buf); } - -BulkController::BulkController(libusb_context* context, - libusb_device_handle *handle, - struct libusb_device_descriptor *desc) - : m_context(context), +BulkController::BulkController(UserSettingsPointer pConfig, + libusb_context* context, + libusb_device_handle* handle, + struct libusb_device_descriptor* desc) + : Controller(pConfig), + m_context(context), m_phandle(handle), in_epaddr(0), - out_epaddr(0) -{ + out_epaddr(0) { vendor_id = desc->idVendor; product_id = desc->idProduct; |