From 39b4e528e1032992f20feb2c4ac85308738efd76 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 9 May 2012 17:18:47 +0200 Subject: Fix warnings in evdevkeyboard-plugin. - Fix warning about set-but-unused variable in case QT_NO_LIBUDEV. - Compile with QT_NO_CAST_FROM_ASCII, string usages. Change-Id: Ie98f1b4283919be878f8bbfc6e7378ad655152f8 Reviewed-by: Laszlo Agocs --- src/plugins/generic/evdevkeyboard/main.cpp | 3 +-- src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.cpp | 2 +- src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp | 12 +++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src/plugins/generic/evdevkeyboard') diff --git a/src/plugins/generic/evdevkeyboard/main.cpp b/src/plugins/generic/evdevkeyboard/main.cpp index 71d15720bd..5d769d0ecf 100644 --- a/src/plugins/generic/evdevkeyboard/main.cpp +++ b/src/plugins/generic/evdevkeyboard/main.cpp @@ -63,8 +63,7 @@ QEvdevKeyboardPlugin::QEvdevKeyboardPlugin() QStringList QEvdevKeyboardPlugin::keys() const { - return (QStringList() - << QLatin1String("EvdevKeyboard")); + return QStringList(QLatin1String("EvdevKeyboard")); } QObject* QEvdevKeyboardPlugin::create(const QString &key, diff --git a/src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.cpp index eb29b853e7..4634f81029 100644 --- a/src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.cpp +++ b/src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.cpp @@ -102,7 +102,7 @@ QEvdevKeyboardHandler *QEvdevKeyboardHandler::createLinuxInputKeyboardHandler(co #endif QString keymapFile; - QString device = "/dev/input/event0"; + QString device = QLatin1String("/dev/input/event0"); int repeatDelay = 400; int repeatRate = 80; bool disableZap = false; diff --git a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp index 697556c4ac..04ce2a73a0 100644 --- a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp +++ b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp @@ -65,9 +65,9 @@ QEvdevKeyboardManager::QEvdevKeyboardManager(const QString &key, const QString & QStringList devices; foreach (const QString &arg, args) { - if (arg.startsWith("udev") && arg.contains("no")) { + if (arg.startsWith(QLatin1String("udev")) && arg.contains(QLatin1String("no"))) { useUDev = false; - } else if (arg.startsWith("/dev/")) { + } else if (arg.startsWith(QLatin1String("/dev/"))) { // if device is specified try to use it devices.append(arg); args.removeAll(arg); @@ -75,7 +75,7 @@ QEvdevKeyboardManager::QEvdevKeyboardManager(const QString &key, const QString & } // build new specification without /dev/ elements - m_spec = args.join(":"); + m_spec = args.join(QLatin1String(":")); // add all keyboards for devices specified in the argument list foreach (const QString &device, devices) @@ -99,6 +99,8 @@ QEvdevKeyboardManager::QEvdevKeyboardManager(const QString &key, const QString & connect(m_udeviceHelper, SIGNAL(deviceRemoved(QString,QUDeviceTypes)), this, SLOT(removeKeyboard(QString))); } } +#else + Q_UNUSED(useUDev) #endif // QT_NO_LIBUDEV } @@ -117,12 +119,12 @@ void QEvdevKeyboardManager::addKeyboard(const QString &deviceNode) QString specification = m_spec; if (!deviceNode.isEmpty()) { - specification.append(":"); + specification.append(QLatin1Char(':')); specification.append(deviceNode); } QEvdevKeyboardHandler *keyboard; - keyboard = QEvdevKeyboardHandler::createLinuxInputKeyboardHandler("EvdevKeyboard", specification); + keyboard = QEvdevKeyboardHandler::createLinuxInputKeyboardHandler(QLatin1String("EvdevKeyboard"), specification); if (keyboard) m_keyboards.insert(deviceNode, keyboard); else -- cgit v1.2.3