diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-06-14 14:12:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-14 14:12:07 +0200 |
| commit | 441e49cf4265cfcf7bc056d091759bd6773c6131 (patch) | |
| tree | 0a8d8c1e6ae095af5e674b3b540b892a62f5fc11 /src/controllers/bulk/bulkcontroller.cpp | |
| parent | b4ef3e05cdf9496ba0f0e1215b10bd1379b26829 (diff) | |
| parent | 6e96bdbcc8abd9a76aea95084886ff48d1b001d1 (diff) | |
Merge pull request #2682 from Be-ing/migrate-to-QJSEngine
migrate legacy controller system to QJSEngine
Diffstat (limited to 'src/controllers/bulk/bulkcontroller.cpp')
| -rw-r--r-- | src/controllers/bulk/bulkcontroller.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp index d43c6cec29..271c3b100b 100644 --- a/src/controllers/bulk/bulkcontroller.cpp +++ b/src/controllers/bulk/bulkcontroller.cpp @@ -69,12 +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), - m_context(context), + : m_context(context), m_phandle(handle), in_epaddr(0), out_epaddr(0) { |