diff options
| author | Anders Bakken <anders.bakken@nokia.com> | 2009-07-08 23:02:55 (GMT) |
|---|---|---|
| committer | Anders Bakken <anders@trolltech.com> | 2009-07-09 07:10:17 (GMT) |
| commit | 13bc92c6c9c0b1b7b6c9915848175a77ec082a85 (patch) | |
| tree | 530051d0ecd819c8637cdf6fd03f167b614716af | |
| parent | 5142a27c19fb01ec80010d2d1de12b0e3082751f (diff) | |
| download | Qt-13bc92c6c9c0b1b7b6c9915848175a77ec082a85.zip Qt-13bc92c6c9c0b1b7b6c9915848175a77ec082a85.tar.gz Qt-13bc92c6c9c0b1b7b6c9915848175a77ec082a85.tar.bz2 | |
Pass the device arg to the keyboard drivers.
We didn't use to pass the device in to the keyboard handlers rendering
them mostly useless.
Reviewed-by: TrustMe
| -rw-r--r-- | src/plugins/kbddrivers/sl5000/main.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/kbddrivers/usb/main.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/kbddrivers/vr41xx/main.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/kbddrivers/yopy/main.cpp | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/kbddrivers/sl5000/main.cpp b/src/plugins/kbddrivers/sl5000/main.cpp index 4d61266..cc68747 100644 --- a/src/plugins/kbddrivers/sl5000/main.cpp +++ b/src/plugins/kbddrivers/sl5000/main.cpp @@ -66,10 +66,9 @@ QStringList QSL5000KbdDriver::keys() const QWSKeyboardHandler* QSL5000KbdDriver::create(const QString &driver, const QString &device) { - Q_UNUSED(device); if (driver.compare(QLatin1String("SL5000"), Qt::CaseInsensitive)) return 0; - return new QWSSL5000KeyboardHandler(driver); + return new QWSSL5000KeyboardHandler(device); } Q_EXPORT_PLUGIN2(qwssl5000kbddriver, QSL5000KbdDriver) diff --git a/src/plugins/kbddrivers/usb/main.cpp b/src/plugins/kbddrivers/usb/main.cpp index 8f49366..38d460c 100644 --- a/src/plugins/kbddrivers/usb/main.cpp +++ b/src/plugins/kbddrivers/usb/main.cpp @@ -66,10 +66,9 @@ QStringList QUsbKbdDriver::keys() const QWSKeyboardHandler* QUsbKbdDriver::create(const QString &driver, const QString &device) { - Q_UNUSED(device); if (driver.compare(QLatin1String("Usb"), Qt::CaseInsensitive)) return 0; - return new QWSUsbKeyboardHandler(driver); + return new QWSUsbKeyboardHandler(device); } Q_EXPORT_PLUGIN2(qwsusbkbddriver, QUsbKbdDriver) diff --git a/src/plugins/kbddrivers/vr41xx/main.cpp b/src/plugins/kbddrivers/vr41xx/main.cpp index 2cba1f7..c9ba4d7 100644 --- a/src/plugins/kbddrivers/vr41xx/main.cpp +++ b/src/plugins/kbddrivers/vr41xx/main.cpp @@ -66,10 +66,9 @@ QStringList QVr41xxKbdDriver::keys() const QWSKeyboardHandler* QVr41xxKbdDriver::create(const QString &driver, const QString &device) { - Q_UNUSED(device); if (driver.compare(QLatin1String("VR41xx"), Qt::CaseInsensitive)) return 0; - return new QWSVr41xxKeyboardHandler(driver); + return new QWSVr41xxKeyboardHandler(device); } Q_EXPORT_PLUGIN2(qwsvr41xxkbddriver, QVr41xxKbdDriver) diff --git a/src/plugins/kbddrivers/yopy/main.cpp b/src/plugins/kbddrivers/yopy/main.cpp index bfddabe..7079d88 100644 --- a/src/plugins/kbddrivers/yopy/main.cpp +++ b/src/plugins/kbddrivers/yopy/main.cpp @@ -66,10 +66,9 @@ QStringList QYopyKbdDriver::keys() const QWSKeyboardHandler* QYopyKbdDriver::create(const QString &driver, const QString &device) { - Q_UNUSED(device); if (driver.compare(QLatin1String("Yopy"), Qt::CaseInsensitive)) return 0; - return new QWSYopyKeyboardHandler(driver); + return new QWSYopyKeyboardHandler(device); } Q_EXPORT_PLUGIN2(qwsyopykbddriver, QYopyKbdDriver) |