diff options
Diffstat (limited to 'src/corelib/io/qresource.cpp')
-rw-r--r-- | src/corelib/io/qresource.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 6671333ffb..0674ef34e0 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -35,7 +35,6 @@ #include "qresource_p.h" #include "qresource_iterator_p.h" #include "qset.h" -#include "qhash.h" #include "qmutex.h" #include "qdebug.h" #include "qlocale.h" @@ -791,6 +790,7 @@ QStringList QResourceRoot::children(int node) const offset += 4; const int child_off = (tree[offset+0] << 24) + (tree[offset+1] << 16) + (tree[offset+2] << 8) + (tree[offset+3] << 0); + ret.reserve(child_count); for(int i = child_off; i < child_off+child_count; ++i) ret << name(i); } @@ -800,8 +800,8 @@ bool QResourceRoot::mappingRootSubdir(const QString &path, QString *match) const { const QString root = mappingRoot(); if(!root.isEmpty()) { - const QStringList root_segments = root.split(QLatin1Char('/'), QString::SkipEmptyParts), - path_segments = path.split(QLatin1Char('/'), QString::SkipEmptyParts); + const QVector<QStringRef> root_segments = root.splitRef(QLatin1Char('/'), QString::SkipEmptyParts), + path_segments = path.splitRef(QLatin1Char('/'), QString::SkipEmptyParts); if(path_segments.size() <= root_segments.size()) { int matched = 0; for(int i = 0; i < path_segments.size(); ++i) { @@ -811,7 +811,7 @@ bool QResourceRoot::mappingRootSubdir(const QString &path, QString *match) const } if(matched == path_segments.size()) { if(match && root_segments.size() > matched) - *match = root_segments.at(matched); + *match = root_segments.at(matched).toString(); return true; } } |