Apply uniform guidelines to 'using' directives

Change-Id: If92cf095e20c4bc8b9bc9fe04a40233a2c602973
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

19 files changed, 54 insertions, 48 deletions

diff --git a/QtVsTools.Core/CommandLineParser.cs b/QtVsTools.Core/CommandLineParser.cs
index 1b969367..eeeb9ee4 100644
--- a/QtVsTools.Core/CommandLineParser.cs
+++ b/QtVsTools.Core/CommandLineParser.cs
@@ -29,10 +29,10 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.IO;
 
 namespace QtVsTools.Core.CommandLine
 {
diff --git a/QtVsTools.Core/CompilerToolWrapper.cs b/QtVsTools.Core/CompilerToolWrapper.cs
index 88869426..d489dd0f 100644
--- a/QtVsTools.Core/CompilerToolWrapper.cs
+++ b/QtVsTools.Core/CompilerToolWrapper.cs
@@ -26,11 +26,11 @@
 **
 ****************************************************************************/
 
-using Microsoft.VisualStudio.VCProjectEngine;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using Microsoft.VisualStudio.VCProjectEngine;
 
 namespace QtVsTools.Core
 {
diff --git a/QtVsTools.Core/HelperFunctions.cs b/QtVsTools.Core/HelperFunctions.cs
index 8db2709d..82a3c850 100644
--- a/QtVsTools.Core/HelperFunctions.cs
+++ b/QtVsTools.Core/HelperFunctions.cs
@@ -26,13 +26,6 @@
 **
 ****************************************************************************/
 
-using EnvDTE;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.VCProjectEngine;
-#if VS2017
-using Microsoft.Win32;
-#endif
-using QtVsTools.Core.QtMsBuild;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -43,11 +36,19 @@ using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.VCProjectEngine;
+#if VS2017
+using Microsoft.Win32;
+#endif
+using EnvDTE;
 
 using Process = System.Diagnostics.Process;
 
 namespace QtVsTools.Core
 {
+    using QtMsBuild;
+
     public static class HelperFunctions
     {
         static readonly HashSet<string> _sources = new HashSet<string>(new[] { ".c", ".cpp", ".cxx" },
diff --git a/QtVsTools.Core/LinkerToolWrapper.cs b/QtVsTools.Core/LinkerToolWrapper.cs
index 3de3ead7..dfe9ac0d 100644
--- a/QtVsTools.Core/LinkerToolWrapper.cs
+++ b/QtVsTools.Core/LinkerToolWrapper.cs
@@ -26,11 +26,11 @@
 **
 ****************************************************************************/
 
-using Microsoft.VisualStudio.VCProjectEngine;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
+using Microsoft.VisualStudio.VCProjectEngine;
 
 namespace QtVsTools.Core
 {
diff --git a/QtVsTools.Core/Messages.cs b/QtVsTools.Core/Messages.cs
index 4ff66d8f..ae68b6e8 100644
--- a/QtVsTools.Core/Messages.cs
+++ b/QtVsTools.Core/Messages.cs
@@ -26,19 +26,20 @@
 **
 ****************************************************************************/
 
-using EnvDTE;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Threading;
-using QtVsTools.VisualStudio;
 using System;
 using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Threading;
+using EnvDTE;
+
+using Task = System.Threading.Tasks.Task;
 
 namespace QtVsTools.Core
 {
-    using Task = System.Threading.Tasks.Task;
+    using VisualStudio;
 
     public static class Messages
     {
diff --git a/QtVsTools.Core/MsBuildProject.cs b/QtVsTools.Core/MsBuildProject.cs
index 9cd54631..dda6f54a 100644
--- a/QtVsTools.Core/MsBuildProject.cs
+++ b/QtVsTools.Core/MsBuildProject.cs
@@ -30,21 +30,22 @@ using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Linq;
 using System.Xml;
 using System.Xml.Linq;
-using QtVsTools.Core.QtMsBuild;
-using System.Text.RegularExpressions;
 using Microsoft.Build.Construction;
 using Microsoft.Build.Execution;
 using Microsoft.Build.Evaluation;
-using QtVsTools.SyntaxAnalysis;
 using Microsoft.VisualStudio.Shell;
 
 namespace QtVsTools.Core
 {
+    using QtMsBuild;
+    using SyntaxAnalysis;
+
     using static HelperFunctions;
-    using static RegExpr;
+    using static SyntaxAnalysis.RegExpr;
 
     public class MsBuildProject
     {
diff --git a/QtVsTools.Core/OutputWindowPane.cs b/QtVsTools.Core/OutputWindowPane.cs
index 1cdc5c2a..187a561c 100644
--- a/QtVsTools.Core/OutputWindowPane.cs
+++ b/QtVsTools.Core/OutputWindowPane.cs
@@ -32,11 +32,12 @@ using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Threading;
-using QtVsTools.VisualStudio;
+
+using Task = System.Threading.Tasks.Task;
 
 namespace QtVsTools.Core
 {
-    using Task = System.Threading.Tasks.Task;
+    using VisualStudio;
 
     public class OutputWindowPane
     {
diff --git a/QtVsTools.Core/ProjectExporter.cs b/QtVsTools.Core/ProjectExporter.cs
index b5bcfcca..7548f714 100644
--- a/QtVsTools.Core/ProjectExporter.cs
+++ b/QtVsTools.Core/ProjectExporter.cs
@@ -26,16 +26,16 @@
 **
 ****************************************************************************/
 
-using EnvDTE;
-using EnvDTE80;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.VCProjectEngine;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.VCProjectEngine;
+using EnvDTE;
+using EnvDTE80;
 
 namespace QtVsTools.Core
 {
diff --git a/QtVsTools.Core/ProjectImporter.cs b/QtVsTools.Core/ProjectImporter.cs
index 2ed75357..5556eb13 100644
--- a/QtVsTools.Core/ProjectImporter.cs
+++ b/QtVsTools.Core/ProjectImporter.cs
@@ -26,13 +26,13 @@
 **
 ****************************************************************************/
 
-using EnvDTE;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.VCProjectEngine;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.VCProjectEngine;
+using EnvDTE;
 
 namespace QtVsTools.Core
 {
diff --git a/QtVsTools.Core/QMake.cs b/QtVsTools.Core/QMake.cs
index 5cdabeb3..c917988c 100644
--- a/QtVsTools.Core/QMake.cs
+++ b/QtVsTools.Core/QMake.cs
@@ -32,10 +32,11 @@ using System.Diagnostics;
 using System.IO;
 using System.Text;
 using Microsoft.VisualStudio.Shell;
-using QtVsTools.VisualStudio;
 
 namespace QtVsTools.Core
 {
+    using VisualStudio;
+
     public abstract class QMake
     {
         public Dictionary<string, string> Vars { get; protected set; }
diff --git a/QtVsTools.Core/QMakeConf.cs b/QtVsTools.Core/QMakeConf.cs
index 14f06ece..2488ff1c 100644
--- a/QtVsTools.Core/QMakeConf.cs
+++ b/QtVsTools.Core/QMakeConf.cs
@@ -26,10 +26,10 @@
 **
 ****************************************************************************/
 
-using Microsoft.VisualStudio.Shell;
 using System;
 using System.Collections;
 using System.IO;
+using Microsoft.VisualStudio.Shell;
 
 namespace QtVsTools.Core
 {
diff --git a/QtVsTools.Core/QMakeQuery.cs b/QtVsTools.Core/QMakeQuery.cs
index 10feff86..b7092e88 100644
--- a/QtVsTools.Core/QMakeQuery.cs
+++ b/QtVsTools.Core/QMakeQuery.cs
@@ -31,11 +31,10 @@ using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using Microsoft.VisualStudio.Shell;
-using QtVsTools.SyntaxAnalysis;
 
 namespace QtVsTools.Core
 {
-    using static RegExpr;
+    using static SyntaxAnalysis.RegExpr;
 
     public class QMakeQuery : QMake
     {
diff --git a/QtVsTools.Core/QtMsBuild.cs b/QtVsTools.Core/QtMsBuild.cs
index 705070f6..817a296d 100644
--- a/QtVsTools.Core/QtMsBuild.cs
+++ b/QtVsTools.Core/QtMsBuild.cs
@@ -26,17 +26,17 @@
 **
 ****************************************************************************/
 
+using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
-using System;
-using System.IO;
-
-using CommandLineParser = QtVsTools.Core.CommandLine.Parser;
-using CommandLineOption = QtVsTools.Core.CommandLine.Option;
 
 namespace QtVsTools.Core.QtMsBuild
 {
+    using CommandLineParser = CommandLine.Parser;
+    using CommandLineOption = CommandLine.Option;
+
     public interface IVSMacroExpander
     {
         string ExpandString(string stringToExpand);
diff --git a/QtVsTools.Core/QtProject.cs b/QtVsTools.Core/QtProject.cs
index 7062a2ae..cdd27bac 100644
--- a/QtVsTools.Core/QtProject.cs
+++ b/QtVsTools.Core/QtProject.cs
@@ -26,8 +26,6 @@
 **
 ****************************************************************************/
 
-using EnvDTE;
-using Microsoft.VisualStudio.VCProjectEngine;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -36,11 +34,14 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using System.Xml;
-using QtVsTools.Core.QtMsBuild;
 using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.VCProjectEngine;
+using EnvDTE;
 
 namespace QtVsTools.Core
 {
+    using QtMsBuild;
+
     /// <summary>
     /// QtProject holds the Qt specific properties for a Visual Studio project.
     /// There exists at most one QtProject per EnvDTE.Project.
diff --git a/QtVsTools.Core/QtVSIPSettings.cs b/QtVsTools.Core/QtVSIPSettings.cs
index 48328e7f..22ea3dea 100644
--- a/QtVsTools.Core/QtVSIPSettings.cs
+++ b/QtVsTools.Core/QtVSIPSettings.cs
@@ -26,11 +26,11 @@
 **
 ****************************************************************************/
 
+using System;
+using System.Collections;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.VCProjectEngine;
 using Microsoft.Win32;
-using System;
-using System.Collections;
 
 namespace QtVsTools.Core
 {
diff --git a/QtVsTools.Core/QtVersionManager.cs b/QtVsTools.Core/QtVersionManager.cs
index 3618d6d7..625cd0e3 100644
--- a/QtVsTools.Core/QtVersionManager.cs
+++ b/QtVsTools.Core/QtVersionManager.cs
@@ -26,14 +26,14 @@
 **
 ****************************************************************************/
 
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.VCProjectEngine;
-using Microsoft.Win32;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.VCProjectEngine;
+using Microsoft.Win32;
 
 namespace QtVsTools.Core
 {
diff --git a/QtVsTools.Core/RccOptions.cs b/QtVsTools.Core/RccOptions.cs
index 71c0c761..3fa374a6 100644
--- a/QtVsTools.Core/RccOptions.cs
+++ b/QtVsTools.Core/RccOptions.cs
@@ -26,9 +26,9 @@
 **
 ****************************************************************************/
 
+using System;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.VCProjectEngine;
-using System;
 
 namespace QtVsTools.Core
 {
diff --git a/QtVsTools.Core/VersionInformation.cs b/QtVsTools.Core/VersionInformation.cs
index 67997ccf..5c7780b2 100644
--- a/QtVsTools.Core/VersionInformation.cs
+++ b/QtVsTools.Core/VersionInformation.cs
@@ -26,7 +26,6 @@
 **
 ****************************************************************************/
 
-using Microsoft.VisualStudio.Shell;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -35,6 +34,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using Microsoft.VisualStudio.Shell;
 
 namespace QtVsTools.Core
 {
diff --git a/QtVsTools.Core/WaitDialog.cs b/QtVsTools.Core/WaitDialog.cs
index 6b76abd6..d41c57d5 100644
--- a/QtVsTools.Core/WaitDialog.cs
+++ b/QtVsTools.Core/WaitDialog.cs
@@ -30,10 +30,11 @@ using System;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using QtVsTools.VisualStudio;
 
 namespace QtVsTools.Core
 {
+    using VisualStudio;
+
     public class WaitDialog : IDisposable
     {
         static IVsThreadedWaitDialogFactory factory = null;