diff options
author | Sergio Martins <sergio.martins@kdab.com> | 2015-05-28 13:25:04 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2015-05-30 15:33:50 +0000 |
commit | ce2d399aecf9ffa1dd6823d088b15a73400ccbbd (patch) | |
tree | 510f1b1a063aaf5c9b819bd0f16fb6a0c522e67a | |
parent | 4a6ce5c34b65df043df36c46ba03a45e36ff0c95 (diff) | |
download | qtxmlpatterns-ce2d399aecf9ffa1dd6823d088b15a73400ccbbd.tar.gz |
Make MergeIterator a trivial global static.
No need to initialize it before main.
Change-Id: I2ebc9a2b04a58275570e967c17ace9028f11d5ba
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
-rw-r--r-- | src/xmlpatterns/api/qabstractxmlnodemodel.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp index 1779454..f419eb5 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp @@ -441,9 +441,6 @@ namespace QPatternist class MergeIterator { public: - inline MergeIterator() - { - } inline QXmlNodeModelIndexIteratorPointer @@ -452,12 +449,9 @@ namespace QPatternist { return it; } - - private: - Q_DISABLE_COPY(MergeIterator) }; - static const MergeIterator mergeIterator; + static const MergeIterator mergeIterator = {}; /** * One might wonder, why not use makeVectorIterator() directly on a QVector |