summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2011-09-02 11:58:35 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2011-09-02 11:58:35 (GMT)
commit32603c5e40948491f0644d0d17a7e8bbff8d3e0c (patch)
tree8dd8cfe457d926d8b6edf04d5a5ea1900ba060a2 /src/gui
parent56ef015b1c2384e0590f19e938d349bcffdb6961 (diff)
downloadQt-32603c5e40948491f0644d0d17a7e8bbff8d3e0c.zip
Qt-32603c5e40948491f0644d0d17a7e8bbff8d3e0c.tar.gz
Qt-32603c5e40948491f0644d0d17a7e8bbff8d3e0c.tar.bz2
QRawFont: add missed operator !=
Merge-request: 1343 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/text/qrawfont.cpp6
-rw-r--r--src/gui/text/qrawfont.h3
2 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp
index 60a6cb3..9d8c6cc 100644
--- a/src/gui/text/qrawfont.cpp
+++ b/src/gui/text/qrawfont.cpp
@@ -284,6 +284,12 @@ bool QRawFont::operator==(const QRawFont &other) const
}
/*!
+ \fn bool QRawFont::operator!=(const QRawFont &other) const
+
+ Returns true if this QRawFont is not equal to \a other. Otherwise, returns false.
+*/
+
+/*!
Returns the ascent of this QRawFont in pixel units.
\sa QFontMetricsF::ascent()
diff --git a/src/gui/text/qrawfont.h b/src/gui/text/qrawfont.h
index d5b5680..1edbf4a 100644
--- a/src/gui/text/qrawfont.h
+++ b/src/gui/text/qrawfont.h
@@ -81,7 +81,10 @@ public:
bool isValid() const;
QRawFont &operator=(const QRawFont &other);
+
bool operator==(const QRawFont &other) const;
+ inline bool operator!=(const QRawFont &other) const
+ { return !operator==(other); }
QString familyName() const;
QString styleName() const;