1 files changed, 102 insertions, 183 deletions

diff --git a/src/qml/qml/ftw/qintrusivelist_p.h b/src/qml/qml/ftw/qintrusivelist_p.h
index 0d4e428fa0..1170370fae 100644
--- a/src/qml/qml/ftw/qintrusivelist_p.h
+++ b/src/qml/qml/ftw/qintrusivelist_p.h
@@ -19,221 +19,140 @@
 
 QT_BEGIN_NAMESPACE
 
-class QIntrusiveListNode;
-template<class N, QIntrusiveListNode N::*member>
-class QIntrusiveList
+class QIntrusiveListNode
 {
 public:
-    inline QIntrusiveList();
-    inline ~QIntrusiveList();
-
-    inline bool isEmpty() const;
-    inline void insert(N *n);
-    inline void remove(N *n);
-    inline bool contains(N *) const;
-
-    class iterator {
-    public:
-        inline iterator();
-        inline iterator(N *value);
-
-        inline N *operator*() const;
-        inline N *operator->() const;
-        inline bool operator==(const iterator &other) const;
-        inline bool operator!=(const iterator &other) const;
-        inline iterator &operator++();
-
-        inline iterator &erase();
-
-    private:
-        N *_value;
-    };
-    typedef iterator Iterator;
-
-    inline N *first() const;
-    static inline N *next(N *current);
+    ~QIntrusiveListNode() { remove(); }
+
+    void remove()
+    {
+        if (_prev) *_prev = _next;
+        if (_next) _next->_prev = _prev;
+        _prev = nullptr;
+        _next = nullptr;
+    }
 
-    inline iterator begin();
-    inline iterator end();
+    bool isInList() const { return _prev != nullptr; }
 
 private:
-    static inline N *nodeToN(QIntrusiveListNode *node);
-
-    QIntrusiveListNode *__first = nullptr;
-};
-
-class QIntrusiveListNode
-{
-public:
-    inline QIntrusiveListNode();
-    inline ~QIntrusiveListNode();
-
-    inline void remove();
-    inline bool isInList() const;
+    template<class N, QIntrusiveListNode N::*member>
+    friend class QIntrusiveList;
 
     QIntrusiveListNode *_next = nullptr;
     QIntrusiveListNode**_prev = nullptr;
 };
 
 template<class N, QIntrusiveListNode N::*member>
-QIntrusiveList<N, member>::iterator::iterator()
-: _value(nullptr)
-{
-}
-
-template<class N, QIntrusiveListNode N::*member>
-QIntrusiveList<N, member>::iterator::iterator(N *value)
-: _value(value)
-{
-}
-
-template<class N, QIntrusiveListNode N::*member>
-N *QIntrusiveList<N, member>::iterator::operator*() const
-{
-    return _value;
-}
-
-template<class N, QIntrusiveListNode N::*member>
-N *QIntrusiveList<N, member>::iterator::operator->() const
-{
-    return _value;
-}
-
-template<class N, QIntrusiveListNode N::*member>
-bool QIntrusiveList<N, member>::iterator::operator==(const iterator &other) const
+class QIntrusiveList
 {
-    return other._value == _value;
-}
+private:
+    template<typename O>
+    class iterator_impl {
+    public:
+        iterator_impl() = default;
+        iterator_impl(O value) : _value(value) {}
+
+        O operator*() const { return _value; }
+        O operator->() const { return _value; }
+        bool operator==(const iterator_impl &other) const { return other._value == _value; }
+        bool operator!=(const iterator_impl &other) const { return other._value != _value; }
+        iterator_impl &operator++()
+        {
+            _value = QIntrusiveList<N, member>::next(_value);
+            return *this;
+        }
+
+    protected:
+        O _value = nullptr;
+    };
 
-template<class N, QIntrusiveListNode N::*member>
-bool QIntrusiveList<N, member>::iterator::operator!=(const iterator &other) const
-{
-    return other._value != _value;
-}
+public:
+    class iterator : public iterator_impl<N *>
+    {
+    public:
+        iterator() = default;
+        iterator(N *value) : iterator_impl<N *>(value) {}
+
+        iterator &erase()
+        {
+            N *old = this->_value;
+            this->_value = QIntrusiveList<N, member>::next(this->_value);
+            (old->*member).remove();
+            return *this;
+        }
+    };
 
-template<class N, QIntrusiveListNode N::*member>
-typename QIntrusiveList<N, member>::iterator &QIntrusiveList<N, member>::iterator::operator++()
-{
-    _value = QIntrusiveList<N, member>::next(_value);
-    return *this;
-}
+    using const_iterator = iterator_impl<const N *>;
 
-template<class N, QIntrusiveListNode N::*member>
-typename QIntrusiveList<N, member>::iterator &QIntrusiveList<N, member>::iterator::erase()
-{
-    N *old = _value;
-    _value = QIntrusiveList<N, member>::next(_value);
-    (old->*member).remove();
-    return *this;
-}
+    using Iterator = iterator;
+    using ConstIterator = const_iterator;
 
-template<class N, QIntrusiveListNode N::*member>
-QIntrusiveList<N, member>::QIntrusiveList()
+    ~QIntrusiveList() { while (__first) __first->remove(); }
 
-{
-}
+    bool isEmpty() const { return __first == nullptr; }
 
-template<class N, QIntrusiveListNode N::*member>
-QIntrusiveList<N, member>::~QIntrusiveList()
-{
-    while (__first) __first->remove();
-}
+    void insert(N *n)
+    {
+        QIntrusiveListNode *nnode = &(n->*member);
+        nnode->remove();
 
-template<class N, QIntrusiveListNode N::*member>
-bool QIntrusiveList<N, member>::isEmpty() const
-{
-    return __first == nullptr;
-}
+        nnode->_next = __first;
+        if (nnode->_next) nnode->_next->_prev = &nnode->_next;
+        __first = nnode;
+        nnode->_prev = &__first;
+    }
 
-template<class N, QIntrusiveListNode N::*member>
-void QIntrusiveList<N, member>::insert(N *n)
-{
-    QIntrusiveListNode *nnode = &(n->*member);
-    nnode->remove();
+    void remove(N *n)
+    {
+        QIntrusiveListNode *nnode = &(n->*member);
+        nnode->remove();
+    }
 
-    nnode->_next = __first;
-    if (nnode->_next) nnode->_next->_prev = &nnode->_next;
-    __first = nnode;
-    nnode->_prev = &__first;
-}
+    bool contains(const N *n) const
+    {
+        QIntrusiveListNode *nnode = __first;
+        while (nnode) {
+            if (nodeToN(nnode) == n)
+                return true;
+            nnode = nnode->_next;
+        }
+        return false;
+    }
 
-template<class N, QIntrusiveListNode N::*member>
-void QIntrusiveList<N, member>::remove(N *n)
-{
-    QIntrusiveListNode *nnode = &(n->*member);
-    nnode->remove();
-}
+    const N *first() const { return __first ? nodeToN(__first) : nullptr; }
+    N *first() { return __first ? nodeToN(__first) : nullptr; }
 
-template<class N, QIntrusiveListNode N::*member>
-bool QIntrusiveList<N, member>::contains(N *n) const
-{
-    QIntrusiveListNode *nnode = __first;
-    while (nnode) {
-        if (nodeToN(nnode) == n)
-            return true;
-        nnode = nnode->_next;
+    template<typename O>
+    static O next(O current)
+    {
+        QIntrusiveListNode *nextnode = (current->*member)._next;
+        return nextnode ? nodeToN(nextnode) : nullptr;
     }
-    return false;
-}
 
-template<class N, QIntrusiveListNode N::*member>
-N *QIntrusiveList<N, member>::first() const
-{
-    return __first?nodeToN(__first):nullptr;
-}
+    iterator begin() { return __first ? iterator(nodeToN(__first)) : iterator(); }
+    iterator end() { return iterator(); }
 
-template<class N, QIntrusiveListNode N::*member>
-N *QIntrusiveList<N, member>::next(N *current)
-{
-    QIntrusiveListNode *nextnode = (current->*member)._next;
-    N *nextstruct = nextnode?nodeToN(nextnode):nullptr;
-    return nextstruct;
-}
+    const_iterator begin() const
+    {
+        return __first ? const_iterator(nodeToN(__first)) : const_iterator();
+    }
 
-template<class N, QIntrusiveListNode N::*member>
-typename QIntrusiveList<N, member>::iterator QIntrusiveList<N, member>::begin()
-{
-    return __first?iterator(nodeToN(__first)):iterator();
-}
+    const_iterator end() const { return const_iterator(); }
 
-template<class N, QIntrusiveListNode N::*member>
-typename QIntrusiveList<N, member>::iterator QIntrusiveList<N, member>::end()
-{
-    return iterator();
-}
+private:
 
-template<class N, QIntrusiveListNode N::*member>
-N *QIntrusiveList<N, member>::nodeToN(QIntrusiveListNode *node)
-{
-    QT_WARNING_PUSH
+    static N *nodeToN(QIntrusiveListNode *node)
+    {
+        QT_WARNING_PUSH
 #if defined(Q_CC_CLANG) && Q_CC_CLANG >= 1300
-    QT_WARNING_DISABLE_CLANG("-Wnull-pointer-subtraction")
+        QT_WARNING_DISABLE_CLANG("-Wnull-pointer-subtraction")
 #endif
-    return (N *)((char *)node - ((char *)&(((N *)nullptr)->*member) - (char *)nullptr));
-    QT_WARNING_POP
-}
-
-QIntrusiveListNode::QIntrusiveListNode()
-{
-}
-
-QIntrusiveListNode::~QIntrusiveListNode()
-{
-    remove();
-}
-
-void QIntrusiveListNode::remove()
-{
-    if (_prev) *_prev = _next;
-    if (_next) _next->_prev = _prev;
-    _prev = nullptr;
-    _next = nullptr;
-}
+        return (N *)((char *)node - ((char *)&(((N *)nullptr)->*member) - (char *)nullptr));
+        QT_WARNING_POP
+    }
 
-bool QIntrusiveListNode::isInList() const
-{
-    return _prev != nullptr;
-}
+    QIntrusiveListNode *__first = nullptr;
+};
 
 QT_END_NAMESPACE