Changeset 613

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".

Location:

trunk/src

Files:

• corelib/io/qfilesystemwatcher.cpp (modified) (6 diffs)
• gui/dialogs/qfileinfogatherer.cpp (modified) (1 diff)

trunk/src/corelib/io/qfilesystemwatcher.cpp

@@ -69 +69 @@
 QT_BEGIN_NAMESPACE
 
+#if defined(Q_OS_OS2)
+#  define DRIVES_ROOT QString::null
+#endif
+
 class QPollingFileSystemWatcherEngine : public QFileSystemWatcherEngine
 {
@@ -113 +117 @@
     mutable QMutex mutex;
     QHash<QString, FileInfo> files, directories;
+#if defined(Q_OS_OS2)
+    QFileInfoList drives;
+#endif
 
 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 defined(Q_OS_OS2)
+        if (path.isEmpty()) {
+            // asked to stop watching for drives
+            if (this->directories.remove(DRIVES_ROOT)) {
+                directories->removeAll(DRIVES_ROOT);
+                it.remove();
+                startOver = true;
+            }
+        } else
+#endif
         if (this->directories.remove(path)) {
             directories->removeAll(path);
@@ -485 +525 @@
 void QFileSystemWatcher::addPath(const QString &path)
 {
+#if !defined(Q_OS_OS2)
     if (path.isEmpty()) {
         qWarning("QFileSystemWatcher::addPath: path is empty");
         return;
     }
+#endif
     addPaths(QStringList(path));
 }

trunk/src/gui/dialogs/qfileinfogatherer.cpp

@@ -302 +302 @@
     if (files.isEmpty()
         && !watcher->directories().contains(path)
+#if !defined(Q_OS_OS2)
         && !path.isEmpty()
+#endif
         && !path.startsWith(QLatin1String("//")) /*don't watch UNC path*/) {
         watcher->addPath(path);