diff options
| author | mread <qt-info@nokia.com> | 2009-08-10 08:37:48 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-10 08:37:48 (GMT) |
| commit | 921eaf6bf3a1420ff9ce8f797c60247da80110ab (patch) | |
| tree | 54a201572b760e725f4ea4df71366e574d5eb6b0 /src/corelib | |
| parent | 5a72890b7ce12815f9567316da867006cff73f39 (diff) | |
| download | Qt-921eaf6bf3a1420ff9ce8f797c60247da80110ab.zip Qt-921eaf6bf3a1420ff9ce8f797c60247da80110ab.tar.gz Qt-921eaf6bf3a1420ff9ce8f797c60247da80110ab.tar.bz2 | |
moved declaration of engine to better match merge and to remove warning
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qdiriterator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index a91c112..2039827 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -124,6 +124,8 @@ public: void checkAndPushDirectory(const QFileInfo &); bool matchesFilters(const QString &fileName, const QFileInfo &fi) const; + QScopedPointer<QAbstractFileEngine> engine; + const QString path; const QStringList nameFilters; const QDir::Filters filters; @@ -133,7 +135,6 @@ public: QVector<QRegExp> nameRegExps; #endif - QScopedPointer<QAbstractFileEngine> engine; QDirIteratorPrivateIteratorStack fileEngineIterators; QFileInfo currentFileInfo; QFileInfo nextFileInfo; |