1 files changed, 12 insertions, 52 deletions

diff --git a/src/plugins/platforms/qnx/qqnxbuffer.cpp b/src/plugins/platforms/qnx/qqnxbuffer.cpp
index b02a989ea8..4d3b5256b2 100644
--- a/src/plugins/platforms/qnx/qqnxbuffer.cpp
+++ b/src/plugins/platforms/qnx/qqnxbuffer.cpp
@@ -1,41 +1,5 @@
-/***************************************************************************
-**
-** Copyright (C) 2011 - 2012 Research In Motion
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2011 - 2012 Research In Motion
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qqnxglobal.h"
 
@@ -46,24 +10,20 @@
 #include <errno.h>
 #include <sys/mman.h>
 
-#if defined(QQNXBUFFER_DEBUG)
-#define qBufferDebug qDebug
-#else
-#define qBufferDebug QT_NO_QDEBUG_MACRO
-#endif
-
 QT_BEGIN_NAMESPACE
 
+Q_LOGGING_CATEGORY(lcQpaScreenBuffer, "qt.qpa.screen.buffer");
+
 QQnxBuffer::QQnxBuffer()
     : m_buffer(0)
 {
-    qBufferDebug("empty");
+    qCDebug(lcQpaScreenBuffer) << Q_FUNC_INFO << "Empty";
 }
 
 QQnxBuffer::QQnxBuffer(screen_buffer_t buffer)
     : m_buffer(buffer)
 {
-    qBufferDebug("normal");
+    qCDebug(lcQpaScreenBuffer) << Q_FUNC_INFO << "Normal";
 
     // Get size of buffer
     int size[2];
@@ -113,7 +73,7 @@ QQnxBuffer::QQnxBuffer(screen_buffer_t buffer)
         imageFormat = QImage::Format_ARGB32_Premultiplied;
         break;
     default:
-        qFatal("QQNX: unsupported buffer format, format=%d", screenFormat);
+        qFatal(lcQpaScreenBuffer, "QQNX: unsupported buffer format, format=%d", screenFormat);
     }
 
     // wrap buffer in an image
@@ -124,27 +84,27 @@ QQnxBuffer::QQnxBuffer(const QQnxBuffer &other)
     : m_buffer(other.m_buffer),
       m_image(other.m_image)
 {
-    qBufferDebug("copy");
+    qCDebug(lcQpaScreenBuffer) << Q_FUNC_INFO << "Copy";
 }
 
 QQnxBuffer::~QQnxBuffer()
 {
-    qBufferDebug();
+    qCDebug(lcQpaScreenBuffer) << Q_FUNC_INFO;
 }
 
 void QQnxBuffer::invalidateInCache()
 {
-    qBufferDebug();
+    qCDebug(lcQpaScreenBuffer) << Q_FUNC_INFO;
 
     // Verify native buffer exists
     if (Q_UNLIKELY(!m_buffer))
-        qFatal("QQNX: can't invalidate cache for null buffer");
+        qFatal(lcQpaScreenBuffer, "QQNX: can't invalidate cache for null buffer");
 
     // Evict buffer's data from cache
     errno = 0;
     int result = msync(m_image.bits(), m_image.height() * m_image.bytesPerLine(), MS_INVALIDATE | MS_CACHE_ONLY);
     if (Q_UNLIKELY(result != 0))
-        qFatal("QQNX: failed to invalidate cache, errno=%d", errno);
+        qFatal(lcQpaScreenBuffer, "QQNX: failed to invalidate cache, errno=%d", errno);
 }
 
 QT_END_NAMESPACE