Fix expression will always be true

Change-Id: I4a70375ba64c1c43629bf7bb55180d3dba773c12
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

8 files changed, 11 insertions, 25 deletions

diff --git a/src/qtprojectlib/HelperFunctions.cs b/src/qtprojectlib/HelperFunctions.cs
index 9a34e95f..002c564f 100644
--- a/src/qtprojectlib/HelperFunctions.cs
+++ b/src/qtprojectlib/HelperFunctions.cs
@@ -641,7 +641,7 @@ namespace QtProjectLib
                         }
 
                         linkerPaths = linkerWrapper.AdditionalLibraryDirectories;
-                        if (linker != null && linkerPaths != null) {
+                        if (linkerPaths != null) {
                             foreach (var libDir in linkerPaths) {
                                 var dirName = libDir;
                                 if (!Path.IsPathRooted(dirName)) {
diff --git a/src/qtvstools/DefaultEditorsClient.cs b/src/qtvstools/DefaultEditorsClient.cs
index 7da47e21..320d6ea8 100644
--- a/src/qtvstools/DefaultEditorsClient.cs
+++ b/src/qtvstools/DefaultEditorsClient.cs
@@ -226,8 +226,7 @@ namespace QtVsTools
 
                     if (tmp.Connected) {
                         var stream = tmp.GetStream();
-                        if (stream != null)
-                            stream.Close();
+                        stream.Close();
                         tmp.Close();
                     }
                 }
diff --git a/src/qtvstools/QtMainMenu.cs b/src/qtvstools/QtMainMenu.cs
index 4ffcd5fb..81324f93 100644
--- a/src/qtvstools/QtMainMenu.cs
+++ b/src/qtvstools/QtMainMenu.cs
@@ -237,7 +237,7 @@ namespace QtVsTools
                     if (project != null) {
                         if (HelperFunctions.IsQtProject(project))
                             status |= vsCommandStatus.vsCommandStatusEnabled;
-                        else if ((project != null) && HelperFunctions.IsQMakeProject(project))
+                        else if (HelperFunctions.IsQMakeProject(project))
                             status |= vsCommandStatus.vsCommandStatusInvisible;
                     }
                     command.Enabled = ((status & vsCommandStatus.vsCommandStatusEnabled) != 0);
diff --git a/src/qtvstools/QtProjectContextMenu.cs b/src/qtvstools/QtProjectContextMenu.cs
index 50017828..46bcc8ac 100644
--- a/src/qtvstools/QtProjectContextMenu.cs
+++ b/src/qtvstools/QtProjectContextMenu.cs
@@ -240,7 +240,7 @@ namespace QtVsTools
                     if (project != null) {
                         if (HelperFunctions.IsQtProject(project))
                             status |= vsCommandStatus.vsCommandStatusEnabled;
-                        else if ((project != null) && HelperFunctions.IsQMakeProject(project))
+                        else if (HelperFunctions.IsQMakeProject(project))
                             status |= vsCommandStatus.vsCommandStatusInvisible;
                     }
                     command.Enabled = ((status & vsCommandStatus.vsCommandStatusEnabled) != 0);
diff --git a/src/qtwizard/DesignerWizard.cs b/src/qtwizard/DesignerWizard.cs
index fe018478..303ab8d4 100644
--- a/src/qtwizard/DesignerWizard.cs
+++ b/src/qtwizard/DesignerWizard.cs
@@ -36,6 +36,7 @@ using Microsoft.VisualStudio.VCProjectEngine;
 using QtProjectLib;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Controls;
 
@@ -125,10 +126,6 @@ namespace QtProjectWizard
                 iVsUIShell.GetDialogOwnerHwnd(out hwnd);
 
                 try {
-                    var defaultModulesInstalled = true;
-                    foreach (var module in data.DefaultModules)
-                        defaultModulesInstalled |= QtModuleInfo.IsModuleInstalled(module);
-
                     var className = replacements["$safeprojectname$"];
                     className = Regex.Replace(className, @"[^a-zA-Z0-9_]", string.Empty);
                     className = Regex.Replace(className, @"^[\d-]*\s*", string.Empty);
@@ -175,7 +172,7 @@ namespace QtProjectWizard
                                 + @"used in Qt Designer or Visual Studio.",
                             PreviousButtonEnabled = true,
                             NextButtonEnabled = false,
-                            FinishButtonEnabled = defaultModulesInstalled,
+                            FinishButtonEnabled = data.DefaultModules.All(QtModuleInfo.IsModuleInstalled),
                             CancelButtonEnabled = true
                         }
                     })
diff --git a/src/qtwizard/GuiClassWizard.cs b/src/qtwizard/GuiClassWizard.cs
index 6db256a6..503d1094 100644
--- a/src/qtwizard/GuiClassWizard.cs
+++ b/src/qtwizard/GuiClassWizard.cs
@@ -52,10 +52,6 @@ namespace QtProjectWizard
                 iVsUIShell.GetDialogOwnerHwnd(out hwnd);
 
                 try {
-                    var defaultModulesInstalled = true;
-                    foreach (var module in data.DefaultModules)
-                        defaultModulesInstalled |= QtModuleInfo.IsModuleInstalled(module);
-
                     if (string.IsNullOrEmpty(name))
                         name = @"QtGuiClass";
 
@@ -86,7 +82,7 @@ namespace QtProjectWizard
                                 + @"empty form.",
                             PreviousButtonEnabled = true,
                             NextButtonEnabled = false,
-                            FinishButtonEnabled = defaultModulesInstalled,
+                            FinishButtonEnabled = data.DefaultModules.All(QtModuleInfo.IsModuleInstalled),
                             CancelButtonEnabled = true
                         }
                     })
diff --git a/src/qtwizard/GuiWizard.cs b/src/qtwizard/GuiWizard.cs
index f4b9eaac..5b4abeda 100644
--- a/src/qtwizard/GuiWizard.cs
+++ b/src/qtwizard/GuiWizard.cs
@@ -36,6 +36,7 @@ using Microsoft.VisualStudio.VCProjectEngine;
 using QtProjectLib;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Controls;
 
@@ -56,10 +57,6 @@ namespace QtProjectWizard
                 iVsUIShell.GetDialogOwnerHwnd(out hwnd);
 
                 try {
-                    var defaultModulesInstalled = true;
-                    foreach (var module in data.DefaultModules)
-                        defaultModulesInstalled |= QtModuleInfo.IsModuleInstalled(module);
-
                     var className = replacements["$safeprojectname$"];
                     className = Regex.Replace(className, @"[^a-zA-Z0-9_]", string.Empty);
                     className = Regex.Replace(className, @"^[\d-]*\s*", string.Empty);
@@ -105,7 +102,7 @@ namespace QtProjectWizard
                                 + @"widget.",
                             PreviousButtonEnabled = true,
                             NextButtonEnabled = false,
-                            FinishButtonEnabled = defaultModulesInstalled,
+                            FinishButtonEnabled = data.DefaultModules.All(QtModuleInfo.IsModuleInstalled),
                             CancelButtonEnabled = true
                         }
                     })
diff --git a/src/qtwizard/ServerWizard.cs b/src/qtwizard/ServerWizard.cs
index 1fae78b7..08f8bfdf 100644
--- a/src/qtwizard/ServerWizard.cs
+++ b/src/qtwizard/ServerWizard.cs
@@ -36,6 +36,7 @@ using Microsoft.VisualStudio.VCProjectEngine;
 using QtProjectLib;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Windows.Controls;
 
 namespace QtProjectWizard
@@ -123,10 +124,6 @@ namespace QtProjectWizard
                 iVsUIShell.GetDialogOwnerHwnd(out hwnd);
 
                 try {
-                    var defaultModulesInstalled = true;
-                    foreach (var module in data.DefaultModules)
-                        defaultModulesInstalled |= QtModuleInfo.IsModuleInstalled(module);
-
                     // midl.exe does not support spaces in project name. Fails while generating the
                     // IDL file (library attribute), e.g. 'library Active QtServer1Lib' is illegal.
                     if (replacements["$safeprojectname$"].Contains(" "))
@@ -172,7 +169,7 @@ namespace QtProjectWizard
                                 + @"creates a simple ActiveQt widget with the required files.",
                             PreviousButtonEnabled = true,
                             NextButtonEnabled = false,
-                            FinishButtonEnabled = defaultModulesInstalled,
+                            FinishButtonEnabled = data.DefaultModules.All(QtModuleInfo.IsModuleInstalled),
                             CancelButtonEnabled = true
                         }
                     })