Changeset 626 for trunk/src/corelib

Timestamp:

Mar 3, 2010, 11:18:36 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

Reverted r613 (see #137).

File:

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

trunk/src/corelib/io/qfilesystemwatcher.cpp

@@ -71 +71 @@
 QT_BEGIN_NAMESPACE
 
-#if defined(Q_OS_OS2)
-#  define DRIVES_ROOT QString::null
-#endif
-
 class QPollingFileSystemWatcherEngine : public QFileSystemWatcherEngine
 {
@@ -119 +115 @@
     mutable QMutex mutex;
     QHash<QString, FileInfo> files, directories;
-#if defined(Q_OS_OS2)
-    QFileInfoList drives;
-#endif
 
 public:
@@ -171 +164 @@
             QHash<QString, FileInfo>::iterator x = dit.next();
             QString path = x.key();
-#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);
-                }
+            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();
@@ -216 +197 @@
     while (it.hasNext()) {
         QString path = it.next();
-#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());
+        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
-#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;
-            }
+        } else {
+            if (!files->contains(path))
+                files->append(path);
+            this->files.insert(path, fi);
+            startOver = true;
         }
         it.remove();
@@ -258 +228 @@
     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);
@@ -533 +493 @@
 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));
 }