Rename and update IsQtProject(...)

* Rename function name to match its intend.
* Update function documenation to match implementation.

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

9 files changed, 41 insertions, 43 deletions

diff --git a/QtVsTools.Core/HelperFunctions.cs b/QtVsTools.Core/HelperFunctions.cs
index 82a3c850..cfba13f1 100644
--- a/QtVsTools.Core/HelperFunctions.cs
+++ b/QtVsTools.Core/HelperFunctions.cs
@@ -460,7 +460,7 @@ namespace QtVsTools.Core
             var vcPro = (VCProject)project.Object;
             if (!IsQMakeProject(project))
                 return;
-            if (IsQtProject(project)) {
+            if (IsVsToolsProject(project)) {
                 // TODO: qtPro is never used.
                 var qtPro = QtProject.Create(project);
                 var vm = QtVersionManager.The();
@@ -676,14 +676,24 @@ namespace QtVsTools.Core
         }
 
         /// <summary>
-        /// Return true if the project is a Qt project, otherwise false.
+        /// Return true if the project is a VS tools project; false otherwise.
         /// </summary>
         /// <param name="proj">project</param>
-        /// <returns></returns>
-        public static bool IsQtProject(VCProject proj)
+        public static bool IsVsToolsProject(Project proj)
         {
-            ThreadHelper.ThrowIfNotOnUIThread();
+            ThreadHelper.ThrowIfNotOnUIThread(); // C++ Project Type GUID
+            if (proj == null || proj.Kind != "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}")
+                return false;
+            return IsVsToolsProject(proj.Object as VCProject);
+        }
 
+        /// <summary>
+        /// Return true if the project is a VS tools project; false otherwise.
+        /// </summary>
+        /// <param name="proj">project</param>
+        public static bool IsVsToolsProject(VCProject proj)
+        {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!IsQMakeProject(proj))
                 return false;
 
@@ -695,27 +705,15 @@ namespace QtVsTools.Core
                 return false;
 
             foreach (var global in envPro.Globals.VariableNames as string[]) {
-                if (global.StartsWith("Qt5Version", StringComparison.Ordinal) && envPro.Globals.get_VariablePersists(global))
+                if (global.StartsWith("Qt5Version", StringComparison.Ordinal)
+                    && envPro.Globals.get_VariablePersists(global)) {
                     return true;
+                }
             }
             return false;
         }
 
         /// <summary>
-        /// Returns true if the specified project is a Qt Project.
-        /// </summary>
-        /// <param name="proj">project</param>
-        public static bool IsQtProject(Project proj)
-        {
-            ThreadHelper.ThrowIfNotOnUIThread();
-            try {
-                if (proj != null && proj.Kind == "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}")
-                    return IsQtProject(proj.Object as VCProject);
-            } catch { }
-            return false;
-        }
-
-        /// <summary>
         /// Return true if the project is a QMake -tp vc project, otherwise false.
         /// </summary>
         /// <param name="proj">project</param>
@@ -1149,7 +1147,7 @@ namespace QtVsTools.Core
                 if ((pro = GetSingleProjectInSolution(dteObject)) == null)
                     pro = GetActiveDocumentProject(dteObject);
             }
-            return IsQtProject(pro) ? pro : null;
+            return IsVsToolsProject(pro) ? pro : null;
         }
 
         public static VCFile[] GetSelectedFiles(DTE dteObject)
diff --git a/QtVsTools.Core/ProjectExporter.cs b/QtVsTools.Core/ProjectExporter.cs
index 7548f714..cc6a725d 100644
--- a/QtVsTools.Core/ProjectExporter.cs
+++ b/QtVsTools.Core/ProjectExporter.cs
@@ -100,7 +100,7 @@ namespace QtVsTools.Core
             foreach (var proj in HelperFunctions.ProjectsInSolution(sln.DTE)) {
                 try {
                     // only add qt projects
-                    if (HelperFunctions.IsQtProject(proj)) {
+                    if (HelperFunctions.IsVsToolsProject(proj)) {
                         content = CreateProFileContent(proj);
                         prosln.ProFiles.Add(content);
                     } else if (proj.Kind == ProjectKinds.vsProjectKindSolutionFolder) {
@@ -120,7 +120,7 @@ namespace QtVsTools.Core
 
             foreach (ProjectItem pi in solutionFolder.ProjectItems) {
                 var containedProject = pi.Object as Project;
-                if (HelperFunctions.IsQtProject(containedProject)) {
+                if (HelperFunctions.IsVsToolsProject(containedProject)) {
                     var content = CreateProFileContent(containedProject);
                     sln.ProFiles.Add(content);
                 } else if (containedProject.Kind == ProjectKinds.vsProjectKindSolutionFolder) {
@@ -833,7 +833,7 @@ namespace QtVsTools.Core
             ThreadHelper.ThrowIfNotOnUIThread();
 
             VCProject vcproj;
-            if (HelperFunctions.IsQtProject(proj)) {
+            if (HelperFunctions.IsVsToolsProject(proj)) {
                 try {
                     vcproj = (VCProject)proj.Object;
                 } catch (Exception e) {
diff --git a/QtVsTools.Package/Package/DteEventsHandler.cs b/QtVsTools.Package/Package/DteEventsHandler.cs
index 67581bad..6e4c0621 100644
--- a/QtVsTools.Package/Package/DteEventsHandler.cs
+++ b/QtVsTools.Package/Package/DteEventsHandler.cs
@@ -219,7 +219,7 @@ namespace QtVsTools
                     break;
                 }
             }
-            if (project == null || !HelperFunctions.IsQtProject(project))
+            if (project == null || !HelperFunctions.IsVsToolsProject(project))
                 return;
 
             if (QtProject.GetFormatVersion(project) >= Resources.qtMinFormatVersion_Settings)
@@ -257,7 +257,7 @@ namespace QtVsTools
 
             var qtPro = QtProject.Create(document.ProjectItem.ContainingProject);
 
-            if (!HelperFunctions.IsQtProject(qtPro.VCProject))
+            if (!HelperFunctions.IsVsToolsProject(qtPro.VCProject))
                 return;
 
             var file = (VCFile)((IVCCollection)qtPro.VCProject.Files).Item(document.FullName);
@@ -353,7 +353,7 @@ namespace QtVsTools
 
             var project = HelperFunctions.GetSelectedQtProject(QtVsToolsPackage.Instance.Dte);
             var qtPro = QtProject.Create(project);
-            if (!HelperFunctions.IsQtProject(project))
+            if (!HelperFunctions.IsVsToolsProject(project))
                 return;
 
             var vcFile = GetVCFileFromProject(projectItem.Name, qtPro.VCProject);
@@ -487,7 +487,7 @@ namespace QtVsTools
 
             QtProjectTracker.SolutionPath = QtVsToolsPackage.Instance.Dte.Solution.FullName;
             foreach (var p in HelperFunctions.ProjectsInSolution(QtVsToolsPackage.Instance.Dte)) {
-                if (HelperFunctions.IsQtProject(p)) {
+                if (HelperFunctions.IsVsToolsProject(p)) {
                     InitializeVCProject(p);
                     QtProjectTracker.Add(p);
                 }
@@ -506,7 +506,7 @@ namespace QtVsTools
             ThreadHelper.ThrowIfNotOnUIThread();
 
             foreach (var project in HelperFunctions.ProjectsInSolution(dte)) {
-                if (project != null && HelperFunctions.IsQtProject(project))
+                if (project != null && HelperFunctions.IsVsToolsProject(project))
                     InitializeVCProject(project);
             }
         }
@@ -547,7 +547,7 @@ namespace QtVsTools
                 var vcPrj = vcCfg.project as VCProject;
                 if (vcPrj == null)
                     return;
-                if (!HelperFunctions.IsQtProject(vcPrj))
+                if (!HelperFunctions.IsVsToolsProject(vcPrj))
                     return;
                 // Ignore property events when using shared compiler properties
                 if (QtProject.GetFormatVersion(vcPrj) >= Resources.qtMinFormatVersion_ClProperties)
@@ -579,7 +579,7 @@ namespace QtVsTools
                 var vcPrj = vcFile.project as VCProject;
                 if (vcPrj == null)
                     return;
-                if (!HelperFunctions.IsQtProject(vcPrj))
+                if (!HelperFunctions.IsVsToolsProject(vcPrj))
                     return;
                 // Ignore property events when using shared compiler properties
                 if (QtProject.GetFormatVersion(vcPrj) >= Resources.qtMinFormatVersion_ClProperties)
diff --git a/QtVsTools.Package/Package/ExtLoader.cs b/QtVsTools.Package/Package/ExtLoader.cs
index 141937ca..17078691 100644
--- a/QtVsTools.Package/Package/ExtLoader.cs
+++ b/QtVsTools.Package/Package/ExtLoader.cs
@@ -70,7 +70,7 @@ namespace QtVsTools
                 return;
 
             VCProject vcproj;
-            if (!HelperFunctions.IsQtProject(project))
+            if (!HelperFunctions.IsVsToolsProject(project))
                 return;
 
             vcproj = project.Object as VCProject;
@@ -99,7 +99,7 @@ namespace QtVsTools
             if (project == null)
                 return;
 
-            if (!HelperFunctions.IsQtProject(project))
+            if (!HelperFunctions.IsVsToolsProject(project))
                 return;
 
             var vcproj = project.Object as VCProject;
diff --git a/QtVsTools.Package/Package/QtItemContextMenu.cs b/QtVsTools.Package/Package/QtItemContextMenu.cs
index ec7161a9..b7e8addb 100644
--- a/QtVsTools.Package/Package/QtItemContextMenu.cs
+++ b/QtVsTools.Package/Package/QtItemContextMenu.cs
@@ -121,7 +121,7 @@ namespace QtVsTools
             command.Visible = false;
 
             var prj = HelperFunctions.GetSelectedProject(QtVsToolsPackage.Instance.Dte);
-            if (!HelperFunctions.IsQtProject(prj) || QtVsToolsPackage.Instance.Dte.SelectedItems.Count <= 0)
+            if (!HelperFunctions.IsVsToolsProject(prj) || QtVsToolsPackage.Instance.Dte.SelectedItems.Count <= 0)
                 return;
 
             foreach (SelectedItem si in QtVsToolsPackage.Instance.Dte.SelectedItems) {
diff --git a/QtVsTools.Package/Package/QtMainMenu.cs b/QtVsTools.Package/Package/QtMainMenu.cs
index d273afe1..0b394736 100644
--- a/QtVsTools.Package/Package/QtMainMenu.cs
+++ b/QtVsTools.Package/Package/QtMainMenu.cs
@@ -222,7 +222,7 @@ namespace QtVsTools
             case CommandId.ExportPriFileId:
             case CommandId.ExportProFileId:
                 command.Visible = true;
-                command.Enabled = HelperFunctions.IsQtProject(project);
+                command.Enabled = HelperFunctions.IsVsToolsProject(project);
                 break;
             // TODO: Fix these functionality and re-enable the menu items
             case CommandId.ConvertToQtId:
@@ -234,7 +234,7 @@ namespace QtVsTools
             case CommandId.QtProjectSettingsId: {
                     var status = vsCommandStatus.vsCommandStatusSupported;
                     if (project != null) {
-                        if (HelperFunctions.IsQtProject(project))
+                        if (HelperFunctions.IsVsToolsProject(project))
                             status |= vsCommandStatus.vsCommandStatusEnabled;
                         else if (HelperFunctions.IsQMakeProject(project))
                             status |= vsCommandStatus.vsCommandStatusInvisible;
@@ -246,7 +246,7 @@ namespace QtVsTools
             //case CommandId.ConvertToQtId:
             case CommandId.ChangeProjectQtVersionId: {
                     var status = vsCommandStatus.vsCommandStatusSupported;
-                    if ((project == null) || HelperFunctions.IsQtProject(project))
+                    if ((project == null) || HelperFunctions.IsVsToolsProject(project))
                         status |= vsCommandStatus.vsCommandStatusInvisible;
                     else if (HelperFunctions.IsQMakeProject(project))
                         status |= vsCommandStatus.vsCommandStatusEnabled;
diff --git a/QtVsTools.Package/Package/QtMsBuildConverter.cs b/QtVsTools.Package/Package/QtMsBuildConverter.cs
index df11d86c..2ff485ac 100644
--- a/QtVsTools.Package/Package/QtMsBuildConverter.cs
+++ b/QtVsTools.Package/Package/QtMsBuildConverter.cs
@@ -57,7 +57,7 @@ namespace QtVsTools
                 return WarningMessage(SR.GetString("NoProjectsToConvert"));
 
             foreach (EnvDTE.Project project in allProjects) {
-                if ((HelperFunctions.IsQtProject(project)
+                if ((HelperFunctions.IsVsToolsProject(project)
                     || HelperFunctions.IsQMakeProject(project))
                     && !QtProject.IsQtMsBuildEnabled(project)) {
                     projects.Add(project);
diff --git a/QtVsTools.Package/Package/QtProjectContextMenu.cs b/QtVsTools.Package/Package/QtProjectContextMenu.cs
index a1cdd8f3..32514b12 100644
--- a/QtVsTools.Package/Package/QtProjectContextMenu.cs
+++ b/QtVsTools.Package/Package/QtProjectContextMenu.cs
@@ -189,7 +189,7 @@ namespace QtVsTools
                 return;
 
             var project = HelperFunctions.GetSelectedProject(QtVsToolsPackage.Instance.Dte);
-            var isQtProject = HelperFunctions.IsQtProject(project);
+            var isQtProject = HelperFunctions.IsVsToolsProject(project);
             var isQMakeProject = HelperFunctions.IsQMakeProject(project);
             var isQtMsBuildEnabled = QtProject.IsQtMsBuildEnabled(project);
 
@@ -209,7 +209,7 @@ namespace QtVsTools
             case CommandId.ExportPriFileProjectId:
             case CommandId.ExportProFileProjectId:
                 command.Visible = true;
-                command.Enabled = HelperFunctions.IsQtProject(HelperFunctions
+                command.Enabled = HelperFunctions.IsVsToolsProject(HelperFunctions
                     .GetSelectedProject(QtVsToolsPackage.Instance.Dte));
                 break;
             case CommandId.lUpdateOnProjectId:
diff --git a/QtVsTools.Package/Package/QtSolutionContextMenu.cs b/QtVsTools.Package/Package/QtSolutionContextMenu.cs
index 89a06ef8..69d57e7d 100644
--- a/QtVsTools.Package/Package/QtSolutionContextMenu.cs
+++ b/QtVsTools.Package/Package/QtSolutionContextMenu.cs
@@ -106,7 +106,7 @@ namespace QtVsTools
             case (int)CommandId.ChangeSolutionQtVersionId:
                 var projects = HelperFunctions.ProjectsInSolution(QtVsToolsPackage.Instance.Dte);
                 foreach (var project in projects) {
-                    if (!HelperFunctions.IsQtProject(project)
+                    if (!HelperFunctions.IsVsToolsProject(project)
                         && HelperFunctions.IsQMakeProject(project)) {
                         command.Enabled = command.Visible = true;
                         return;
@@ -157,7 +157,7 @@ namespace QtVsTools
                     return;
 
                 foreach (var project in HelperFunctions.ProjectsInSolution(dte)) {
-                    if (HelperFunctions.IsQtProject(project)) {
+                    if (HelperFunctions.IsVsToolsProject(project)) {
                         var OldQtVersion = QtVersionManager.The().GetProjectQtVersion(project,
                             currentPlatform);
                         if (OldQtVersion == null)
@@ -176,7 +176,7 @@ namespace QtVsTools
                 break;
             case CommandId.SolutionEnableProjectTracking: {
                     foreach (var project in HelperFunctions.ProjectsInSolution(dte)) {
-                        if (HelperFunctions.IsQtProject(project))
+                        if (HelperFunctions.IsVsToolsProject(project))
                             QtProjectTracker.Get(project, project.FullName);
                     }
                 }