diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/itemviews/qdirmodel.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/widgets/itemviews/qdirmodel.cpp b/src/widgets/itemviews/qdirmodel.cpp index f18233b64c..8a7ab3c63c 100644 --- a/src/widgets/itemviews/qdirmodel.cpp +++ b/src/widgets/itemviews/qdirmodel.cpp @@ -34,7 +34,6 @@ #include "qdirmodel.h" #ifndef QT_NO_DIRMODEL -#include <qstack.h> #include <qfile.h> #include <qfilesystemmodel.h> #include <qurl.h> @@ -49,6 +48,9 @@ #include <private/qabstractitemmodel_p.h> #include <qdebug.h> +#include <stack> +#include <vector> + /*! \enum QDirModel::Roles \value FileIconRole @@ -163,10 +165,11 @@ void QDirModelPrivate::clear(QDirNode *parent) const void QDirModelPrivate::invalidate() { - QStack<const QDirNode*> nodes; + std::stack<const QDirNode*, std::vector<const QDirNode*> > nodes; nodes.push(&root); while (!nodes.empty()) { - const QDirNode *current = nodes.pop(); + const QDirNode *current = nodes.top(); + nodes.pop(); current->stat = false; const QVector<QDirNode> &children = current->children; for (const auto &child : children) |