diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-12 16:06:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-12 16:06:35 (GMT) |
| commit | 163a4a4c38453cd4ed32c5a436763e11ce580687 (patch) | |
| tree | c9162f4b47571300ea17578401122532139561e9 /src/gui/text/qtextobject.h | |
| parent | 7190c7be34fe0dbcfbb10b232b40977c758d251a (diff) | |
| parent | b6f1dd4151c5bbcb7d4367ec972c9026ab9e68be (diff) | |
| download | Qt-163a4a4c38453cd4ed32c5a436763e11ce580687.zip Qt-163a4a4c38453cd4ed32c5a436763e11ce580687.tar.gz Qt-163a4a4c38453cd4ed32c5a436763e11ce580687.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/text/qtextobject.h')
| -rw-r--r-- | src/gui/text/qtextobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h index fface3f..7c3cefa 100644 --- a/src/gui/text/qtextobject.h +++ b/src/gui/text/qtextobject.h @@ -205,7 +205,7 @@ public: inline QTextBlock(const QTextBlock &o) : p(o.p), n(o.n) {} inline QTextBlock &operator=(const QTextBlock &o) { p = o.p; n = o.n; return *this; } - inline bool isValid() const { return p != 0 && n != 0; } + bool isValid() const; inline bool operator==(const QTextBlock &o) const { return p == o.p && n == o.n; } inline bool operator!=(const QTextBlock &o) const { return p != o.p || n != o.n; } |