1 files changed, 22 insertions, 49 deletions

diff --git a/src/plugins/platforms/directfb/qdirectfbblitter.h b/src/plugins/platforms/directfb/qdirectfbblitter.h
index f8ee92d509..6183859613 100644
--- a/src/plugins/platforms/directfb/qdirectfbblitter.h
+++ b/src/plugins/platforms/directfb/qdirectfbblitter.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** 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) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QDIRECTFBBLITTER_H
 #define QDIRECTFBBLITTER_H
@@ -55,11 +19,20 @@ public:
     QDirectFbBlitter(const QSize &size, bool alpha);
     virtual ~QDirectFbBlitter();
 
-    virtual void fillRect(const QRectF &rect, const QColor &color);
-    virtual void drawPixmap(const QRectF &rect, const QPixmap &pixmap, const QRectF &subrect);
-    void alphaFillRect(const QRectF &rect, const QColor &color, QPainter::CompositionMode cmode);
-    void drawPixmapOpacity(const QRectF &rect, const QPixmap &pixmap, const QRectF &subrect, QPainter::CompositionMode cmode, qreal opacity);
-    virtual bool drawCachedGlyphs(const QPaintEngineState *state, QFontEngine::GlyphFormat glyphFormat, int numGlyphs, const glyph_t *glyphs, const QFixedPoint *positions, QFontEngine *fontEngine);
+    void fillRect(const QRectF &rect, const QColor &color) override;
+    void drawPixmap(const QRectF &rect, const QPixmap &pixmap, const QRectF &subrect) override;
+    void alphaFillRect(const QRectF &rect, const QColor &color, QPainter::CompositionMode cmode) override;
+    void drawPixmapOpacity(const QRectF &rect,
+                           const QPixmap &pixmap,
+                           const QRectF &subrect,
+                           QPainter::CompositionMode cmode,
+                           qreal opacity) override;
+    bool drawCachedGlyphs(const QPaintEngineState *state,
+                          QFontEngine::GlyphFormat glyphFormat,
+                          int numGlyphs,
+                          const glyph_t *glyphs,
+                          const QFixedPoint *positions,
+                          QFontEngine *fontEngine) override;
 
     IDirectFBSurface *dfbSurface() const;
 
@@ -68,8 +41,8 @@ public:
     static DFBSurfacePixelFormat selectPixmapFormat(bool withAlpha);
 
 protected:
-    virtual QImage *doLock();
-    virtual void doUnlock();
+    QImage *doLock() override;
+    void doUnlock() override;
 
     QDirectFBPointer<IDirectFBSurface> m_surface;
     QImage m_image;
@@ -86,12 +59,12 @@ private:
 class QDirectFbBlitterPlatformPixmap : public QBlittablePlatformPixmap
 {
 public:
-    QBlittable *createBlittable(const QSize &size, bool alpha) const;
+    QBlittable *createBlittable(const QSize &size, bool alpha) const override;
 
     QDirectFbBlitter *dfbBlitter() const;
 
-    virtual bool fromFile(const QString &filename, const char *format,
-                          Qt::ImageConversionFlags flags);
+    bool fromFile(const QString &filename, const char *format,
+                  Qt::ImageConversionFlags flags) override;
 
 private:
     bool fromDataBufferDescription(const DFBDataBufferDescription &);
@@ -119,7 +92,7 @@ public:
         : QImageTextureGlyphCache(format, matrix)
     {}
 
-    virtual void resizeTextureData(int width, int height);
+    void resizeTextureData(int width, int height) override;
 
     IDirectFBSurface *sourceSurface();