QFileSystem{Model,Watcher}: port to PMF signal/slot syntax

Also remove the `_q_` prefix from private slot names, it was needed to
mark them as being used with Q_PRIVATE_SLOT, which is also gone in this
commit.

Drive-by change: de-duplicate some code.

Change-Id: Ib41d0ac24ae584746751c0c2b5c477f600627db1
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>

3 files changed, 30 insertions, 39 deletions

diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp
index 9ffbe31d3d..7138f8260b 100644
--- a/src/corelib/io/qfilesystemwatcher.cpp
+++ b/src/corelib/io/qfilesystemwatcher.cpp
@@ -58,29 +58,29 @@ QFileSystemWatcherPrivate::QFileSystemWatcherPrivate()
 {
 }
 
+void QFileSystemWatcherPrivate::connectEngine(QFileSystemWatcherEngine *engine)
+{
+    QObjectPrivate::connect(engine, &QFileSystemWatcherEngine::fileChanged,
+                            this, &QFileSystemWatcherPrivate::fileChanged);
+    QObjectPrivate::connect(engine, &QFileSystemWatcherEngine::directoryChanged,
+                            this, &QFileSystemWatcherPrivate::directoryChanged);
+}
+
 void QFileSystemWatcherPrivate::init()
 {
     Q_Q(QFileSystemWatcher);
     native = createNativeEngine(q);
     if (native) {
-        QObject::connect(native,
-                         SIGNAL(fileChanged(QString,bool)),
-                         q,
-                         SLOT(_q_fileChanged(QString,bool)));
-        QObject::connect(native,
-                         SIGNAL(directoryChanged(QString,bool)),
-                         q,
-                         SLOT(_q_directoryChanged(QString,bool)));
+        connectEngine(native);
 #if defined(Q_OS_WIN)
-        QObject::connect(static_cast<QWindowsFileSystemWatcherEngine *>(native),
-                         &QWindowsFileSystemWatcherEngine::driveLockForRemoval,
-                         q, [this] (const QString &p) { _q_winDriveLockForRemoval(p); });
-        QObject::connect(static_cast<QWindowsFileSystemWatcherEngine *>(native),
-                         &QWindowsFileSystemWatcherEngine::driveLockForRemovalFailed,
-                         q, [this] (const QString &p) { _q_winDriveLockForRemovalFailed(p); });
-        QObject::connect(static_cast<QWindowsFileSystemWatcherEngine *>(native),
-                         &QWindowsFileSystemWatcherEngine::driveRemoved,
-                         q, [this] (const QString &p) { _q_winDriveRemoved(p); });
+        auto *windowsWatcher = static_cast<QWindowsFileSystemWatcherEngine *>(native);
+        using WinE = QWindowsFileSystemWatcherEngine;
+        QObjectPrivate::connect(windowsWatcher, &WinE::driveLockForRemoval,
+                                this, &QFileSystemWatcherPrivate::winDriveLockForRemoval);
+        QObjectPrivate::connect(windowsWatcher, &WinE::driveLockForRemovalFailed,
+                                this, &QFileSystemWatcherPrivate::winDriveLockForRemovalFailed);
+        QObjectPrivate::connect(windowsWatcher, &WinE::driveRemoved,
+                                this, &QFileSystemWatcherPrivate::winDriveRemoved);
 #endif  // Q_OS_WIN
     }
 }
@@ -92,17 +92,10 @@ void QFileSystemWatcherPrivate::initPollerEngine()
 
     Q_Q(QFileSystemWatcher);
     poller = new QPollingFileSystemWatcherEngine(q); // that was a mouthful
-    QObject::connect(poller,
-                     SIGNAL(fileChanged(QString,bool)),
-                     q,
-                     SLOT(_q_fileChanged(QString,bool)));
-    QObject::connect(poller,
-                     SIGNAL(directoryChanged(QString,bool)),
-                     q,
-                     SLOT(_q_directoryChanged(QString,bool)));
+    connectEngine(poller);
 }
 
-void QFileSystemWatcherPrivate::_q_fileChanged(const QString &path, bool removed)
+void QFileSystemWatcherPrivate::fileChanged(const QString &path, bool removed)
 {
     Q_Q(QFileSystemWatcher);
     qCDebug(lcWatcher) << "file changed" << path << "removed?" << removed << "watching?" << files.contains(path);
@@ -115,7 +108,7 @@ void QFileSystemWatcherPrivate::_q_fileChanged(const QString &path, bool removed
     emit q->fileChanged(path, QFileSystemWatcher::QPrivateSignal());
 }
 
-void QFileSystemWatcherPrivate::_q_directoryChanged(const QString &path, bool removed)
+void QFileSystemWatcherPrivate::directoryChanged(const QString &path, bool removed)
 {
     Q_Q(QFileSystemWatcher);
     qCDebug(lcWatcher) << "directory changed" << path << "removed?" << removed << "watching?" << directories.contains(path);
@@ -130,7 +123,7 @@ void QFileSystemWatcherPrivate::_q_directoryChanged(const QString &path, bool re
 
 #if defined(Q_OS_WIN)
 
-void QFileSystemWatcherPrivate::_q_winDriveLockForRemoval(const QString &path)
+void QFileSystemWatcherPrivate::winDriveLockForRemoval(const QString &path)
 {
     // Windows: Request to lock a (removable/USB) drive for removal, release
     // its paths under watch, temporarily storing them should the lock fail.
@@ -147,7 +140,7 @@ void QFileSystemWatcherPrivate::_q_winDriveLockForRemoval(const QString &path)
     }
 }
 
-void QFileSystemWatcherPrivate::_q_winDriveLockForRemovalFailed(const QString &path)
+void QFileSystemWatcherPrivate::winDriveLockForRemovalFailed(const QString &path)
 {
     // Windows: Request to lock a (removable/USB) drive failed (blocked by other
     // application), restore the watched paths.
@@ -161,7 +154,7 @@ void QFileSystemWatcherPrivate::_q_winDriveLockForRemovalFailed(const QString &p
     }
 }
 
-void  QFileSystemWatcherPrivate::_q_winDriveRemoved(const QString &path)
+void  QFileSystemWatcherPrivate::winDriveRemoved(const QString &path)
 {
     // Windows: Drive finally removed, clear out paths stored in lock request.
     if (!path.isEmpty())
diff --git a/src/corelib/io/qfilesystemwatcher.h b/src/corelib/io/qfilesystemwatcher.h
index f5400bc9d8..668bc143b2 100644
--- a/src/corelib/io/qfilesystemwatcher.h
+++ b/src/corelib/io/qfilesystemwatcher.h
@@ -34,10 +34,6 @@ public:
 Q_SIGNALS:
     void fileChanged(const QString &path, QPrivateSignal);
     void directoryChanged(const QString &path, QPrivateSignal);
-
-private:
-    Q_PRIVATE_SLOT(d_func(), void _q_fileChanged(const QString &path, bool removed))
-    Q_PRIVATE_SLOT(d_func(), void _q_directoryChanged(const QString &path, bool removed))
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/io/qfilesystemwatcher_p.h b/src/corelib/io/qfilesystemwatcher_p.h
index 34fef20704..c34e3e2408 100644
--- a/src/corelib/io/qfilesystemwatcher_p.h
+++ b/src/corelib/io/qfilesystemwatcher_p.h
@@ -69,13 +69,15 @@ public:
     QStringList files, directories;
 
     // private slots
-    void _q_fileChanged(const QString &path, bool removed);
-    void _q_directoryChanged(const QString &path, bool removed);
+    void fileChanged(const QString &path, bool removed);
+    void directoryChanged(const QString &path, bool removed);
+
+    void connectEngine(QFileSystemWatcherEngine *e);
 
 #if defined(Q_OS_WIN)
-    void _q_winDriveLockForRemoval(const QString &);
-    void _q_winDriveLockForRemovalFailed(const QString &);
-    void _q_winDriveRemoved(const QString &);
+    void winDriveLockForRemoval(const QString &);
+    void winDriveLockForRemovalFailed(const QString &);
+    void winDriveRemoved(const QString &);
 
 private:
     QHash<QChar, QStringList> temporarilyRemovedPaths;