Make QFontEngine not derive from QObject

Whilst having the objectName set for each engine is
somewhat handy when debugging, deriving from QObject just for that
is a wasting of memory in all other cases.
This also broke the font engine abstraction by allowing qobject_cast()
to access some private data; the only sane way to distinguish
engines is querying their Type value.

Change-Id: Ib1d195692859eb39089f6d8d9016cb8f9dcc0400
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

4 files changed, 9 insertions, 16 deletions

diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
index a6bce6502b..22be4418a9 100644
--- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
@@ -1759,7 +1759,6 @@ QFontEngine *QWindowsFontDatabase::createEngine(int script, const QFontDef &requ
     QFontEngine *fe = 0;
     if (!useDirectWrite)  {
         QWindowsFontEngine *few = new QWindowsFontEngine(request.family, hfont, stockFont, lf, data);
-        few->setObjectName(QStringLiteral("QWindowsFontEngine_") + request.family);
         if (preferClearTypeAA)
             few->glyphFormat = QFontEngineGlyphCache::Raster_RGBMask;
 
@@ -1788,7 +1787,6 @@ QFontEngine *QWindowsFontDatabase::createEngine(int script, const QFontDef &requ
                                                                                     request.pixelSize,
                                                                                     data);
             fedw->initFontInfo(request, dpi, directWriteFont);
-            fedw->setObjectName(QStringLiteral("QWindowsFontEngineDirectWrite_") + request.family);
             fe = fedw;
         } else {
             qErrnoWarning("%s: CreateFontFace failed", __FUNCTION__);
@@ -1806,7 +1804,6 @@ QFontEngine *QWindowsFontDatabase::createEngine(int script, const QFontDef &requ
             QStringList list = family_list;
             list.append(extraFonts);
             QFontEngine *mfe = new QWindowsMultiFontEngine(fe, list);
-            mfe->setObjectName(QStringLiteral("QWindowsMultiFontEngine_") + request.family);
             mfe->fontDef = fe->fontDef;
             fe = mfe;
         }
diff --git a/src/plugins/platforms/windows/qwindowsfontengine.cpp b/src/plugins/platforms/windows/qwindowsfontengine.cpp
index 64457f4b67..ac57a1b396 100644
--- a/src/plugins/platforms/windows/qwindowsfontengine.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontengine.cpp
@@ -336,6 +336,13 @@ QWindowsFontEngine::QWindowsFontEngine(const QString &name,
 
     if (!resolvedGetCharWidthI)
         resolveGetCharWidthI();
+
+    // ### Properties accessed by QWin32PrintEngine (QtPrintSupport)
+    QVariantMap userData;
+    userData.insert(QStringLiteral("logFont"), QVariant::fromValue(m_logfont));
+    userData.insert(QStringLiteral("hFont"), QVariant::fromValue(hfont));
+    userData.insert(QStringLiteral("trueType"), QVariant(bool(ttf)));
+    setUserData(userData);
 }
 
 QWindowsFontEngine::~QWindowsFontEngine()
@@ -1366,7 +1373,7 @@ void QWindowsMultiFontEngine::loadEngine(int at)
 #endif
     {
         QWindowsFontEngine *fe = static_cast<QWindowsFontEngine*>(fontEngine);
-        lf = fe->logFont();
+        lf = fe->m_logfont;
 
         data = fe->fontEngineData();
     }
@@ -1391,8 +1398,6 @@ void QWindowsMultiFontEngine::loadEngine(int at)
                 QWindowsFontEngineDirectWrite *fedw = new QWindowsFontEngineDirectWrite(directWriteFontFace,
                                                                                         fontEngine->fontDef.pixelSize,
                                                                                         data);
-                fedw->setObjectName(QStringLiteral("QWindowsFontEngineDirectWrite_") + fontEngine->fontDef.family);
-
                 fedw->fontDef = fontDef;
                 fedw->ref.ref();
                 engines[at] = fedw;
diff --git a/src/plugins/platforms/windows/qwindowsfontengine.h b/src/plugins/platforms/windows/qwindowsfontengine.h
index 60ff61fcb9..d783b6048c 100644
--- a/src/plugins/platforms/windows/qwindowsfontengine.h
+++ b/src/plugins/platforms/windows/qwindowsfontengine.h
@@ -68,10 +68,7 @@ class QWindowsFontEngineData;
 
 class QWindowsFontEngine : public QFontEngine
 {
-    Q_OBJECT
-    Q_PROPERTY(HFONT hFont READ hFont STORED false)
-    Q_PROPERTY(LOGFONT logFont READ logFont STORED false)
-    Q_PROPERTY(bool trueType READ trueType STORED false)
+    friend class QWindowsMultiFontEngine;
 
 public:
     QWindowsFontEngine(const QString &name, HFONT, bool, LOGFONT,
@@ -137,11 +134,6 @@ public:
 
     const QSharedPointer<QWindowsFontEngineData> &fontEngineData() const { return m_fontEngineData; }
 
-    // Properties accessed by QWin32PrintEngine (Qt Print Support)
-    LOGFONT logFont() const { return m_logfont; }
-    HFONT hFont() const     { return hfont; }
-    bool trueType() const   { return ttf; }
-
     void setUniqueFamilyName(const QString &newName) { uniqueFamilyName = newName; }
 
 private:
diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h
index ab14cb49eb..57a6a3ba1d 100644
--- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h
+++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h
@@ -61,7 +61,6 @@ QT_BEGIN_NAMESPACE
 
 class QWindowsFontEngineDirectWrite : public QFontEngine
 {
-    Q_OBJECT
 public:
     explicit QWindowsFontEngineDirectWrite(IDWriteFontFace *directWriteFontFace,
                                     qreal pixelSize,