From 6e5edb5a15b8e6f9a2a4eadee91d6bf0b6cca355 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sat, 13 Jan 2018 23:22:10 +0200 Subject: XCB: Replace qDebug with qCDebug Change-Id: I984c3e3288aa4d0b7185ea88ae0c4cf4627a2da3 Reviewed-by: Allan Sandfeld Jensen --- src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp | 4 ++-- src/plugins/platforms/xcb/qxcbintegration.cpp | 6 +++--- src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp index 145a11a5e3..05275cd2c9 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp @@ -60,7 +60,7 @@ const xcb_visualtype_t *QXcbGlxWindow::createVisual() if (!scr) return Q_NULLPTR; - qDebug(lcQpaGl) << "Requested format before FBConfig/Visual selection:" << m_format; + qCDebug(lcQpaGl) << "Requested format before FBConfig/Visual selection:" << m_format; Display *dpy = static_cast(scr->connection()->xlib_display()); const char *glxExts = glXQueryExtensionsString(dpy, scr->screenNumber()); @@ -79,7 +79,7 @@ const xcb_visualtype_t *QXcbGlxWindow::createVisual() const xcb_visualtype_t *xcb_visualtype = scr->visualForId(visualInfo->visualid); XFree(visualInfo); - qDebug(lcQpaGl) << "Got format:" << m_format; + qCDebug(lcQpaGl) << "Got format:" << m_format; return xcb_visualtype; } diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 72d31060db..10f3000dd2 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -176,8 +176,8 @@ QXcbIntegration::QXcbIntegration(const QStringList ¶meters, int &argc, char #if defined(QT_DEBUG) if (!noGrabArg && !doGrabArg && underDebugger) { - qDebug("Qt: gdb: -nograb added to command-line options.\n" - "\t Use the -dograb option to enforce grabbing."); + qCDebug(lcQpaXcb, "Qt: gdb: -nograb added to command-line options.\n" + "\t Use the -dograb option to enforce grabbing."); } #endif m_canGrab = (!underDebugger && !noGrabArg) || (underDebugger && doGrabArg); @@ -213,7 +213,7 @@ QXcbIntegration::QXcbIntegration(const QStringList ¶meters, int &argc, char #if QT_CONFIG(xcb_native_painting) if (nativePaintingEnabled()) { - qDebug("QXCB USING NATIVE PAINTING"); + qCDebug(lcQpaXcb, "QXCB USING NATIVE PAINTING"); qt_xcb_native_x11_info_init(defaultConnection()); } #endif diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index c8a668b72c..81a54f5887 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -282,7 +282,7 @@ static inline XTextProperty* qstringToXTP(Display *dpy, const QString& s) tl[1] = 0; errCode = XmbTextListToTextProperty(dpy, tl, 1, XStdICCTextStyle, &tp); if (errCode < 0) - qDebug("XmbTextListToTextProperty result code %d", errCode); + qCDebug(lcQpaXcb, "XmbTextListToTextProperty result code %d", errCode); } if (!mapper || errCode < 0) { mapper = QTextCodec::codecForName("latin1"); -- cgit v1.2.3