QEvdev: use printf-style qCDebug()/qWarning()

Also use qUtf16Printable() and qErrnoWarning (removing explicit errno, where
present).

Saves 6.6KiB in text size on optimized Linux AMD64 GCC 9.1 build across
all .so's that link to QtInputSupport.a.

Change-Id: I1def2cfabd2eed65390099cd1d06f8061a9355be
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 
 

2 files changed, 15 insertions, 15 deletions

diff --git a/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp b/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp
index b6051aaf3c..c86840b76c 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp
+++ b/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp
@@ -172,11 +172,11 @@ QEvdevTabletHandler::QEvdevTabletHandler(const QString &device, const QString &s
 
     setObjectName(QLatin1String("Evdev Tablet Handler"));
 
-    qCDebug(qLcEvdevTablet, "evdevtablet: using %s", qPrintable(device));
+    qCDebug(qLcEvdevTablet, "evdevtablet: using %ls", qUtf16Printable(device));
 
     m_fd = QT_OPEN(device.toLocal8Bit().constData(), O_RDONLY | O_NDELAY, 0);
     if (m_fd < 0) {
-        qErrnoWarning(errno, "evdevtablet: Cannot open input device %s", qPrintable(device));
+        qErrnoWarning("evdevtablet: Cannot open input device %ls", qUtf16Printable(device));
         return;
     }
 
@@ -184,11 +184,11 @@ QEvdevTabletHandler::QEvdevTabletHandler(const QString &device, const QString &s
     if (grabSuccess)
         ioctl(m_fd, EVIOCGRAB, (void *) 0);
     else
-        qWarning("evdevtablet: %s: The device is grabbed by another process. No events will be read.", qPrintable(device));
+        qWarning("evdevtablet: %ls: The device is grabbed by another process. No events will be read.", qUtf16Printable(device));
 
     d = new QEvdevTabletData(this);
     if (!queryLimits())
-        qWarning("evdevtablet: %s: Unset or invalid ABS limits. Behavior will be unspecified.", qPrintable(device));
+        qWarning("evdevtablet: %ls: Unset or invalid ABS limits. Behavior will be unspecified.", qUtf16Printable(device));
 
     m_notifier = new QSocketNotifier(m_fd, QSocketNotifier::Read, this);
     connect(m_notifier, &QSocketNotifier::activated, this, &QEvdevTabletHandler::readData);
@@ -216,32 +216,32 @@ bool QEvdevTabletHandler::queryLimits()
     if (ok) {
         d->minValues.x = absInfo.minimum;
         d->maxValues.x = absInfo.maximum;
-        qCDebug(qLcEvdevTablet, "evdevtablet: %s: min X: %d max X: %d", qPrintable(m_device),
+        qCDebug(qLcEvdevTablet, "evdevtablet: %ls: min X: %d max X: %d", qUtf16Printable(m_device),
                 d->minValues.x, d->maxValues.x);
     }
     ok &= ioctl(m_fd, EVIOCGABS(ABS_Y), &absInfo) >= 0;
     if (ok) {
         d->minValues.y = absInfo.minimum;
         d->maxValues.y = absInfo.maximum;
-        qCDebug(qLcEvdevTablet, "evdevtablet: %s: min Y: %d max Y: %d", qPrintable(m_device),
+        qCDebug(qLcEvdevTablet, "evdevtablet: %ls: min Y: %d max Y: %d", qUtf16Printable(m_device),
                 d->minValues.y, d->maxValues.y);
     }
     if (ioctl(m_fd, EVIOCGABS(ABS_PRESSURE), &absInfo) >= 0) {
         d->minValues.p = absInfo.minimum;
         d->maxValues.p = absInfo.maximum;
-        qCDebug(qLcEvdevTablet, "evdevtablet: %s: min pressure: %d max pressure: %d", qPrintable(m_device),
+        qCDebug(qLcEvdevTablet, "evdevtablet: %ls: min pressure: %d max pressure: %d", qUtf16Printable(m_device),
                 d->minValues.p, d->maxValues.p);
     }
     if (ioctl(m_fd, EVIOCGABS(ABS_DISTANCE), &absInfo) >= 0) {
         d->minValues.d = absInfo.minimum;
         d->maxValues.d = absInfo.maximum;
-        qCDebug(qLcEvdevTablet, "evdevtablet: %s: min distance: %d max distance: %d", qPrintable(m_device),
+        qCDebug(qLcEvdevTablet, "evdevtablet: %ls: min distance: %d max distance: %d", qUtf16Printable(m_device),
                 d->minValues.d, d->maxValues.d);
     }
     char name[128];
     if (ioctl(m_fd, EVIOCGNAME(sizeof(name) - 1), name) >= 0) {
         d->devName = QString::fromLocal8Bit(name);
-        qCDebug(qLcEvdevTablet, "evdevtablet: %s: device name: %s", qPrintable(m_device), name);
+        qCDebug(qLcEvdevTablet, "evdevtablet: %ls: device name: %s", qUtf16Printable(m_device), name);
     }
     return ok;
 }
@@ -253,11 +253,11 @@ void QEvdevTabletHandler::readData()
     for (; ;) {
         int result = QT_READ(m_fd, reinterpret_cast<char*>(buffer) + n, sizeof(buffer) - n);
         if (!result) {
-            qWarning("evdevtablet: %s: Got EOF from input device", qPrintable(m_device));
+            qWarning("evdevtablet: %ls: Got EOF from input device", qUtf16Printable(m_device));
             return;
         } else if (result < 0) {
             if (errno != EINTR && errno != EAGAIN) {
-                qErrnoWarning(errno, "evdevtablet: %s: Could not read from input device", qPrintable(m_device));
+                qErrnoWarning("evdevtablet: %ls: Could not read from input device", qUtf16Printable(m_device));
                 if (errno == ENODEV) { // device got disconnected -> stop reading
                     delete m_notifier;
                     m_notifier = 0;
diff --git a/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp b/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
index 90949408ac..da4b6e5172 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
+++ b/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
@@ -82,7 +82,7 @@ QEvdevTabletManager::QEvdevTabletManager(const QString &key, const QString &spec
 
     // when no devices specified, use device discovery to scan and monitor
     if (devices.isEmpty()) {
-        qCDebug(qLcEvdevTablet) << "evdevtablet: Using device discovery";
+        qCDebug(qLcEvdevTablet, "evdevtablet: Using device discovery");
         m_deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Tablet, this);
         if (m_deviceDiscovery) {
             const QStringList devices = m_deviceDiscovery->scanConnectedDevices();
@@ -104,7 +104,7 @@ QEvdevTabletManager::~QEvdevTabletManager()
 
 void QEvdevTabletManager::addDevice(const QString &deviceNode)
 {
-    qCDebug(qLcEvdevTablet) << "Adding device at" << deviceNode;
+    qCDebug(qLcEvdevTablet, "Adding device at %ls", qUtf16Printable(deviceNode));
     QEvdevTabletHandlerThread *handler;
     handler = new QEvdevTabletHandlerThread(deviceNode, m_spec);
     if (handler) {
@@ -112,14 +112,14 @@ void QEvdevTabletManager::addDevice(const QString &deviceNode)
         QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
             QInputDeviceManager::DeviceTypeTablet, m_activeDevices.count());
     } else {
-        qWarning("evdevtablet: Failed to open tablet device %s", qPrintable(deviceNode));
+        qWarning("evdevtablet: Failed to open tablet device %ls", qUtf16Printable(deviceNode));
     }
 }
 
 void QEvdevTabletManager::removeDevice(const QString &deviceNode)
 {
     if (m_activeDevices.contains(deviceNode)) {
-        qCDebug(qLcEvdevTablet) << "Removing device at" << deviceNode;
+        qCDebug(qLcEvdevTablet, "Removing device at %ls", qUtf16Printable(deviceNode));
         QEvdevTabletHandlerThread *handler = m_activeDevices.value(deviceNode);
         m_activeDevices.remove(deviceNode);
         QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(