diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2011-09-02 11:35:12 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-09-02 11:35:12 (GMT) |
| commit | 145de5acb68f320125b7566a7d726a5a7786a5f8 (patch) | |
| tree | 85ae6a2b340510f9545ef54ee5e84525d6c57acb | |
| parent | f550d219378e5669601de416254b3585fe3f5708 (diff) | |
| download | Qt-145de5acb68f320125b7566a7d726a5a7786a5f8.zip Qt-145de5acb68f320125b7566a7d726a5a7786a5f8.tar.gz Qt-145de5acb68f320125b7566a7d726a5a7786a5f8.tar.bz2 | |
QGlyphRun: make operator != inlined
Merge-request: 2652
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| -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 90790ed..3633978 100644 --- a/src/gui/text/qglyphrun.cpp +++ b/src/gui/text/qglyphrun.cpp @@ -156,13 +156,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 cf407a8..bc7f4ff 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; |