1 files changed, 6 insertions, 34 deletions

diff --git a/src/gui/dialogs/qfileinfogatherer.cpp b/src/gui/dialogs/qfileinfogatherer.cpp
index 1f61957..3b279ae 100644
--- a/src/gui/dialogs/qfileinfogatherer.cpp
+++ b/src/gui/dialogs/qfileinfogatherer.cpp
@@ -216,41 +216,10 @@ void QFileInfoGatherer::run()
     }
 }
 
-/*
-    QFileInfo::permissions is different depending upon your platform.
-
-    "normalize this" so they can mean the same to us.
-*/
-QFile::Permissions QFileInfoGatherer::translatePermissions(const QFileInfo &fileInfo) const {
-    QFile::Permissions permissions = fileInfo.permissions();
-#ifdef Q_OS_WIN
-    return permissions;
-#else
-    QFile::Permissions p = permissions;
-    p &= ~(QFile::ReadUser|QFile::WriteUser|QFile::ExeUser);
-    if (                                     permissions & QFile::ReadOther
-        || (fileInfo.ownerId() == userId  && permissions & QFile::ReadOwner)
-        || (fileInfo.groupId() == groupId && permissions & QFile::ReadGroup))
-        p |= QFile::ReadUser;
-
-    if (                                     permissions & QFile::WriteOther
-        || (fileInfo.ownerId() == userId  && permissions & QFile::WriteOwner)
-        || (fileInfo.groupId() == groupId && permissions & QFile::WriteGroup))
-        p |= QFile::WriteUser;
-
-    if (                                     permissions & QFile::ExeOther
-        || (fileInfo.ownerId() == userId  && permissions & QFile::ExeOwner)
-        || (fileInfo.groupId() == groupId && permissions & QFile::ExeGroup))
-        p |= QFile::ExeUser;
-    return p;
-#endif
-}
-
 QExtendedInformation QFileInfoGatherer::getInfo(const QFileInfo &fileInfo) const
 {
     QExtendedInformation info(fileInfo);
     info.icon = m_iconProvider->icon(fileInfo);
-    info.setPermissions(translatePermissions(fileInfo));
     info.displayType = m_iconProvider->type(fileInfo);
 #ifndef QT_NO_FILESYSTEMWATCHER
     // ### Not ready to listen all modifications
@@ -328,7 +297,8 @@ void QFileInfoGatherer::getFileInfos(const QString &path, const QStringList &fil
         return;
     }
 
-    QTime base = QTime::currentTime();
+    QElapsedTimer base;
+    base.start();
     QFileInfo fileInfo;
     bool firstTime = true;
     QList<QPair<QString, QFileInfo> > updatedFiles;
@@ -354,11 +324,13 @@ void QFileInfoGatherer::getFileInfos(const QString &path, const QStringList &fil
     }
     if (!updatedFiles.isEmpty())
         emit updates(path, updatedFiles);
+    emit directoryLoaded(path);
 }
 
-void QFileInfoGatherer::fetch(const QFileInfo &fileInfo, QTime &base, bool &firstTime, QList<QPair<QString, QFileInfo> > &updatedFiles, const QString &path) {
+void QFileInfoGatherer::fetch(const QFileInfo &fileInfo, QElapsedTimer &base, bool &firstTime, QList<QPair<QString, QFileInfo> > &updatedFiles, const QString &path) {
     updatedFiles.append(QPair<QString, QFileInfo>(fileInfo.fileName(), fileInfo));
-    QTime current = QTime::currentTime();
+    QElapsedTimer current;
+    current.start();
     if ((firstTime && updatedFiles.count() > 100) || base.msecsTo(current) > 1000) {
         emit updates(path, updatedFiles);
         updatedFiles.clear();