summaryrefslogtreecommitdiffstats
path: root/src/linguist/shared/qmakeevaluator.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2019-05-23 15:21:53 +0200
committerMarc Mutz <marc.mutz@kdab.com>2019-05-23 15:21:53 +0200
commitf377c9ce92be7f5ef82abbf585d88dd9f46a8811 (patch)
tree96f4bcf0a5d9a11e2d02d77a7685b6abbb1a35f8 /src/linguist/shared/qmakeevaluator.h
parent770ef38581c95df9c8bf378e8446ecd2df91e549 (diff)
qmake: use std names on a linked list
This is preparation of moving from QLinkedList to std::list, which is in preparation of deprecating QLinkedList. This applies the relevant parts of qtbase/0d88721d772fd995a39cc2417a2a0dabee403b7d. Change-Id: Ia5a6d592bbf8401abaedbecf59d886502cc644f4 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/linguist/shared/qmakeevaluator.h')
-rw-r--r--src/linguist/shared/qmakeevaluator.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/linguist/shared/qmakeevaluator.h b/src/linguist/shared/qmakeevaluator.h
index 83adda3f6..6df448c71 100644
--- a/src/linguist/shared/qmakeevaluator.h
+++ b/src/linguist/shared/qmakeevaluator.h
@@ -99,10 +99,10 @@ public:
class QMAKE_EXPORT ProValueMapStack : public QLinkedList<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(); }
};
namespace QMakeInternal { struct QMakeBuiltin; }