diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:08:14 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 13:59:14 +0200 |
commit | c9a4897aa09d723d22b842b1fabcc296bf3c7f91 (patch) | |
tree | 03acf263859491402be3118cc22a1959bd5a86a6 /src/xmlpatterns/api | |
parent | a5984f0a63233e0e9608ce8ab66e6d2d0e6948e3 (diff) | |
parent | 7aad4fb7bcd219badbc19b393b6d0aa6192ac8fe (diff) | |
download | qtxmlpatterns-c9a4897aa09d723d22b842b1fabcc296bf3c7f91.tar.gz |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ieff26ce785aea28ebabdec2aa3364efbd59c1456
Diffstat (limited to 'src/xmlpatterns/api')
-rw-r--r-- | src/xmlpatterns/api/qxmlname.cpp | 14 | ||||
-rw-r--r-- | src/xmlpatterns/api/qxmlname.h | 1 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/xmlpatterns/api/qxmlname.cpp b/src/xmlpatterns/api/qxmlname.cpp index 241aa5e..83b72cf 100644 --- a/src/xmlpatterns/api/qxmlname.cpp +++ b/src/xmlpatterns/api/qxmlname.cpp @@ -402,13 +402,17 @@ QString QXmlName::toClarkName(const QXmlNamePool &namePool) const } /*! + Constructs a copy of \a other. + + \sa operator=() + \since 5.9 +*/ +QXmlName::QXmlName(const QXmlName &) = default; // ### Qt 6: remove + +/*! Assigns \a other to \e this and returns \e this. */ -QXmlName &QXmlName::operator=(const QXmlName &other) -{ - m_qNameCode = other.m_qNameCode; - return *this; -} +QXmlName &QXmlName::operator=(const QXmlName &) = default; // ### Qt 6: remove /*! Returns true if \a candidate is an \c NCName. An \c NCName diff --git a/src/xmlpatterns/api/qxmlname.h b/src/xmlpatterns/api/qxmlname.h index 7dad306..0e30b4c 100644 --- a/src/xmlpatterns/api/qxmlname.h +++ b/src/xmlpatterns/api/qxmlname.h @@ -92,6 +92,7 @@ public: QString toClarkName(const QXmlNamePool &query) const; bool operator==(const QXmlName &other) const; bool operator!=(const QXmlName &other) const; + QXmlName(const QXmlName &other); QXmlName &operator=(const QXmlName &other); bool isNull() const; static bool isNCName(const QString &candidate); |