Changeset 846 for trunk/src/gui/dialogs/qfileinfogatherer_p.h

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_p.h (modified) (7 diffs)

trunk/src/gui/dialogs/qfileinfogatherer_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -61 +61 @@
 #include <qfsfileengine.h>
 #include <qpair.h>
+
 #include <qdatetime.h>
-#include <qstack.h>
 #include <qdir.h>
+
 
 QT_BEGIN_NAMESPACE
@@ -89 +90 @@
     }
     QFile::Permissions permissions() const {
-        return mPermissions;
-    }
-
-    void setPermissions (QFile::Permissions permissions) {
-        mPermissions = permissions;
+        return mFileInfo.permissions();
     }
 
@@ -141 +138 @@
 private :
     QFileInfo mFileInfo;
-    QFile::Permissions mPermissions;
 };
 
@@ -156 +152 @@
     void newListOfFiles(const QString &directory, const QStringList &listOfFiles) const;
     void nameResolved(const QString &fileName, const QString &resolvedName) const;
+
 
 public:
@@ -179 +176 @@
 
 private:
-    void fetch(const QFileInfo &info, QTime &base, bool &firstTime, QList<QPair<QString, QFileInfo> > &updatedFiles, const QString &path);
+    void fetch(const QFileInfo &info, Q &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;
@@ -200 +196 @@
     uint groupId;
 #endif
-public :
-    //for testing purpose
-    static bool fetchedRoot;
 };
 #endif // QT_NO_FILESYSTEMMODEL