From db7c1c6770fff906ce6f21e463fd699de140f75d Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Wed, 18 Jan 2023 15:49:57 +0100
Subject: Utils: add Q_LOGGING_CATEGORY(fileSystemWatcher)

Change-Id: I554c50a47197a6a9a84427b62a528d87b9db5f19
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/libs/utils/filesystemwatcher.cpp | 54 ++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'src/libs/utils/filesystemwatcher.cpp')

diff --git a/src/libs/utils/filesystemwatcher.cpp b/src/libs/utils/filesystemwatcher.cpp
index 8a73753afd..8ff544c671 100644
--- a/src/libs/utils/filesystemwatcher.cpp
+++ b/src/libs/utils/filesystemwatcher.cpp
@@ -4,12 +4,10 @@
 #include "filesystemwatcher.h"
 #include "globalfilechangeblocker.h"
 
-#include <QDebug>
 #include <QDir>
 #include <QFileSystemWatcher>
 #include <QDateTime>
-
-enum { debug = 0 };
+#include <QLoggingCategory>
 
 // Returns upper limit of file handles that can be opened by this process at
 // once. (which is limited on MacOS, exceeding it will probably result in
@@ -61,6 +59,8 @@ static inline quint64 getFileLimit()
 
 namespace Utils {
 
+static Q_LOGGING_CATEGORY(fileSystemWatcherLog, "qtc.utils.filesystemwatcher", QtDebugMsg)
+
 // Centralized file watcher static data per integer id.
 class FileSystemWatcherStaticData
 {
@@ -214,8 +214,8 @@ void FileSystemWatcher::init()
 
     if (!d->m_staticData->m_watcher) {
         d->m_staticData->m_watcher = new QFileSystemWatcher();
-        if (debug)
-            qDebug() << this << "Created watcher for id " << d->m_id;
+        qCDebug(fileSystemWatcherLog)
+            << this << "Created watcher for id" << d->m_id;
     }
     ++(d->m_staticData->m_objectCount);
     connect(d->m_staticData->m_watcher, &QFileSystemWatcher::fileChanged,
@@ -233,8 +233,8 @@ FileSystemWatcher::~FileSystemWatcher()
         d->m_staticData->m_watcher = nullptr;
         d->m_staticData->m_fileCount.clear();
         d->m_staticData->m_directoryCount.clear();
-        if (debug)
-              qDebug() << this << "Deleted watcher" << d->m_id;
+        qCDebug(fileSystemWatcherLog)
+            << this << "Deleted watcher" << d->m_id;
     }
     delete d;
 }
@@ -251,10 +251,10 @@ void FileSystemWatcher::addFile(const QString &file, WatchMode wm)
 
 void FileSystemWatcher::addFiles(const QStringList &files, WatchMode wm)
 {
-    if (debug)
-        qDebug() << this << d->m_id << "addFiles mode=" << wm << files
-                 << " limit currently: " << (d->m_files.size() + d->m_directories.size())
-                 << " of " << d->m_staticData->maxFileOpen;
+    qCDebug(fileSystemWatcherLog)
+        << this << d->m_id << "addFiles mode" << wm << files
+        << "limit currently:" << (d->m_files.size() + d->m_directories.size())
+        << "of" << d->m_staticData->maxFileOpen;
     QStringList toAdd;
     for (const QString &file : files) {
         if (watchesFile(file)) {
@@ -295,8 +295,8 @@ void FileSystemWatcher::removeFile(const QString &file)
 
 void FileSystemWatcher::removeFiles(const QStringList &files)
 {
-    if (debug)
-        qDebug() << this << d->m_id << "removeFiles " << files;
+    qCDebug(fileSystemWatcherLog)
+        << this << d->m_id << "removeFiles" << files;
     QStringList toRemove;
     for (const QString &file : files) {
         const auto it = d->m_files.constFind(file);
@@ -349,10 +349,10 @@ void FileSystemWatcher::addDirectory(const QString &directory, WatchMode wm)
 
 void FileSystemWatcher::addDirectories(const QStringList &directories, WatchMode wm)
 {
-    if (debug)
-        qDebug() << this << d->m_id << "addDirectories mode " << wm << directories
-                 << " limit currently: " << (d->m_files.size() + d->m_directories.size())
-                 << " of " << d->m_staticData->maxFileOpen;
+    qCDebug(fileSystemWatcherLog)
+        << this << d->m_id << "addDirectories mode" << wm << directories
+        << "limit currently:" << (d->m_files.size() + d->m_directories.size())
+        << "of" << d->m_staticData->maxFileOpen;
     QStringList toAdd;
     for (const QString &directory : directories) {
         if (watchesDirectory(directory)) {
@@ -386,8 +386,8 @@ void FileSystemWatcher::removeDirectory(const QString &directory)
 
 void FileSystemWatcher::removeDirectories(const QStringList &directories)
 {
-    if (debug)
-        qDebug() << this << d->m_id << "removeDirectories" << directories;
+    qCDebug(fileSystemWatcherLog)
+        << this << d->m_id << "removeDirectories" << directories;
 
     QStringList toRemove;
     for (const QString &directory : directories) {
@@ -417,10 +417,10 @@ void FileSystemWatcher::slotFileChanged(const QString &path)
 {
     const auto it = d->m_files.find(path);
     if (it != d->m_files.end() && it.value().trigger(path)) {
-        if (debug)
-            qDebug() << this << "triggers on file " << path
-                     << it.value().watchMode
-                     << it.value().modifiedTime.toString(Qt::ISODate);
+        qCDebug(fileSystemWatcherLog)
+            << this << "triggers on file" << it.key()
+            << it.value().watchMode
+            << it.value().modifiedTime.toString(Qt::ISODate);
         d->fileChanged(path);
     }
 }
@@ -429,10 +429,10 @@ void FileSystemWatcher::slotDirectoryChanged(const QString &path)
 {
     const auto it = d->m_directories.find(path);
     if (it != d->m_directories.end() && it.value().trigger(path)) {
-        if (debug)
-            qDebug() << this << "triggers on dir " << path
-                     << it.value().watchMode
-                     << it.value().modifiedTime.toString(Qt::ISODate);
+        qCDebug(fileSystemWatcherLog)
+            << this << "triggers on dir" << it.key()
+            << it.value().watchMode
+            << it.value().modifiedTime.toString(Qt::ISODate);
         d->directoryChanged(path);
     }
 
-- 
cgit v1.2.1