diff options
Diffstat (limited to 'src/shared/proparser/qmakeevaluator.h')
| -rw-r--r-- | src/shared/proparser/qmakeevaluator.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/shared/proparser/qmakeevaluator.h b/src/shared/proparser/qmakeevaluator.h index 7e1911501b..284acc54fd 100644 --- a/src/shared/proparser/qmakeevaluator.h +++ b/src/shared/proparser/qmakeevaluator.h @@ -34,7 +34,6 @@ #include "ioutils.h" #include <qlist.h> -#include <qlinkedlist.h> #include <qmap.h> #include <qset.h> #include <qstack.h> @@ -50,6 +49,8 @@ # include <qmutex.h> #endif +#include <list> + QT_BEGIN_NAMESPACE class QMakeGlobals; @@ -90,15 +91,15 @@ public: #endif }; -// We use a QLinkedList based stack instead of a QVector based one (QStack), so that +// We use a list-based stack instead of a vector-based one, so that // the addresses of value maps stay constant. The qmake generators rely on that. -class QMAKE_EXPORT ProValueMapStack : public QLinkedList<ProValueMap> +class QMAKE_EXPORT ProValueMapStack : public std::list<ProValueMap> { public: - inline void push(const ProValueMap &t) { append(t); } - inline ProValueMap pop() { return takeLast(); } - ProValueMap &top() { return last(); } - const ProValueMap &top() const { return last(); } + inline void push(const ProValueMap &t) { push_back(t); } + inline ProValueMap pop() { auto r = std::move(back()); pop_back(); return r; } + ProValueMap &top() { return back(); } + const ProValueMap &top() const { return back(); } }; class QMAKE_EXPORT QMakeEvaluator |