Port Windows QPA plugin to new logger API.

Introduce logging categories and change most debug statements
to qCDebug().

Retrieve the filter rules from the environment variable
QT_QPA_VERBOSE (should be removed once the logging framework
offers a more convenient way of configuring).

Replace the old per-category variables controlling verboseness
of the output by a single variable which can be set on the command
line.

Change-Id: Iae55ecdb0e150efd165b7d3e90b371f72853f194
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 5 insertions, 9 deletions

diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
index f62b8a6139..3af2cff9a0 100644
--- a/src/plugins/platforms/windows/qwindowsmime.cpp
+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
@@ -675,8 +675,7 @@ QVariant QWindowsMimeText::convertToMime(const QString &mime, LPDATAOBJECT pData
         else
             ret = str.toUtf8();
     }
-    if (QWindowsContext::verboseOLE)
-        qDebug() << __FUNCTION__ << ret;
+    qCDebug(lcQpaMime) << __FUNCTION__ << ret;
     return ret;
 }
 
@@ -1490,8 +1489,7 @@ QStringList QWindowsMimeConverter::allMimesForFormats(IDataObject *pDataObj) con
         }
         fmtenum->Release();
     }
-    if (QWindowsContext::verboseOLE)
-        qDebug() << __FUNCTION__ << pDataObj << formats;
+    qCDebug(lcQpaMime) << __FUNCTION__ << pDataObj << formats;
     return formats;
 }
 
@@ -1541,9 +1539,8 @@ QVariant QWindowsMimeConverter::convertToMime(const QStringList &mimeTypes,
             if (converter->canConvertToMime(format, pDataObj)) {
                 const QVariant dataV = converter->convertToMime(format, pDataObj, preferredType);
                 if (dataV.isValid()) {
-                    if (QWindowsContext::verboseOLE)
-                        qDebug() << __FUNCTION__ << mimeTypes << "\nFormat: "
-                                 << format << pDataObj << " returns " << dataV;
+                    qCDebug(lcQpaMime) << __FUNCTION__ << mimeTypes << "\nFormat: "
+                        << format << pDataObj << " returns " << dataV;
                     if (formatIn)
                         *formatIn = format;
                     return dataV;
@@ -1551,8 +1548,7 @@ QVariant QWindowsMimeConverter::convertToMime(const QStringList &mimeTypes,
             }
         }
     }
-    if (QWindowsContext::verboseOLE)
-        qDebug() << __FUNCTION__ << "fails" << mimeTypes << pDataObj << preferredType;
+    qCDebug(lcQpaMime) << __FUNCTION__ << "fails" << mimeTypes << pDataObj << preferredType;
     return QVariant();
 }