diff options
| author | Paul Colby <git@colby.id.au> | 2018-04-27 19:55:47 +1000 |
|---|---|---|
| committer | Paul Colby <qt@colby.id.au> | 2018-04-27 11:10:16 +0000 |
| commit | 1a254ab116f63b8188b9bc12cdd19e6d5696c3f2 (patch) | |
| tree | f70197186881ea51028e39dd1f87c28ceb7ed030 | |
| parent | e4abf2c6e3de158d3a6eb3c46b5158f741136c9d (diff) | |
| download | qtxmlpatterns-1a254ab116f63b8188b9bc12cdd19e6d5696c3f2.tar.gz | |
Change QSourceLocation::operator!=() to test for inequality
[ChangeLog][QSourceLocation] Corrected QSourceLocation::operator!=()
to test for non-equality, where prior to this it was incorrectly
testing for equality instead.
Also, corrected the QSourceLocation::operator!=() documentation which
was erroneously referencing an unrelated QXmlName class, and updated
the QSourceLocation::operator==() documentation to be consistent with
the rest of the class, as well as broader Qt documentation conventions.
Change-Id: Ia74f84e965f45fd2da3aa42c9c59eba7014b6edb
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| -rw-r--r-- | src/xmlpatterns/api/qsourcelocation.cpp | 9 | ||||
| -rw-r--r-- | tests/auto/qsourcelocation/tst_qsourcelocation.cpp | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/xmlpatterns/api/qsourcelocation.cpp b/src/xmlpatterns/api/qsourcelocation.cpp index 7d61c17..a416cda 100644 --- a/src/xmlpatterns/api/qsourcelocation.cpp +++ b/src/xmlpatterns/api/qsourcelocation.cpp @@ -94,7 +94,8 @@ QSourceLocation::~QSourceLocation() } /*! - Returns true if this QSourceLocation is identical to \a other. + Returns \c true if this QSourceLocation is equal to \a other; \c false + otherwise. Two QSourceLocation instances are equal if their uri(), line() and column() are equal. @@ -110,12 +111,12 @@ bool QSourceLocation::operator==(const QSourceLocation &other) const } /*! - Returns the opposite of applying operator==() for this QXmlName - and \a other. + Returns \c true if this QSourceLocation is not equal to \a other; \c false + otherwise. */ bool QSourceLocation::operator!=(const QSourceLocation &other) const { - return operator==(other); + return !operator==(other); } /*! diff --git a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp index 984da1d..b5b33c7 100644 --- a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp +++ b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp @@ -186,7 +186,7 @@ void tst_QSourceLocation::equalnessOperator() const QFETCH(bool, True); QCOMPARE(v1 == v2, True); - QCOMPARE(v1 != v2, True); + QCOMPARE(v1 != v2, !True); } void tst_QSourceLocation::equalnessOperator_data() const @@ -273,7 +273,7 @@ void tst_QSourceLocation::constCorrectness() const QCOMPARE(def, def2); /* Inverse equalness operator. */ - QVERIFY(def != def2); + QVERIFY(!(def != def2)); } void tst_QSourceLocation::objectSize() const |