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, 5 deletions

diff --git a/src/plugins/platforms/windows/accessible/iaccessible2.cpp b/src/plugins/platforms/windows/accessible/iaccessible2.cpp
index 66ed9d85dc..7f2ed86404 100644
--- a/src/plugins/platforms/windows/accessible/iaccessible2.cpp
+++ b/src/plugins/platforms/windows/accessible/iaccessible2.cpp
@@ -59,10 +59,10 @@ HRESULT STDMETHODCALLTYPE AccessibleApplication::QueryInterface(REFIID id, LPVOI
 {
     *iface = 0;
     if (id == IID_IUnknown) {
-        accessibleDebug("AccessibleApplication::QI(): IID_IUnknown");
+        qCDebug(lcQpaAccessibility) << "AccessibleApplication::QI(): IID_IUnknown";
         *iface = (IUnknown*)this;
     } else if (id == IID_IAccessibleApplication) {
-        accessibleDebug("AccessibleApplication::QI(): IID_IAccessibleApplication");
+        qCDebug(lcQpaAccessibility) << "AccessibleApplication::QI(): IID_IAccessibleApplication";
         *iface = static_cast<IAccessibleApplication*>(this);
     }
 
@@ -476,7 +476,7 @@ HRESULT STDMETHODCALLTYPE QWindowsIA2Accessible::get_uniqueID(long *outUniqueID)
     if (!accessible)
         return E_FAIL;
 
-    accessibleDebug("uniqueID: %08x", id);
+    qCDebug(lcQpaAccessibility) << "uniqueID: " << showbase << hex << id;
 
     *outUniqueID = (long)id;
     return int(id) < 0 ? S_OK : S_FALSE;
@@ -841,7 +841,7 @@ HRESULT STDMETHODCALLTYPE QWindowsIA2Accessible::get_cellAt( long row, long colu
             *cell = QWindowsAccessibility::wrap(qtCell);
         }
     }
-    accessibleDebug("found cell? %p", *cell);
+    qCDebug(lcQpaAccessibility) << "found cell? " << *cell;
     return *cell ? S_OK : S_FALSE;
 }
 
@@ -1574,7 +1574,7 @@ HRESULT STDMETHODCALLTYPE QWindowsIA2Accessible::QueryService(REFGUID guidServic
         return E_POINTER;
     Q_UNUSED(guidService);
     *iface = 0;
-    accessibleDebug("QWindowsIA2Accessible::QS(): %s", IIDToString(riid).constData());
+    qCDebug(lcQpaAccessibility) << "QWindowsIA2Accessible::QS(): " << IIDToString(riid);
 
 
     if (guidService == IID_IAccessible) {