From a633d80efe1c4f3a5c5e05bb8b2673172e05b9b4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 11 Apr 2012 17:30:17 +0200 Subject: Fix font substitutions. - Remove remains of platform-specific substitution tables in QtGui. - Deprecate QFont::removeSubstitution() in favour of QFont::removeSubstitutions() (as suggested in the comments). - Clean up substitution code, remove postfix operator++ on iterators and repeated invocation of .end(). Change-Id: I2e82e4ce2dd357d49e4d2b7fd6f95785acfcda95 Reviewed-by: Miikka Heikkinen Reviewed-by: Lars Knoll --- src/gui/text/qfont.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/gui/text/qfont.h') diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index a3019e560c..45186cecc6 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -257,7 +257,10 @@ public: static QStringList substitutions(); static void insertSubstitution(const QString&, const QString &); static void insertSubstitutions(const QString&, const QStringList &); - static void removeSubstitution(const QString &); + static void removeSubstitutions(const QString &); +#if QT_DEPRECATED_SINCE(5, 0) + static QT_DEPRECATED void removeSubstitution(const QString &family) { removeSubstitutions(family); } +#endif static void initialize(); static void cleanup(); static void cacheStatistics(); -- cgit v1.2.3