summaryrefslogtreecommitdiffstats
path: root/src/controllers/bulk/bulkcontroller.cpp
diff options
context:
space:
mode:
authorFerran Pujol Camins <ferranpujolcamins@gmail.com>2019-11-03 09:43:25 +0100
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-02-28 23:47:05 +0100
commitf017447d841f57ea526101b622c645de9bb36fc9 (patch)
tree0377f7902beff164098dacbe09a62ab14938c9b9 /src/controllers/bulk/bulkcontroller.cpp
parentc22b7378ab166ed226b7596c84031529ca02b4a2 (diff)
Make UserSettings available in ControllerEngine
Diffstat (limited to 'src/controllers/bulk/bulkcontroller.cpp')
-rw-r--r--src/controllers/bulk/bulkcontroller.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp
index 17459ae8d9..49468b1cea 100644
--- a/src/controllers/bulk/bulkcontroller.cpp
+++ b/src/controllers/bulk/bulkcontroller.cpp
@@ -69,15 +69,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;