summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/text/qfont.cpp8
-rw-r--r--src/gui/text/qfontengine.cpp6
-rw-r--r--src/gui/text/qfontengine_ft_p.h2
-rw-r--r--src/gui/text/qfontengine_p.h6
-rw-r--r--src/gui/text/qfontengine_qpa_p.h2
-rw-r--r--src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h2
-rw-r--r--src/plugins/platforms/windows/qwindowsfontengine.cpp6
-rw-r--r--src/plugins/platforms/windows/qwindowsfontengine.h2
-rw-r--r--src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp5
-rw-r--r--src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h2
10 files changed, 4 insertions, 37 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 83f2d7190b..2e21a81187 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -2770,10 +2770,10 @@ void QFontCache::updateHitCountAndTimeStamp(Engine &value)
value.timestamp = ++current_timestamp;
FC_DEBUG("QFontCache: found font engine\n"
- " %p: timestamp %4u hits %3u ref %2d/%2d, type '%s'",
+ " %p: timestamp %4u hits %3u ref %2d/%2d, type %d",
value.data, value.timestamp, value.hits,
value.data->ref.load(), engineCacheCount.value(value.data),
- value.data->name());
+ value.data->type());
}
void QFontCache::insertEngine(const Key &key, QFontEngine *engine, bool insertMulti)
@@ -2969,10 +2969,10 @@ void QFontCache::timerEvent(QTimerEvent *)
it = jt;
if (it != end) {
- FC_DEBUG(" %p: timestamp %4u hits %2u ref %2d/%2d, type '%s'",
+ FC_DEBUG(" %p: timestamp %4u hits %2u ref %2d/%2d, type %d",
it.value().data, it.value().timestamp, it.value().hits,
it.value().data->ref.load(), engineCacheCount.value(it.value().data),
- it.value().data->name());
+ it.value().data->type());
QFontEngine *fontEngine = it.value().data;
// get rid of all occurrences
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index a5f213113d..75e55a5d23 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -1497,12 +1497,6 @@ qreal QFontEngineBox::maxCharWidth() const
return _size;
}
-
-const char *QFontEngineBox::name() const
-{
- return "null";
-}
-
bool QFontEngineBox::canRender(const QChar *, int) const
{
return true;
diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h
index fa6ef6f422..a322ab7ea4 100644
--- a/src/gui/text/qfontengine_ft_p.h
+++ b/src/gui/text/qfontengine_ft_p.h
@@ -230,8 +230,6 @@ private:
inline virtual Type type() const
{ return QFontEngine::Freetype; }
- inline virtual const char *name() const
- { return "freetype"; }
virtual void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics);
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index f5e4ae98fa..f5a894506f 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -225,8 +225,6 @@ public:
virtual void getGlyphBearings(glyph_t glyph, qreal *leftBearing = 0, qreal *rightBearing = 0);
- virtual const char *name() const = 0;
-
inline bool canRender(uint ucs4) const { return glyphIndex(ucs4) != 0; }
virtual bool canRender(const QChar *str, int len) const;
@@ -361,8 +359,6 @@ public:
virtual qreal minRightBearing() const { return 0; }
virtual QImage alphaMapForGlyph(glyph_t);
- virtual const char *name() const;
-
virtual bool canRender(const QChar *string, int len) const;
virtual Type type() const;
@@ -411,8 +407,6 @@ public:
{ return QFontEngine::Multi; }
virtual bool canRender(const QChar *string, int len) const;
- inline virtual const char *name() const
- { return "Multi"; }
QFontEngine *engine(int at) const
{Q_ASSERT(at < engines.size()); return engines.at(at); }
diff --git a/src/gui/text/qfontengine_qpa_p.h b/src/gui/text/qfontengine_qpa_p.h
index 9d9140b842..326c905caa 100644
--- a/src/gui/text/qfontengine_qpa_p.h
+++ b/src/gui/text/qfontengine_qpa_p.h
@@ -184,8 +184,6 @@ public:
Type type() const;
- inline const char *name() const { return "QPF2"; }
-
virtual int glyphCount() const { return glyphMapEntries; }
bool isValid() const;
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
index aefe495c37..f6247ca5e6 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
@@ -79,8 +79,6 @@ public:
virtual void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int numGlyphs,
QPainterPath *path, QTextItem::RenderFlags);
- virtual const char *name() const { return "QCoreTextFontEngine"; }
-
virtual bool canRender(const QChar *string, int len) const;
virtual int synthesized() const { return synthesisFlags; }
diff --git a/src/plugins/platforms/windows/qwindowsfontengine.cpp b/src/plugins/platforms/windows/qwindowsfontengine.cpp
index 264c22f47e..cc2f152bf9 100644
--- a/src/plugins/platforms/windows/qwindowsfontengine.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontengine.cpp
@@ -771,12 +771,6 @@ qreal QWindowsFontEngine::minRightBearing() const
#endif // Q_OS_WINCE
}
-
-const char *QWindowsFontEngine::name() const
-{
- return 0;
-}
-
QFontEngine::Type QWindowsFontEngine::type() const
{
return QFontEngine::Win;
diff --git a/src/plugins/platforms/windows/qwindowsfontengine.h b/src/plugins/platforms/windows/qwindowsfontengine.h
index 89ad08f689..b534798958 100644
--- a/src/plugins/platforms/windows/qwindowsfontengine.h
+++ b/src/plugins/platforms/windows/qwindowsfontengine.h
@@ -110,8 +110,6 @@ public:
virtual qreal minLeftBearing() const;
virtual qreal minRightBearing() const;
- virtual const char *name() const;
-
Type type() const;
virtual QImage alphaMapForGlyph(glyph_t t) { return alphaMapForGlyph(t, QTransform()); }
diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
index 744058279e..665e767786 100644
--- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
@@ -642,11 +642,6 @@ QImage QWindowsFontEngineDirectWrite::alphaRGBMapForGlyph(glyph_t t,
: mask.convertToFormat(QImage::Format_RGB32);
}
-const char *QWindowsFontEngineDirectWrite::name() const
-{
- return 0;
-}
-
QFontEngine::Type QWindowsFontEngineDirectWrite::type() const
{
return QFontEngine::DirectWrite;
diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h
index 070adfcbde..c61f1a0635 100644
--- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h
+++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h
@@ -90,8 +90,6 @@ public:
QFixed xHeight() const;
qreal maxCharWidth() const;
- const char *name() const;
-
bool supportsSubPixelPositions() const;
QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition);