Rename QtModuleInfo to QtModule, following qtmodules.xml declaration

Change-Id: I29eacbd177239ee57e7367290f95675483390273
Reviewed-by: Miguel Costa <miguel.costa@qt.io>

5 files changed, 17 insertions, 17 deletions

diff --git a/QtVsTools.Core/MsBuildProject.cs b/QtVsTools.Core/MsBuildProject.cs
index b875cfcd..a94d6960 100644
--- a/QtVsTools.Core/MsBuildProject.cs
+++ b/QtVsTools.Core/MsBuildProject.cs
@@ -776,7 +776,7 @@ namespace QtVsTools.Core
         }
 
         bool IsModuleUsed(
-            QtModuleInfo module,
+            QtModule module,
             IEnumerable<XElement> compiler,
             IEnumerable<XElement> linker)
         {
@@ -800,7 +800,7 @@ namespace QtVsTools.Core
         }
 
         bool IsPrivateIncludePathUsed(
-            QtModuleInfo module,
+            QtModule module,
             IEnumerable<XElement> compiler)
         {
             // Module private header path is present in compiler include dirs
diff --git a/QtVsTools.Core/QtModuleInfo.cs b/QtVsTools.Core/QtModule.cs
index c9ef77ed..459373c2 100644
--- a/QtVsTools.Core/QtModuleInfo.cs
+++ b/QtVsTools.Core/QtModule.cs
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt VS Tools.
@@ -32,7 +32,7 @@ using System.IO;
 
 namespace QtVsTools.Core
 {
-    public class QtModuleInfo
+    public class QtModule
     {
         public string Name;
         public string ResourceName;
@@ -68,7 +68,7 @@ namespace QtVsTools.Core
             }
         }
 
-        public QtModuleInfo(int id)
+        public QtModule(int id)
         {
             ModuleId = id;
         }
diff --git a/QtVsTools.Core/QtModules.cs b/QtVsTools.Core/QtModules.cs
index 00a57d6a..973e91ac 100644
--- a/QtVsTools.Core/QtModules.cs
+++ b/QtVsTools.Core/QtModules.cs
@@ -39,23 +39,23 @@ namespace QtVsTools.Core
     public class QtModules
     {
         private static QtModules instance = new QtModules();
-        private readonly Dictionary<int, QtModuleInfo> dictModuleInfos = new Dictionary<int, QtModuleInfo>();
+        private readonly Dictionary<int, QtModule> dictModuleInfos = new Dictionary<int, QtModule>();
 
         public static QtModules Instance
         {
             get { return instance; }
         }
 
-        public QtModuleInfo ModuleInformation(int moduleId)
+        public QtModule ModuleInformation(int moduleId)
         {
-            QtModuleInfo moduleInfo;
+            QtModule moduleInfo;
             dictModuleInfos.TryGetValue(moduleId, out moduleInfo);
             return moduleInfo;
         }
 
-        public List<QtModuleInfo> GetAvailableModuleInformation()
+        public List<QtModule> GetAvailableModuleInformation()
         {
-            var lst = new List<QtModuleInfo>(dictModuleInfos.Count);
+            var lst = new List<QtModule>(dictModuleInfos.Count);
             foreach (var entry in dictModuleInfos)
                 lst.Add(entry.Value);
             return lst;
@@ -63,7 +63,7 @@ namespace QtVsTools.Core
 
         private QtModules()
         {
-            QtModuleInfo moduleInfo = null;
+            QtModule moduleInfo = null;
 
             var uri = new Uri(
                 System.Reflection.Assembly.GetExecutingAssembly().EscapedCodeBase);
@@ -82,7 +82,7 @@ namespace QtVsTools.Core
                 if (xml != null) {
                     foreach (var xModule in xml.Elements("QtVsTools").Elements("Module")) {
                         int moduleId = (int)xModule.Attribute("Id");
-                        moduleInfo = new QtModuleInfo(moduleId);
+                        moduleInfo = new QtModule(moduleId);
                         moduleInfo.Name = (string)xModule.Element("Name");
                         moduleInfo.ResourceName = (string)xModule.Element("ResourceName");
                         moduleInfo.Selectable = ((string)xModule.Element("Selectable") == "true");
diff --git a/QtVsTools.Core/QtVsTools.Core.csproj b/QtVsTools.Core/QtVsTools.Core.csproj
index 5daef37a..b55c13a9 100644
--- a/QtVsTools.Core/QtVsTools.Core.csproj
+++ b/QtVsTools.Core/QtVsTools.Core.csproj
@@ -160,7 +160,7 @@
     <Compile Include="QrcParser.cs" />
     <Compile Include="QrcPrefix.cs" />
     <Compile Include="QtConfig.cs" />
-    <Compile Include="QtModuleInfo.cs" />
+    <Compile Include="QtModule.cs" />
     <Compile Include="QtModules.cs" />
     <Compile Include="QtMsBuild.cs" />
     <Compile Include="QtProject.cs" />
diff --git a/QtVsTools.Core/VersionInformation.cs b/QtVsTools.Core/VersionInformation.cs
index b9cf223f..c14d5ada 100644
--- a/QtVsTools.Core/VersionInformation.cs
+++ b/QtVsTools.Core/VersionInformation.cs
@@ -142,9 +142,9 @@ namespace QtVsTools.Core
                 tempProData.AppendLine("SOURCES = main.cpp");
 
                 var modules = QtModules.Instance.GetAvailableModuleInformation()
-                    .Where((QtModuleInfo mi) => mi.Selectable);
+                    .Where((QtModule mi) => mi.Selectable);
 
-                foreach (QtModuleInfo mi in modules) {
+                foreach (QtModule mi in modules) {
                     tempProData.AppendLine(string.Format(
                         "qtHaveModule({0}): HEADERS += {0}.h", mi.proVarQT));
                 }
@@ -169,8 +169,8 @@ namespace QtVsTools.Core
                     .Select((string s) => Path.GetFileNameWithoutExtension(s));
 
                 _IsModuleAvailable = modules.ToDictionary(
-                    (QtModuleInfo mi) => mi.proVarQT,
-                    (QtModuleInfo mi) => availableModules.Contains(mi.proVarQT));
+                    (QtModule mi) => mi.proVarQT,
+                    (QtModule mi) => availableModules.Contains(mi.proVarQT));
 
                 VC_MinimumVisualStudioVersion =
                     msbuildProj.GetProperty("MinimumVisualStudioVersion");