Changeset 613 for trunk/src/corelib/io

Timestamp:

Feb 27, 2010, 12:25:29 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib/gui: Add support for watching drive list changes (represented by the empty or null string) to the polling file system watcher and use this feature in QFileDialog to get instant drive change notifications in "My Computer".

File:

• trunk/src/corelib/io/qfilesystemwatcher.cpp (modified) (6 diffs)

trunk/src/corelib/io/qfilesystemwatcher.cpp

@@ -69 +69 @@
 QT_BEGIN_NAMESPACE
 
+
+
+
+
 class QPollingFileSystemWatcherEngine : public QFileSystemWatcherEngine
 {
@@ -113 +117 @@
     mutable QMutex mutex;
     QHash<QString, FileInfo> files, directories;
+
+
+
 
 public:
@@ -162 +169 @@
             QHash<QString, FileInfo>::iterator x = dit.next();
             QString path = x.key();
-            QFileInfo fi(path);
-            if (!path.endsWith(QLatin1Char('/')))
-                fi = QFileInfo(path + QLatin1Char('/'));
-            if (!fi.exists()) {
-                dit.remove();
-                emit directoryChanged(path, true);
-            } else if (x.value() != fi) {
-                x.value() = fi;
-                emit directoryChanged(path, false);
+#if defined(Q_OS_OS2)
+            if (path.isEmpty()) {
+                // check if we got new/changed drives
+                QFileInfoList newDrives = QDir::drives();
+                if (drives != QDir::drives()) {
+                    drives = newDrives;
+                    emit directoryChanged(QString::null, false);
+                }
+            } else
+#endif
+            {
+                QFileInfo fi(path);
+                if (!path.endsWith(QLatin1Char('/')))
+                    fi = QFileInfo(path + QLatin1Char('/'));
+                if (!fi.exists()) {
+                    dit.remove();
+                    emit directoryChanged(path, true);
+                } else if (x.value() != fi) {
+                    x.value() = fi;
+                    emit directoryChanged(path, false);
+                }
             }
             yieldCurrentThread();
@@ -195 +214 @@
     while (it.hasNext()) {
         QString path = it.next();
-        QFileInfo fi(path);
-        if (!fi.exists())
-            continue;
-        if (fi.isDir()) {
-            if (!directories->contains(path))
-                directories->append(path);
-            if (!path.endsWith(QLatin1Char('/')))
-                fi = QFileInfo(path + QLatin1Char('/'));
-            this->directories.insert(path, fi);
+#if defined(Q_OS_OS2)
+        if (path.isEmpty()) {
+            // asked to watch for drives
+            if (!directories->contains(DRIVES_ROOT))
+                directories->append(DRIVES_ROOT);
+            this->directories.insert(DRIVES_ROOT, QFileInfo());
             startOver = true;
-        } else {
-            if (!files->contains(path))
-                files->append(path);
-            this->files.insert(path, fi);
-            startOver = true;
+        } else
+#endif
+        {
+            QFileInfo fi(path);
+            if (!fi.exists())
+                continue;
+            if (fi.isDir()) {
+                if (!directories->contains(path))
+                    directories->append(path);
+                if (!path.endsWith(QLatin1Char('/')))
+                    fi = QFileInfo(path + QLatin1Char('/'));
+                this->directories.insert(path, fi);
+                startOver = true;
+            } else {
+                if (!files->contains(path))
+                    files->append(path);
+                this->files.insert(path, fi);
+                startOver = true;
+            }
         }
         it.remove();
@@ -226 +256 @@
     while (it.hasNext()) {
         QString path = it.next();
+
+
+
+
+
+
+
+
+
+
         if (this->directories.remove(path)) {
             directories->removeAll(path);
@@ -485 +525 @@
 void QFileSystemWatcher::addPath(const QString &path)
 {
+
     if (path.isEmpty()) {
         qWarning("QFileSystemWatcher::addPath: path is empty");
         return;
     }
+
     addPaths(QStringList(path));
 }