uic: Replace 'typedef' by 'using'

Apply Fixits by Qt Creator with some amendments.

Change-Id: I152cb5935ff7d649de297b010b9253c625c7da84
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
 
 
 
 
 
 
 
 
 
 
 

4 files changed, 10 insertions, 10 deletions

diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h
index 79cbd41014..aadc6f54fc 100644
--- a/src/tools/uic/cpp/cppwriteincludes.h
+++ b/src/tools/uic/cpp/cppwriteincludes.h
@@ -82,7 +82,7 @@ private:
     void add(const QString &className, bool determineHeader = true, const QString &header = QString(), bool global = false);
 
 private:
-    typedef std::set<QString> OrderedSet;
+    using OrderedSet = std::set<QString>;
     void insertIncludeForClass(const QString &className, QString header = QString(), bool global = false);
     void insertInclude(const QString &header, bool global);
     void writeHeaders(const OrderedSet &headers, bool global);
@@ -97,7 +97,7 @@ private:
 
     QSet<QString> m_knownClasses;
 
-    typedef QMap<QString, QString> StringMap;
+    using StringMap = QMap<QString, QString>;
     StringMap m_classToHeader;
     StringMap m_oldHeaderToNewHeader;
 
diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h
index af8b964777..0ffa5f67af 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.h
+++ b/src/tools/uic/cpp/cppwriteinitialization.h
@@ -85,8 +85,8 @@ namespace CPP {
 
 struct WriteInitialization : public TreeWalker
 {
-    typedef QList<DomProperty*> DomPropertyList;
-    typedef QHash<QString, DomProperty*> DomPropertyMap;
+    using DomPropertyList = QList<DomProperty*>;
+    using DomPropertyMap = QHash<QString, DomProperty*>;
 
     WriteInitialization(Uic *uic);
 
@@ -259,13 +259,13 @@ private:
     QVector<Buddy> m_buddies;
 
     QSet<QString> m_buttonGroups;
-    typedef QHash<uint, QString> ColorBrushHash;
+    using ColorBrushHash = QHash<uint, QString>;
     ColorBrushHash m_colorBrushHash;
     // Map from font properties to  font variable name for reuse
     // Map from size policy to  variable for reuse
-    typedef QMap<FontHandle, QString> FontPropertiesNameMap;
-    typedef QMap<IconHandle, QString> IconPropertiesNameMap;
-    typedef QMap<SizePolicyHandle, QString> SizePolicyNameMap;
+    using FontPropertiesNameMap = QMap<FontHandle, QString>;
+    using IconPropertiesNameMap = QMap<IconHandle, QString>;
+    using SizePolicyNameMap = QMap<SizePolicyHandle, QString>;
     FontPropertiesNameMap m_fontPropertiesNameMap;
     IconPropertiesNameMap m_iconPropertiesNameMap;
     SizePolicyNameMap     m_sizePolicyNameMap;
diff --git a/src/tools/uic/customwidgetsinfo.h b/src/tools/uic/customwidgetsinfo.h
index 8a10999027..a1b24ab042 100644
--- a/src/tools/uic/customwidgetsinfo.h
+++ b/src/tools/uic/customwidgetsinfo.h
@@ -62,7 +62,7 @@ public:
     bool isCustomWidgetContainer(const QString &className) const;
 
 private:
-    typedef QMap<QString, DomCustomWidget*> NameCustomWidgetMap;
+    using NameCustomWidgetMap = QMap<QString, DomCustomWidget*>;
     NameCustomWidgetMap m_customWidgets;
 };
 
diff --git a/src/tools/uic/treewalker.h b/src/tools/uic/treewalker.h
index 7e8eda57d9..1ad9b51409 100644
--- a/src/tools/uic/treewalker.h
+++ b/src/tools/uic/treewalker.h
@@ -101,7 +101,7 @@ struct TreeWalker
     virtual void acceptTime(DomTime *time);
     virtual void acceptDateTime(DomDateTime *dateTime);
     virtual void acceptProperty(DomProperty *property);
-    typedef QVector<DomWidget *> DomWidgets;
+    using DomWidgets = QVector<DomWidget *>;
     virtual void acceptIncludes(DomIncludes *includes);
     virtual void acceptInclude(DomInclude *incl);
     virtual void acceptAction(DomAction *action);