Utils: Modernize

modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
modernize-use-default-member-init
modernize-use-equals-default

Change-Id: I8d44d9405011a1878353baf9325f7af90b89db02
Reviewed-by: hjk <hjk@qt.io>

1 files changed, 11 insertions, 11 deletions

diff --git a/src/libs/utils/filesystemwatcher.cpp b/src/libs/utils/filesystemwatcher.cpp
index 96748779ebb..43044418325 100644
--- a/src/libs/utils/filesystemwatcher.cpp
+++ b/src/libs/utils/filesystemwatcher.cpp
@@ -87,32 +87,32 @@ class FileSystemWatcherStaticData
 {
 public:
     FileSystemWatcherStaticData() :
-        maxFileOpen(getFileLimit()) , m_objectCount(0), m_watcher(0) {}
+        maxFileOpen(getFileLimit()) {}
 
     quint64 maxFileOpen;
-    int m_objectCount;
+    int m_objectCount = 0;
     QHash<QString, int> m_fileCount;
     QHash<QString, int> m_directoryCount;
-    QFileSystemWatcher *m_watcher;
+    QFileSystemWatcher *m_watcher = nullptr;
 };
 
-typedef QMap<int, FileSystemWatcherStaticData> FileSystemWatcherStaticDataMap;
+using FileSystemWatcherStaticDataMap = QMap<int, FileSystemWatcherStaticData>;
 
 Q_GLOBAL_STATIC(FileSystemWatcherStaticDataMap, fileSystemWatcherStaticDataMap)
 
 class WatchEntry
 {
 public:
-    typedef FileSystemWatcher::WatchMode WatchMode;
+    using WatchMode = FileSystemWatcher::WatchMode;
 
     explicit WatchEntry(const QString &file, WatchMode wm) :
         watchMode(wm), modifiedTime(QFileInfo(file).lastModified()) {}
 
-    WatchEntry() : watchMode(FileSystemWatcher::WatchAllChanges) {}
+    WatchEntry() = default;
 
     bool trigger(const QString &fileName);
 
-    WatchMode watchMode;
+    WatchMode watchMode = FileSystemWatcher::WatchAllChanges;
     QDateTime modifiedTime;
 };
 
@@ -131,13 +131,13 @@ bool WatchEntry::trigger(const QString &fileName)
     return false;
 }
 
-typedef QHash<QString, WatchEntry> WatchEntryMap;
-typedef WatchEntryMap::iterator WatchEntryMapIterator;
+using WatchEntryMap = QHash<QString, WatchEntry>;
+using WatchEntryMapIterator = WatchEntryMap::iterator;
 
 class FileSystemWatcherPrivate
 {
 public:
-    explicit FileSystemWatcherPrivate(int id) : m_id(id), m_staticData(0) {}
+    explicit FileSystemWatcherPrivate(int id) : m_id(id), m_staticData(nullptr) {}
 
     WatchEntryMap m_files;
     WatchEntryMap m_directories;
@@ -208,7 +208,7 @@ FileSystemWatcher::~FileSystemWatcher()
 
     if (--(d->m_staticData->m_objectCount) == 0) {
         delete d->m_staticData->m_watcher;
-        d->m_staticData->m_watcher = 0;
+        d->m_staticData->m_watcher = nullptr;
         d->m_staticData->m_fileCount.clear();
         d->m_staticData->m_directoryCount.clear();
         if (debug)