whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Konstantin Ritt 2011-09-02 13:35:12 +02:00 committed by Eskil Abrahamsen Blomfeldt
parent 154f6a2e73
commit c6bdbf34eb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/text/qglyphrun.cpp
View File

@ -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.

4
src/gui/text/qglyphrun.h
View File

@ -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;