1 files changed, 16 insertions, 15 deletions

diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
index 666613f09d..3555763b89 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
@@ -66,7 +66,7 @@ Q_LOGGING_CATEGORY(qLcEvdevKeyMap, "qt.qpa.input.keymap")
 // simple builtin US keymap
 #include "qevdevkeyboard_defaultmap_p.h"
 
-void QFdContainer::reset() Q_DECL_NOTHROW
+void QFdContainer::reset() noexcept
 {
     if (m_fd >= 0)
         qt_safe_close(m_fd);
@@ -98,11 +98,12 @@ QEvdevKeyboardHandler::~QEvdevKeyboardHandler()
     unloadKeymap();
 }
 
-QEvdevKeyboardHandler *QEvdevKeyboardHandler::create(const QString &device,
+std::unique_ptr<QEvdevKeyboardHandler> QEvdevKeyboardHandler::create(const QString &device,
                                                      const QString &specification,
                                                      const QString &defaultKeymapFile)
 {
-    qCDebug(qLcEvdevKey) << "Try to create keyboard handler for" << device << specification;
+    qCDebug(qLcEvdevKey, "Try to create keyboard handler for \"%ls\" \"%ls\"",
+            qUtf16Printable(device), qUtf16Printable(specification));
 
     QString keymapFile = defaultKeymapFile;
     int repeatDelay = 400;
@@ -127,7 +128,7 @@ QEvdevKeyboardHandler *QEvdevKeyboardHandler::create(const QString &device,
             grab = arg.mid(5).toInt();
     }
 
-    qCDebug(qLcEvdevKey) << "Opening keyboard at" << device;
+    qCDebug(qLcEvdevKey, "Opening keyboard at %ls", qUtf16Printable(device));
 
     QFdContainer fd(qt_safe_open(device.toLocal8Bit().constData(), O_RDONLY | O_NDELAY, 0));
     if (fd.get() >= 0) {
@@ -137,16 +138,16 @@ QEvdevKeyboardHandler *QEvdevKeyboardHandler::create(const QString &device,
             ::ioctl(fd.get(), EVIOCSREP, kbdrep);
         }
 
-        return new QEvdevKeyboardHandler(device, fd, disableZap, enableCompose, keymapFile);
+        return std::unique_ptr<QEvdevKeyboardHandler>(new QEvdevKeyboardHandler(device, fd, disableZap, enableCompose, keymapFile));
     } else {
-        qWarning("Cannot open keyboard input device '%s': %s", qPrintable(device), strerror(errno));
-        return 0;
+        qErrnoWarning("Cannot open keyboard input device '%ls'", qUtf16Printable(device));
+        return nullptr;
     }
 }
 
 void QEvdevKeyboardHandler::switchLed(int led, bool state)
 {
-    qCDebug(qLcEvdevKey) << "switchLed" << led << state;
+    qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state));
 
     struct ::input_event led_ie;
     ::gettimeofday(&led_ie.time, 0);
@@ -170,7 +171,7 @@ void QEvdevKeyboardHandler::readKeycode()
             return;
         } else if (result < 0) {
             if (errno != EINTR && errno != EAGAIN) {
-                qErrnoWarning(errno, "evdevkeyboard: Could not read from input device");
+                qErrnoWarning("evdevkeyboard: Could not read from input device");
                 // If the device got disconnected, stop reading, otherwise we get flooded
                 // by the above error over and over again.
                 if (errno == ENODEV) {
@@ -230,7 +231,7 @@ void QEvdevKeyboardHandler::processKeyEvent(int nativecode, int unicode, int qtc
 
     QWindowSystemInterface::handleExtendedKeyEvent(0, (isPress ? QEvent::KeyPress : QEvent::KeyRelease),
                                                    qtcode, modifiers, nativecode + 8, 0, int(modifiers),
-                                                   (unicode != 0xffff ) ? QString(unicode) : QString(), autoRepeat);
+                                                   (unicode != 0xffff ) ? QString(QChar(unicode)) : QString(), autoRepeat);
 }
 
 QEvdevKeyboardHandler::KeycodeAction QEvdevKeyboardHandler::processKeycode(quint16 keycode, bool pressed, bool autorepeat)
@@ -473,7 +474,7 @@ QEvdevKeyboardHandler::KeycodeAction QEvdevKeyboardHandler::processKeycode(quint
 
 void QEvdevKeyboardHandler::unloadKeymap()
 {
-    qCDebug(qLcEvdevKey) << "Unload current keymap and restore built-in";
+    qCDebug(qLcEvdevKey, "Unload current keymap and restore built-in");
 
     if (m_keymap && m_keymap != s_keymap_default)
         delete [] m_keymap;
@@ -517,12 +518,12 @@ void QEvdevKeyboardHandler::unloadKeymap()
 
 bool QEvdevKeyboardHandler::loadKeymap(const QString &file)
 {
-    qCDebug(qLcEvdevKey) << "Loading keymap" << file;
+    qCDebug(qLcEvdevKey, "Loading keymap %ls", qUtf16Printable(file));
 
     QFile f(file);
 
     if (!f.open(QIODevice::ReadOnly)) {
-        qWarning("Could not open keymap file '%s'", qPrintable(file));
+        qWarning("Could not open keymap file '%ls'", qUtf16Printable(file));
         return false;
     }
 
@@ -541,7 +542,7 @@ bool QEvdevKeyboardHandler::loadKeymap(const QString &file)
     ds >> qmap_magic >> qmap_version >> qmap_keymap_size >> qmap_keycompose_size;
 
     if (ds.status() != QDataStream::Ok || qmap_magic != QEvdevKeyboardMap::FileMagic || qmap_version != 1 || qmap_keymap_size == 0) {
-        qWarning("'%s' is not a valid .qmap keymap file", qPrintable(file));
+        qWarning("'%ls' is not a valid .qmap keymap file", qUtf16Printable(file));
         return false;
     }
 
@@ -557,7 +558,7 @@ bool QEvdevKeyboardHandler::loadKeymap(const QString &file)
         delete [] qmap_keymap;
         delete [] qmap_keycompose;
 
-        qWarning("Keymap file '%s' cannot be loaded.", qPrintable(file));
+        qWarning("Keymap file '%ls' cannot be loaded.", qUtf16Printable(file));
         return false;
     }