diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 10:11:49 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 12:48:52 +0200 |
| commit | 04d0a9626ce61b2e05a40f9562c2bcf12e234639 (patch) | |
| tree | f1643f829aedc9ac51fcc260f7df2639dfe08360 /src/gui/text/qfontmetrics.h | |
| parent | 17f3451daa286b88a52f18c802d7b158dfb653b2 (diff) | |
| parent | bdc417b3828737334723eae23097c85f70c23a33 (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/gui/kernel/qapplication_qpa.cpp
src/gui/kernel/qcursor_qpa.cpp
src/gui/kernel/qwindowsysteminterface_qpa.cpp
src/gui/kernel/qwindowsysteminterface_qpa.h
src/gui/kernel/qwindowsysteminterface_qpa_p.h
src/gui/text/qtextcontrol.cpp
src/plugins/platforms/wayland/wayland.pro
src/widgets/accessible/qaccessible2.h
src/widgets/widgets/qwidgetlinecontrol_p.h
Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74
Diffstat (limited to 'src/gui/text/qfontmetrics.h')
| -rw-r--r-- | src/gui/text/qfontmetrics.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h index 50e4dbb46a..f21e820556 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); } private: @@ -183,9 +181,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: |