Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

controllers/bulk: Fix BulkController constructor #15

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/controllers/bulk/bulkcontroller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/bulk/bulkcontroller.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/bulk/bulkenumerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down