diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2011-09-02 13:35:12 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-09-02 13:38:56 +0200 |
| commit | c6bdbf34ebe88426036efd6cb373572425b53482 (patch) | |
| tree | 17afc5b5e3a20fdfb5414f3a7ddb73d2296f3405 /src/gui/text | |
| parent | 154f6a2e73c839763cfc52d140f13a2f0e88eff2 (diff) | |
QGlyphRun: make operator != inlined
Merge-request: 2652
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
(cherry picked from commit 145de5acb68f320125b7566a7d726a5a7786a5f8)
Change-Id: I9d868d2258b222890c29eb26e8cd79d9fa3c7f71
Reviewed-on: http://codereview.qt.nokia.com/4139
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qglyphrun.cpp | 6 | ||||
| -rw-r--r-- | src/gui/text/qglyphrun.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/text/qglyphrun.cpp b/src/gui/text/qglyphrun.cpp index 26e7e97de7..8a002ab0ac 100644 --- a/src/gui/text/qglyphrun.cpp +++ b/src/gui/text/qglyphrun.cpp @@ -157,13 +157,11 @@ bool QGlyphRun::operator==(const QGlyphRun &other) const } /*! + \fn bool QGlyphRun::operator!=(const QGlyphRun &other) const + Compares \a other to this QGlyphRun object. Returns true if any of the list of glyph indexes, the list of positions or the font are different, otherwise returns false. */ -bool QGlyphRun::operator!=(const QGlyphRun &other) const -{ - return !(*this == other); -} /*! Returns the font selected for this QGlyphRun object. diff --git a/src/gui/text/qglyphrun.h b/src/gui/text/qglyphrun.h index bb5b99f7f9..81783a8653 100644 --- a/src/gui/text/qglyphrun.h +++ b/src/gui/text/qglyphrun.h @@ -79,8 +79,10 @@ public: void clear(); QGlyphRun &operator=(const QGlyphRun &other); + bool operator==(const QGlyphRun &other) const; - bool operator!=(const QGlyphRun &other) const; + inline bool operator!=(const QGlyphRun &other) const + { return !operator==(other); } void setOverline(bool overline); bool overline() const; |