summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontmetrics.h
diff options
context:
space:
mode:
authorHarald Fernengel <harald.fernengel@nokia.com>2011-08-09 11:30:03 +0200
committerQt by Nokia <qt-info@nokia.com>2011-08-09 12:00:51 +0200
commitad9f5c7e938b1d80b455acdfd0809448f2b5e1db (patch)
treeaebaf4392689880196a264015177cdd6e65cf8b5 /src/gui/text/qfontmetrics.h
parent92d88e475518b9f34dd068803d439892bdeaba9a (diff)
Remove all non-const operator==
We had to leave the non-const operator== for binary compatibility. Remove them all, just leave the const version in there. 100% source compatible. Change-Id: Ib7a70fb441fe51d5164d9cbf495cbeda0f48fafe Reviewed-on: http://codereview.qt.nokia.com/2773 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Robert Griebl <robert.griebl@nokia.com>
Diffstat (limited to 'src/gui/text/qfontmetrics.h')
-rw-r--r--src/gui/text/qfontmetrics.h4
1 files changed, 0 insertions, 4 deletions
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: