--- a/src/gui/dialogs/qfileinfogatherer_p.h	Wed Jun 23 19:07:03 2010 +0300
+++ b/src/gui/dialogs/qfileinfogatherer_p.h	Tue Jul 06 15:10:48 2010 +0300
@@ -60,9 +60,10 @@
 #include <qfileiconprovider.h>
 #include <qfsfileengine.h>
 #include <qpair.h>
+#include <qstack.h>
 #include <qdatetime.h>
-#include <qstack.h>
 #include <qdir.h>
+#include <qelapsedtimer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -88,11 +89,7 @@
         return fe.caseSensitive();
     }
     QFile::Permissions permissions() const {
-        return mPermissions;
-    }
-
-    void setPermissions (QFile::Permissions permissions) {
-        mPermissions = permissions;
+        return mFileInfo.permissions();
     }
 
     Type type() const {
@@ -140,7 +137,6 @@
 
 private :
     QFileInfo mFileInfo;
-    QFile::Permissions mPermissions;
 };
 
 class QFileIconProvider;
@@ -155,6 +151,7 @@
     void updates(const QString &directory, const QList<QPair<QString, QFileInfo> > &updates);
     void newListOfFiles(const QString &directory, const QStringList &listOfFiles) const;
     void nameResolved(const QString &fileName, const QString &resolvedName) const;
+    void directoryLoaded(const QString &path);
 
 public:
     QFileInfoGatherer(QObject *parent = 0);
@@ -178,9 +175,8 @@
     void getFileInfos(const QString &path, const QStringList &files);
 
 private:
-    void fetch(const QFileInfo &info, QTime &base, bool &firstTime, QList<QPair<QString, QFileInfo> > &updatedFiles, const QString &path);
+    void fetch(const QFileInfo &info, QElapsedTimer &base, bool &firstTime, QList<QPair<QString, QFileInfo> > &updatedFiles, const QString &path);
     QString translateDriveName(const QFileInfo &drive) const;
-    QFile::Permissions translatePermissions(const QFileInfo &fileInfo) const;
 
     QMutex mutex;
     QWaitCondition condition;
@@ -199,9 +195,6 @@
     uint userId;
     uint groupId;
 #endif
-public :
-    //for testing purpose
-    static bool fetchedRoot;
 };
 #endif // QT_NO_FILESYSTEMMODEL