From ce2d399aecf9ffa1dd6823d088b15a73400ccbbd Mon Sep 17 00:00:00 2001
From: Sergio Martins <sergio.martins@kdab.com>
Date: Thu, 28 May 2015 13:25:04 +0100
Subject: 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>
---
 src/xmlpatterns/api/qabstractxmlnodemodel.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/xmlpatterns/api/qabstractxmlnodemodel.cpp')

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
-- 
cgit v1.2.1