Changeset 846 for trunk/src/gui/dialogs/qfileinfogatherer.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/dialogs/qfileinfogatherer.cpp (modified) (6 diffs)

trunk/src/gui/dialogs/qfileinfogatherer.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -56 +56 @@
 #ifndef QT_NO_FILESYSTEMMODEL
 
-bool QFileInfoGatherer::fetchedRoot = false;
+#ifdef QT_BUILD_INTERNAL
+static bool fetchedRoot = false;
+Q_AUTOTEST_EXPORT void qt_test_resetFetchedRoot()
+{
+    fetchedRoot = false;
+}
+
+Q_AUTOTEST_EXPORT bool qt_test_isFetchedRoot()
+{
+    return fetchedRoot;
+}
+#endif
 
 /*!
@@ -217 +228 @@
 }
 
-/*
-    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
@@ -310 +290 @@
     // List drives
     if (path.isEmpty()) {
-#if defined Q_AUTOTEST_EXPORT
+#ifdef QT_BUILD_INTERNAL
         fetchedRoot = true;
 #endif
@@ -329 +309 @@
     }
 
-    QTime base = QTime::currentTime();
+    QElapsedTimer base;
+    base.start();
     QFileInfo fileInfo;
     bool firstTime = true;
@@ -355 +336 @@
     if (!updatedFiles.isEmpty())
         emit updates(path, updatedFiles);
-}
-
-void QFileInfoGatherer::fetch(const QFileInfo &fileInfo, QTime &base, bool &firstTime, QList<QPair<QString, QFileInfo> > &updatedFiles, const QString &path) {
+    emit directoryLoaded(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);