3 files changed, 1 insertions, 35 deletions

diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index 5570768ddb..5f779e155a 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -291,7 +291,7 @@ private:
     struct GlyphCacheEntry {
         void *context;
         QExplicitlySharedDataPointer<QFontEngineGlyphCache> cache;
-        bool operator==(const GlyphCacheEntry &other) { return context == other.context && cache == other.cache; }
+        bool operator==(const GlyphCacheEntry &other) const { return context == other.context && cache == other.cache; }
     };
 
     mutable QLinkedList<GlyphCacheEntry> m_glyphCaches;
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index 9e1646f046..9fce85f25b 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -224,7 +224,6 @@ QFontMetrics &QFontMetrics::operator=(const QFontMetrics &fm)
 }
 
 /*!
-    \overload
     Returns true if \a other is equal to this object; otherwise
     returns false.
 
@@ -240,21 +239,6 @@ bool QFontMetrics::operator ==(const QFontMetrics &other) const
 }
 
 /*!
-    Returns true if \a other is equal to this object; otherwise
-    returns false.
-
-    Two font metrics are considered equal if they were constructed
-    from the same QFont and the paint devices they were constructed
-    for are considered compatible.
-
-    \sa operator!=()
-*/
-bool QFontMetrics::operator ==(const QFontMetrics &other)
-{
-    return d == other.d;
-}
-
-/*!
     \fn bool QFontMetrics::operator!=(const QFontMetrics &other)
 
     Returns true if \a other is not equal to this object; otherwise returns false.
@@ -1118,7 +1102,6 @@ QFontMetricsF &QFontMetricsF::operator=(const QFontMetricsF &fm)
 }
 
 /*!
-  \overload
   Returns true if the font metrics are equal to the \a other font
   metrics; otherwise returns false.
 
@@ -1132,19 +1115,6 @@ bool QFontMetricsF::operator ==(const QFontMetricsF &other) const
 }
 
 /*!
-  Returns true if the font metrics are equal to the \a other font
-  metrics; otherwise returns false.
-
-  Two font metrics are considered equal if they were constructed from the
-  same QFont and the paint devices they were constructed for are
-  considered to be compatible.
-*/
-bool QFontMetricsF::operator ==(const QFontMetricsF &other)
-{
-    return d == other.d;
-}
-
-/*!
     \fn bool QFontMetricsF::operator!=(const QFontMetricsF &other)
 
     Returns true if the font metrics are not equal to the \a other font
diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h
index 6a2db60b03..a23bb34e0d 100644
--- a/src/gui/text/qfontmetrics.h
+++ b/src/gui/text/qfontmetrics.h
@@ -117,9 +117,7 @@ public:
     int strikeOutPos() const;
     int lineWidth() const;
 
-    bool operator==(const QFontMetrics &other); // 5.0 - remove me
     bool operator==(const QFontMetrics &other) const;
-    inline bool operator !=(const QFontMetrics &other) { return !operator==(other); } // 5.0 - remove me
     inline bool operator !=(const QFontMetrics &other) const { return !operator==(other); }
 
 #ifdef QT3_SUPPORT
@@ -192,9 +190,7 @@ public:
     qreal strikeOutPos() const;
     qreal lineWidth() const;
 
-    bool operator==(const QFontMetricsF &other); // 5.0 - remove me
     bool operator==(const QFontMetricsF &other) const;
-    inline bool operator !=(const QFontMetricsF &other) { return !operator==(other); } // 5.0 - remove me
     inline bool operator !=(const QFontMetricsF &other) const { return !operator==(other); }
 
 private: