Utils: Modernize

range-based for, nullptr, member initializers, override.

Change-Id: I21ac5b23883c08dbd75819bb3298bc956cdb972c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

4 files changed, 20 insertions, 24 deletions

diff --git a/src/libs/utils/mimetypes/mimedatabase_p.h b/src/libs/utils/mimetypes/mimedatabase_p.h
index 1a464fb0076..6f87b213f34 100644
--- a/src/libs/utils/mimetypes/mimedatabase_p.h
+++ b/src/libs/utils/mimetypes/mimedatabase_p.h
@@ -99,7 +99,7 @@ public:
     MimeType mimeTypeForName(const QString &nameOrAlias);
     MimeType mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device, int *priorityPtr);
     MimeType findByData(const QByteArray &data, int *priorityPtr);
-    QStringList mimeTypeForFileName(const QString &fileName, QString *foundSuffix = 0);
+    QStringList mimeTypeForFileName(const QString &fileName, QString *foundSuffix = nullptr);
 
     mutable MimeProviderBase *m_provider;
     const QString m_defaultMimeType;
diff --git a/src/libs/utils/mimetypes/mimeglobpattern_p.h b/src/libs/utils/mimetypes/mimeglobpattern_p.h
index 863c432653b..accbab06469 100644
--- a/src/libs/utils/mimetypes/mimeglobpattern_p.h
+++ b/src/libs/utils/mimetypes/mimeglobpattern_p.h
@@ -58,15 +58,11 @@ namespace Internal {
 
 struct MimeGlobMatchResult
 {
-    MimeGlobMatchResult()
-    : m_weight(0), m_matchingPatternLength(0)
-    {}
-
     void addMatch(const QString &mimeType, int weight, const QString &pattern);
 
     QStringList m_matchingMimeTypes;
-    int m_weight;
-    int m_matchingPatternLength;
+    int m_weight = 0;
+    int m_matchingPatternLength = 0;
     QString m_foundSuffix;
 };
 
diff --git a/src/libs/utils/mimetypes/mimeprovider_p.h b/src/libs/utils/mimetypes/mimeprovider_p.h
index deda7b9645c..b616d198798 100644
--- a/src/libs/utils/mimetypes/mimeprovider_p.h
+++ b/src/libs/utils/mimetypes/mimeprovider_p.h
@@ -141,14 +141,14 @@ class MimeXMLProvider : public MimeProviderBase
 public:
     MimeXMLProvider(MimeDatabasePrivate *db);
 
-    virtual bool isValid();
-    virtual MimeType mimeTypeForName(const QString &name);
-    virtual QStringList findByFileName(const QString &fileName, QString *foundSuffix);
-    virtual QStringList parents(const QString &mime);
-    virtual QString resolveAlias(const QString &name);
-    virtual QStringList listAliases(const QString &name);
-    virtual MimeType findByMagic(const QByteArray &data, int *accuracyPtr);
-    virtual QList<MimeType> allMimeTypes();
+    bool isValid() override;
+    MimeType mimeTypeForName(const QString &name) override;
+    QStringList findByFileName(const QString &fileName, QString *foundSuffix) override;
+    QStringList parents(const QString &mime) override;
+    QString resolveAlias(const QString &name) override;
+    QStringList listAliases(const QString &name) override;
+    MimeType findByMagic(const QByteArray &data, int *accuracyPtr) override;
+    QList<MimeType> allMimeTypes() override;
 
     bool load(const QString &fileName, QString *errorMessage);
 
@@ -161,9 +161,9 @@ public:
 
     // Qt Creator additions
     void addData(const QString &id, const QByteArray &data);
-    QMap<int, QList<MimeMagicRule> > magicRulesForMimeType(const MimeType &mimeType);
-    void setGlobPatternsForMimeType(const MimeType &mimeType, const QStringList &patterns);
-    void setMagicRulesForMimeType(const MimeType &mimeType, const QMap<int, QList<MimeMagicRule> > &rules);
+    QMap<int, QList<MimeMagicRule> > magicRulesForMimeType(const MimeType &mimeType) override;
+    void setGlobPatternsForMimeType(const MimeType &mimeType, const QStringList &patterns) override;
+    void setMagicRulesForMimeType(const MimeType &mimeType, const QMap<int, QList<MimeMagicRule> > &rules) override;
 
 private:
     void ensureLoaded();
diff --git a/src/libs/utils/mimetypes/mimetypeparser_p.h b/src/libs/utils/mimetypes/mimetypeparser_p.h
index b37cec464df..8d70004bff0 100644
--- a/src/libs/utils/mimetypes/mimetypeparser_p.h
+++ b/src/libs/utils/mimetypes/mimetypeparser_p.h
@@ -101,22 +101,22 @@ public:
     explicit MimeTypeParser(MimeXMLProvider &provider) : m_provider(provider) {}
 
 protected:
-    inline bool mimeTypeExists(const QString &mimeTypeName)
+    inline bool mimeTypeExists(const QString &mimeTypeName) override
     { return m_provider.mimeTypeForName(mimeTypeName).isValid(); }
 
-    inline bool process(const MimeType &t, QString *)
+    inline bool process(const MimeType &t, QString *) override
     { m_provider.addMimeType(t); return true; }
 
-    inline bool process(const MimeGlobPattern &glob, QString *)
+    inline bool process(const MimeGlobPattern &glob, QString *) override
     { m_provider.addGlobPattern(glob); return true; }
 
-    inline void processParent(const QString &child, const QString &parent)
+    inline void processParent(const QString &child, const QString &parent) override
     { m_provider.addParent(child, parent); }
 
-    inline void processAlias(const QString &alias, const QString &name)
+    inline void processAlias(const QString &alias, const QString &name) override
     { m_provider.addAlias(alias, name); }
 
-    inline void processMagicMatcher(const MimeMagicRuleMatcher &matcher)
+    inline void processMagicMatcher(const MimeMagicRuleMatcher &matcher) override
     { m_provider.addMagicMatcher(matcher); }
 
 private: