Windows code: Fix clang-tidy warnings about (private) class definitions

Add override, disable copies where appropriate and use = default
for trivial functions.

Change-Id: Ia5bc7419b1aa053c5503ea7dfaf11cb6dfafd2e2
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

5 files changed, 10 insertions, 7 deletions

diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
index 6b86f01616..385a4eaac5 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
@@ -368,6 +368,7 @@ namespace {
 
     class DirectWriteFontFileStream: public IDWriteFontFileStream
     {
+        Q_DISABLE_COPY(DirectWriteFontFileStream)
     public:
         DirectWriteFontFileStream(const QByteArray &fontData)
             : m_fontData(fontData)
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
index 9080d3ea9d..ab6d6307c7 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
@@ -85,6 +85,7 @@ public:
 
 class QWindowsFontDatabase : public QPlatformFontDatabase
 {
+    Q_DISABLE_COPY(QWindowsFontDatabase)
 public:
     enum FontOptions {
         // Relevant bits from QWindowsIntegration::Options
@@ -93,7 +94,7 @@ public:
     };
 
     QWindowsFontDatabase();
-    ~QWindowsFontDatabase();
+    ~QWindowsFontDatabase() override;
 
     void populateFontDatabase() override;
     void populateFamily(const QString &familyName) override;
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
index 2ec391c4da..a151cf7343 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
@@ -66,13 +66,14 @@ class QWindowsFontEngineData;
 
 class QWindowsFontEngine : public QFontEngine
 {
+    Q_DISABLE_COPY(QWindowsFontEngine)
     friend class QWindowsMultiFontEngine;
 
 public:
     QWindowsFontEngine(const QString &name, LOGFONT lf,
                        const QSharedPointer<QWindowsFontEngineData> &fontEngineData);
 
-    ~QWindowsFontEngine();
+    ~QWindowsFontEngine() override;
     void initFontInfo(const QFontDef &request,
                       int dpi);
 
@@ -89,7 +90,7 @@ public:
     void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags) const override;
 
     void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags) override;
-    virtual void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs,
+    void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs,
                          QPainterPath *path, QTextItem::RenderFlags flags) override;
 
     HGDIOBJ selectDesignFont() const;
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
index 0e017c3b77..57c41938bc 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
@@ -69,15 +69,14 @@ namespace {
 
     class GeometrySink: public IDWriteGeometrySink
     {
+        Q_DISABLE_COPY(GeometrySink)
     public:
         GeometrySink(QPainterPath *path)
             : m_refCount(0), m_path(path)
         {
             Q_ASSERT(m_path != 0);
         }
-        virtual ~GeometrySink()
-        {
-        }
+        virtual ~GeometrySink() = default;
 
         IFACEMETHOD_(void, AddBeziers)(const D2D1_BEZIER_SEGMENT *beziers, UINT bezierCount);
         IFACEMETHOD_(void, AddLines)(const D2D1_POINT_2F *points, UINT pointCount);
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h
index 83fdddfa26..9326f5aece 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h
@@ -72,11 +72,12 @@ class QWindowsFontEngineData;
 
 class QWindowsFontEngineDirectWrite : public QFontEngine
 {
+    Q_DISABLE_COPY(QWindowsFontEngineDirectWrite)
 public:
     explicit QWindowsFontEngineDirectWrite(IDWriteFontFace *directWriteFontFace,
                                     qreal pixelSize,
                                     const QSharedPointer<QWindowsFontEngineData> &d);
-    ~QWindowsFontEngineDirectWrite();
+    ~QWindowsFontEngineDirectWrite() override;
 
     void initFontInfo(const QFontDef &request, int dpi);