From 282ebf9bd2b52c75659ed55396cf3593c1f2a299 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Thu, 7 Apr 2016 13:29:00 +0200 Subject: xcb: replace qt.xcb.glintegration logging category with qt.qpa.gl This is more concise, consistent with Windows, and fits the pattern that all logging categories in QPA plugins should begin with qt.qpa. Change-Id: Ica169b547cb3d816e6e2c0449f0e4a0c58883b9a Reviewed-by: Gatis Paeglis --- src/plugins/platforms/xcb/gl_integrations/qxcbglintegration.cpp | 2 +- src/plugins/platforms/xcb/gl_integrations/qxcbglintegration.h | 2 +- .../platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp | 6 +++--- .../platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp | 6 +++--- src/plugins/platforms/xcb/qxcbconnection.cpp | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/plugins/platforms/xcb/gl_integrations/qxcbglintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/qxcbglintegration.cpp index f2ea56b45a..59401d2ce7 100644 --- a/src/plugins/platforms/xcb/gl_integrations/qxcbglintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/qxcbglintegration.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(QT_XCB_GLINTEGRATION, "qt.xcb.glintegration") +Q_LOGGING_CATEGORY(lcQpaGl, "qt.qpa.gl") QXcbGlIntegration::QXcbGlIntegration() { diff --git a/src/plugins/platforms/xcb/gl_integrations/qxcbglintegration.h b/src/plugins/platforms/xcb/gl_integrations/qxcbglintegration.h index 6cc96d39be..719d2ace90 100644 --- a/src/plugins/platforms/xcb/gl_integrations/qxcbglintegration.h +++ b/src/plugins/platforms/xcb/gl_integrations/qxcbglintegration.h @@ -50,7 +50,7 @@ class QPlatformOffscreenSurface; class QOffscreenSurface; class QXcbNativeInterfaceHandler; -Q_XCB_EXPORT Q_DECLARE_LOGGING_CATEGORY(QT_XCB_GLINTEGRATION) +Q_XCB_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcQpaGl) class Q_XCB_EXPORT QXcbGlIntegration { diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp index 29f92a1049..f546cda4ad 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp @@ -51,7 +51,7 @@ QXcbEglIntegration::QXcbEglIntegration() : m_connection(Q_NULLPTR) , m_egl_display(EGL_NO_DISPLAY) { - qCDebug(QT_XCB_GLINTEGRATION) << "Xcb EGL gl-integration created"; + qCDebug(lcQpaGl) << "Xcb EGL gl-integration created"; } QXcbEglIntegration::~QXcbEglIntegration() @@ -69,13 +69,13 @@ bool QXcbEglIntegration::initialize(QXcbConnection *connection) bool success = eglInitialize(m_egl_display, &major, &minor); if (!success) { m_egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY); - qCDebug(QT_XCB_GLINTEGRATION) << "Xcb EGL gl-integration retrying with display" << m_egl_display; + qCDebug(lcQpaGl) << "Xcb EGL gl-integration retrying with display" << m_egl_display; success = eglInitialize(m_egl_display, &major, &minor); } m_native_interface_handler.reset(new QXcbEglNativeInterfaceHandler(connection->nativeInterface())); - qCDebug(QT_XCB_GLINTEGRATION) << "Xcb EGL gl-integration successfully initialized"; + qCDebug(lcQpaGl) << "Xcb EGL gl-integration successfully initialized"; return success; } diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp index 3e963ccaa8..a3668df59a 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp @@ -93,7 +93,7 @@ QXcbGlxIntegration::QXcbGlxIntegration() : m_connection(Q_NULLPTR) , m_glx_first_event(0) { - qCDebug(QT_XCB_GLINTEGRATION) << "Xcb GLX gl-integration created"; + qCDebug(lcQpaGl) << "Xcb GLX gl-integration created"; } QXcbGlxIntegration::~QXcbGlxIntegration() @@ -118,7 +118,7 @@ bool QXcbGlxIntegration::initialize(QXcbConnection *connection) xcb_glx_query_version_reply_t *xglx_query = xcb_glx_query_version_reply(m_connection->xcb_connection(), xglx_query_cookie, &error); if (!xglx_query || error) { - qCWarning(QT_XCB_GLINTEGRATION) << "QXcbConnection: Failed to initialize GLX"; + qCWarning(lcQpaGl) << "QXcbConnection: Failed to initialize GLX"; free(error); return false; } @@ -127,7 +127,7 @@ bool QXcbGlxIntegration::initialize(QXcbConnection *connection) m_native_interface_handler.reset(new QXcbGlxNativeInterfaceHandler(connection->nativeInterface())); - qCDebug(QT_XCB_GLINTEGRATION) << "Xcb GLX gl-integration successfully initialized"; + qCDebug(lcQpaGl) << "Xcb GLX gl-integration successfully initialized"; return true; } diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index e1e2ec5d24..cb222842db 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -644,7 +644,7 @@ QXcbConnection::QXcbConnection(QXcbNativeInterface *nativeInterface, bool canGra glIntegrationNames << QStringLiteral("xcb_glx") << QStringLiteral("xcb_egl"); QString glIntegrationName = QString::fromLocal8Bit(qgetenv("QT_XCB_GL_INTEGRATION")); if (!glIntegrationName.isEmpty()) { - qCDebug(QT_XCB_GLINTEGRATION) << "QT_XCB_GL_INTEGRATION is set to" << glIntegrationName; + qCDebug(lcQpaGl) << "QT_XCB_GL_INTEGRATION is set to" << glIntegrationName; if (glIntegrationName != QLatin1String("none")) { glIntegrationNames.removeAll(glIntegrationName); glIntegrationNames.prepend(glIntegrationName); @@ -654,17 +654,17 @@ QXcbConnection::QXcbConnection(QXcbNativeInterface *nativeInterface, bool canGra } if (!glIntegrationNames.isEmpty()) { - qCDebug(QT_XCB_GLINTEGRATION) << "Choosing xcb gl-integration based on following priority\n" << glIntegrationNames; + qCDebug(lcQpaGl) << "Choosing xcb gl-integration based on following priority\n" << glIntegrationNames; for (int i = 0; i < glIntegrationNames.size() && !m_glIntegration; i++) { m_glIntegration = QXcbGlIntegrationFactory::create(glIntegrationNames.at(i)); if (m_glIntegration && !m_glIntegration->initialize(this)) { - qCDebug(QT_XCB_GLINTEGRATION) << "Failed to initialize xcb gl-integration" << glIntegrationNames.at(i); + qCDebug(lcQpaGl) << "Failed to initialize xcb gl-integration" << glIntegrationNames.at(i); delete m_glIntegration; m_glIntegration = Q_NULLPTR; } } if (!m_glIntegration) - qCDebug(QT_XCB_GLINTEGRATION) << "Failed to create xcb gl-integration"; + qCDebug(lcQpaGl) << "Failed to create xcb gl-integration"; } sync(); -- cgit v1.2.3