remove unused QFreetypeFace::init() method argument

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index 44acf60..f336bab 100644 (file)
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -132,10 +132,9 @@ HB_Error QFreetypeFace::getPointInOutline(HB_Glyph glyph, int flags, hb_uint32 p
  * Returns the freetype face or 0 in case of an empty file or any other problems
  * (like not being able to open the file)
  */
-QFreetypeFace *QFreetypeFace::getFace(const QFontEngine::FaceId &face_id,
-                                      const QByteArray &fontData)
+QFreetypeFace *QFreetypeFace::getFace(const QFontEngine::FaceId &face_id)
 {
-    if (face_id.filename.isEmpty() && fontData.isEmpty())
+    if (face_id.filename.isEmpty())
         return 0;
 
     QtFreetypeData *freetypeData = qt_getFreetypeData();
@@ -165,8 +164,6 @@ QFreetypeFace *QFreetypeFace::getFace(const QFontEngine::FaceId &face_id,
                 }
                 newFreetype->fontData = file.readAll();
             }
-        } else {
-            newFreetype->fontData = fontData;
         }
         if (!newFreetype->fontData.isEmpty()) {
             if (FT_New_Memory_Face(freetypeData->library, (const FT_Byte *)newFreetype->fontData.constData(), newFreetype->fontData.size(), face_id.index, &face)) {
@@ -584,10 +581,9 @@ void QFontEngineFT::freeGlyphSets()
         freeServerGlyphSet(transformedGlyphSets.at(i).id);
 }
 
-bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat format,
-                         const QByteArray &fontData)
+bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat format)
 {
-    return init(faceId, antialias, format, QFreetypeFace::getFace(faceId, fontData));
+    return init(faceId, antialias, format, QFreetypeFace::getFace(faceId));
 }
 
 bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat format,

diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h
index afbb7ef..e7d90ed 100644 (file)
--- a/src/gui/text/qfontengine_ft_p.h
+++ b/src/gui/text/qfontengine_ft_p.h
@@ -62,8 +62,7 @@ public:
     QFontEngine::Properties properties() const;
     bool getSfntTable(uint tag, uchar *buffer, uint *length) const;
 
-    static QFreetypeFace *getFace(const QFontEngine::FaceId &face_id,
-                                  const QByteArray &fontData = QByteArray());
+    static QFreetypeFace *getFace(const QFontEngine::FaceId &face_id);
     void release(const QFontEngine::FaceId &face_id);
 
     // locks the struct for usage. Any read/write operations require locking.
@@ -268,8 +267,7 @@ private:
     QFontEngineFT(const QFontDef &fd);
     virtual ~QFontEngineFT();
 
-    bool init(FaceId faceId, bool antiaalias, GlyphFormat defaultFormat = Format_None,
-              const QByteArray &fontData = QByteArray());
+    bool init(FaceId faceId, bool antiaalias, GlyphFormat defaultFormat = Format_None);
     bool init(FaceId faceId, bool antialias, GlyphFormat format,
               QFreetypeFace *freetypeFace);