Rename some methods containing *ModuleInformation to just *Modules

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

5 files changed, 58 insertions, 58 deletions

diff --git a/QtVsTools.Core/MsBuildProject.cs b/QtVsTools.Core/MsBuildProject.cs
index a94d6960..30ef1458 100644
--- a/QtVsTools.Core/MsBuildProject.cs
+++ b/QtVsTools.Core/MsBuildProject.cs
@@ -613,7 +613,7 @@ namespace QtVsTools.Core
             var moduleLibs = new HashSet<string>();
 
             // Go through all known Qt modules and check which ones are currently being used
-            foreach (var module in QtModules.Instance.GetAvailableModuleInformation()) {
+            foreach (var module in QtModules.Instance.GetAvailableModules()) {
 
                 if (IsModuleUsed(module, compiler, linker)) {
 
diff --git a/QtVsTools.Core/ProjectExporter.cs b/QtVsTools.Core/ProjectExporter.cs
index 1b5ac7b7..6faa0c28 100644
--- a/QtVsTools.Core/ProjectExporter.cs
+++ b/QtVsTools.Core/ProjectExporter.cs
@@ -491,14 +491,14 @@ namespace QtVsTools.Core
 
         private static void AddModules(QtProject qtPrj, ProFileOption optionQT, ProFileOption optionCONFIG)
         {
-            foreach (var moduleInfo in QtModules.Instance.GetAvailableModuleInformation()) {
-                if (!qtPrj.HasModule(moduleInfo.ModuleId))
+            foreach (var module in QtModules.Instance.GetAvailableModules()) {
+                if (!qtPrj.HasModule(module.ModuleId))
                     continue;
 
-                if (moduleInfo.proVarQT != null)
-                    optionQT.List.Add(moduleInfo.proVarQT);
-                if (moduleInfo.proVarCONFIG != null)
-                    optionCONFIG.List.Add(moduleInfo.proVarCONFIG);
+                if (module.proVarQT != null)
+                    optionQT.List.Add(module.proVarQT);
+                if (module.proVarCONFIG != null)
+                    optionCONFIG.List.Add(module.proVarCONFIG);
             }
         }
 
diff --git a/QtVsTools.Core/QtModules.cs b/QtVsTools.Core/QtModules.cs
index 973e91ac..591e0643 100644
--- a/QtVsTools.Core/QtModules.cs
+++ b/QtVsTools.Core/QtModules.cs
@@ -39,76 +39,76 @@ namespace QtVsTools.Core
     public class QtModules
     {
         private static QtModules instance = new QtModules();
-        private readonly Dictionary<int, QtModule> dictModuleInfos = new Dictionary<int, QtModule>();
+        private readonly Dictionary<int, QtModule> modules = new Dictionary<int, QtModule>();
 
         public static QtModules Instance
         {
             get { return instance; }
         }
 
-        public QtModule ModuleInformation(int moduleId)
+        public QtModule Module(int moduleId)
         {
-            QtModule moduleInfo;
-            dictModuleInfos.TryGetValue(moduleId, out moduleInfo);
-            return moduleInfo;
+            QtModule module;
+            modules.TryGetValue(moduleId, out module);
+            return module;
         }
 
-        public List<QtModule> GetAvailableModuleInformation()
+        public List<QtModule> GetAvailableModules()
         {
-            var lst = new List<QtModule>(dictModuleInfos.Count);
-            foreach (var entry in dictModuleInfos)
+            var lst = new List<QtModule>(modules.Count);
+            foreach (var entry in modules)
                 lst.Add(entry.Value);
             return lst;
         }
 
         private QtModules()
         {
-            QtModule moduleInfo = null;
-
             var uri = new Uri(
                 System.Reflection.Assembly.GetExecutingAssembly().EscapedCodeBase);
             var pkgInstallPath = Path.GetDirectoryName(
                 Uri.UnescapeDataString(uri.AbsolutePath)) + @"\";
+
             var modulesFile = Path.Combine(pkgInstallPath, "qtmodules.xml");
+            if (!File.Exists(modulesFile))
+                return;
+
+            var xmlText = File.ReadAllText(modulesFile, Encoding.UTF8);
+            XDocument xml = null;
+            try {
+                using (var reader = XmlReader.Create(new StringReader(xmlText))) {
+                    xml = XDocument.Load(reader);
+                }
+            } catch { }
+
+            if (xml == null)
+                return;
 
-            if (File.Exists(modulesFile)) {
-                var xmlText = File.ReadAllText(modulesFile, Encoding.UTF8);
-                XDocument xml = null;
-                try {
-                    using (var reader = XmlReader.Create(new StringReader(xmlText))) {
-                        xml = XDocument.Load(reader);
-                    }
-                } catch { }
-                if (xml != null) {
-                    foreach (var xModule in xml.Elements("QtVsTools").Elements("Module")) {
-                        int moduleId = (int)xModule.Attribute("Id");
-                        moduleInfo = new QtModule(moduleId);
-                        moduleInfo.Name = (string)xModule.Element("Name");
-                        moduleInfo.ResourceName = (string)xModule.Element("ResourceName");
-                        moduleInfo.Selectable = ((string)xModule.Element("Selectable") == "true");
-                        moduleInfo.LibraryPrefix = (string)xModule.Element("LibraryPrefix");
-                        moduleInfo.HasDLL = ((string)xModule.Element("HasDLL") == "true");
-                        moduleInfo.proVarQT = (string)xModule.Element("proVarQT");
-                        moduleInfo.proVarCONFIG = (string)xModule.Element("proVarCONFIG");
-                        moduleInfo.IncludePath = xModule.Elements("IncludePath")
-                            .Select(x => x.Value).ToList();
-                        moduleInfo.Defines = xModule.Elements("Defines")
-                            .Select(x => x.Value).ToList();
-                        moduleInfo.AdditionalLibraries = xModule.Elements("AdditionalLibraries")
-                            .Select(x => x.Value).ToList();
-                        moduleInfo.AdditionalLibrariesDebug =
-                            xModule.Elements("AdditionalLibrariesDebug")
-                            .Select(x => x.Value).ToList();
-                        if (string.IsNullOrEmpty(moduleInfo.Name)
-                            || string.IsNullOrEmpty(moduleInfo.LibraryPrefix)) {
-                            Messages.Print("\r\nCritical error: incorrect format of qtmodules.xml");
-                            throw new QtVSException("qtmodules.xml");
-                        }
-                        dictModuleInfos.Add(moduleId, moduleInfo);
-                    }
+            foreach (var xModule in xml.Elements("QtVsTools").Elements("Module")) {
+                int moduleId = (int)xModule.Attribute("Id");
+                QtModule module = new QtModule(moduleId);
+                module.Name = (string)xModule.Element("Name");
+                module.ResourceName = (string)xModule.Element("ResourceName");
+                module.Selectable = ((string)xModule.Element("Selectable") == "true");
+                module.LibraryPrefix = (string)xModule.Element("LibraryPrefix");
+                module.HasDLL = ((string)xModule.Element("HasDLL") == "true");
+                module.proVarQT = (string)xModule.Element("proVarQT");
+                module.proVarCONFIG = (string)xModule.Element("proVarCONFIG");
+                module.IncludePath = xModule.Elements("IncludePath")
+                    .Select(x => x.Value).ToList();
+                module.Defines = xModule.Elements("Defines")
+                    .Select(x => x.Value).ToList();
+                module.AdditionalLibraries = xModule.Elements("AdditionalLibraries")
+                    .Select(x => x.Value).ToList();
+                module.AdditionalLibrariesDebug =
+                    xModule.Elements("AdditionalLibrariesDebug")
+                    .Select(x => x.Value).ToList();
+                if (string.IsNullOrEmpty(module.Name)
+                    || string.IsNullOrEmpty(module.LibraryPrefix)) {
+                    Messages.Print("\r\nCritical error: incorrect format of qtmodules.xml");
+                    throw new QtVSException("qtmodules.xml");
                 }
+                modules.Add(moduleId, module);
             }
         }
-
     }
 }
diff --git a/QtVsTools.Core/QtProject.cs b/QtVsTools.Core/QtProject.cs
index 117e3a7a..5a74ddf2 100644
--- a/QtVsTools.Core/QtProject.cs
+++ b/QtVsTools.Core/QtProject.cs
@@ -398,7 +398,7 @@ namespace QtVsTools.Core
 
             foreach (VCConfiguration config in (IVCCollection)vcPro.Configurations) {
 
-                var info = QtModules.Instance.ModuleInformation(moduleId);
+                var info = QtModules.Instance.Module(moduleId);
                 if (FormatVersion >= Resources.qtMinFormatVersion_Settings) {
                     var config3 = config as VCConfiguration3;
                     if (config3 == null)
@@ -457,7 +457,7 @@ namespace QtVsTools.Core
                 var compiler = CompilerToolWrapper.Create(config);
                 var linker = (VCLinkerTool)((IVCCollection)config.Tools).Item("VCLinkerTool");
 
-                var info = QtModules.Instance.ModuleInformation(moduleId);
+                var info = QtModules.Instance.Module(moduleId);
                 if (compiler != null) {
                     foreach (var define in info.Defines)
                         compiler.RemovePreprocessorDefinition(define);
@@ -500,7 +500,7 @@ namespace QtVsTools.Core
                         var additionalDependencies = linkerWrapper.AdditionalDependencies;
 
                         var libsDesktop = new List<string>();
-                        foreach (var module in QtModules.Instance.GetAvailableModuleInformation()) {
+                        foreach (var module in QtModules.Instance.GetAvailableModules()) {
                             if (HasModule(module.ModuleId))
                                 libsDesktop.AddRange(module.AdditionalLibraries);
                         }
@@ -549,7 +549,7 @@ namespace QtVsTools.Core
                 versionInfo = vm.GetVersionInfo(vm.GetDefaultVersion());
             if (versionInfo == null)
                 return false; // neither a default or project Qt version
-            var info = QtModules.Instance.ModuleInformation(moduleId);
+            var info = QtModules.Instance.Module(moduleId);
             if (info == null)
                 return false;
 
diff --git a/QtVsTools.Core/VersionInformation.cs b/QtVsTools.Core/VersionInformation.cs
index c14d5ada..fd11f8c5 100644
--- a/QtVsTools.Core/VersionInformation.cs
+++ b/QtVsTools.Core/VersionInformation.cs
@@ -141,7 +141,7 @@ namespace QtVsTools.Core
                 var tempProData = new StringBuilder();
                 tempProData.AppendLine("SOURCES = main.cpp");
 
-                var modules = QtModules.Instance.GetAvailableModuleInformation()
+                var modules = QtModules.Instance.GetAvailableModules()
                     .Where((QtModule mi) => mi.Selectable);
 
                 foreach (QtModule mi in modules) {