remove unused QFontEngine::removeGlyphFromCache() and its reimplementation

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index 0904403..fb33a16 100644 (file)
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -665,10 +665,6 @@ QImage QFontEngine::alphaMapForGlyph(glyph_t glyph)
     return indexed;
 }
 
-void QFontEngine::removeGlyphFromCache(glyph_t)
-{
-}
-
 QFontEngine::Properties QFontEngine::properties() const
 {
     Properties p;

diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index b54b8bc..acc1e01 100644 (file)
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -1776,11 +1776,6 @@ QImage QFontEngineFT::alphaRGBMapForGlyph(glyph_t g, QFixed subPixelPosition, in
     return img;
 }
 
-void QFontEngineFT::removeGlyphFromCache(glyph_t glyph)
-{
-    defaultGlyphSet.removeGlyphFromCache(glyph, 0);
-}
-
 int QFontEngineFT::glyphCount() const
 {
     int count = 0;
@@ -1858,20 +1853,6 @@ void QFontEngineFT::QGlyphSet::clear()
     glyph_data.clear();
 }
 
-void QFontEngineFT::QGlyphSet::removeGlyphFromCache(glyph_t index, QFixed subPixelPosition)
-{
-    if (useFastGlyphData(index, subPixelPosition)) {
-        if (fast_glyph_data[index]) {
-            delete fast_glyph_data[index];
-            fast_glyph_data[index] = 0;
-            if (fast_glyph_count > 0)
-                --fast_glyph_count;
-        }
-    } else {
-        delete glyph_data.take(GlyphAndSubPixelPosition(index, subPixelPosition));
-    }
-}
-
 void QFontEngineFT::QGlyphSet::setGlyph(glyph_t index, QFixed subPixelPosition, Glyph *glyph)
 {
     if (useFastGlyphData(index, subPixelPosition)) {

diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h
index 6549fc8..6804165 100644 (file)
--- a/src/gui/text/qfontengine_ft_p.h
+++ b/src/gui/text/qfontengine_ft_p.h
@@ -179,7 +179,6 @@ public:
         unsigned long id; // server sided id, GlyphSet for X11
         bool outline_drawing;
 
-        void removeGlyphFromCache(glyph_t index, QFixed subPixelPosition);
         void clear();
         inline bool useFastGlyphData(glyph_t index, QFixed subPixelPosition) const {
             return (index < 256 && subPixelPosition == 0);
@@ -248,7 +247,6 @@ private:
                                                 QFixed subPixelPosition,
                                                 const QTransform &matrix,
                                                 QFontEngine::GlyphFormat format);
-    virtual void removeGlyphFromCache(glyph_t glyph);
 
     virtual int glyphCount() const;
 

diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index 435d79e..5c4bbb7 100644 (file)
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -167,8 +167,6 @@ public:
         return boundingBox(glyph, matrix);
     }
 
-    virtual void removeGlyphFromCache(glyph_t);
-
     virtual glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) const = 0;
     virtual glyph_metrics_t boundingBox(glyph_t glyph) const = 0;
     virtual glyph_metrics_t boundingBox(glyph_t glyph, const QTransform &matrix);