From fcc20282791f6145854328b1c2840dbf1e3bbe96 Mon Sep 17 00:00:00 2001 From: Karsten Heimrich Date: Thu, 1 Dec 2016 15:48:48 +0100 Subject: Fix whitespace adjustment Right now we changed only the files that would be opened by the editor. Better do it soon as we create the files and we know all of them. Change-Id: Id67b3643938654d1d24bd31cb0a6255d5ebc2566 Reviewed-by: Oliver Wolff --- src/qtwizard/ConsoleWizard.cs | 9 ++++----- src/qtwizard/DesignerWizard.cs | 8 +++----- src/qtwizard/GuiWizard.cs | 8 +++----- src/qtwizard/LibraryWizard.cs | 8 +++----- src/qtwizard/ServerWizard.cs | 9 ++++----- 5 files changed, 17 insertions(+), 25 deletions(-) diff --git a/src/qtwizard/ConsoleWizard.cs b/src/qtwizard/ConsoleWizard.cs index e1e72280..460df436 100644 --- a/src/qtwizard/ConsoleWizard.cs +++ b/src/qtwizard/ConsoleWizard.cs @@ -32,6 +32,7 @@ using Microsoft.VisualStudio.OLE.Interop; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.TemplateWizard; +using Microsoft.VisualStudio.VCProjectEngine; using QtProjectLib; using System.Collections.Generic; using System.IO; @@ -141,6 +142,9 @@ namespace QtProjectWizard var type = TemplateType.Application | TemplateType.ConsoleSystem; qtProject.WriteProjectBasicConfigurations(type, false); + foreach (VCFile file in (IVCCollection) qtProject.VCProject.Files) + qtProject.AdjustWhitespace(file.FullPath); + qtProject.AddModule(QtModule.Main); foreach (var module in data.Modules) qtProject.AddModule(QtModules.Instance.ModuleIdByName(module)); @@ -154,11 +158,6 @@ namespace QtProjectWizard public void BeforeOpeningFile(ProjectItem projectItem) { - if (projectItem.FileCount >= 1) { - var qtProject = QtProject.Create(projectItem.ContainingProject); - for (short i = 0; i < projectItem.FileCount; ++i) - qtProject.AdjustWhitespace(projectItem.FileNames[i]); - } } public void RunFinished() diff --git a/src/qtwizard/DesignerWizard.cs b/src/qtwizard/DesignerWizard.cs index a5e48660..946e2fbe 100644 --- a/src/qtwizard/DesignerWizard.cs +++ b/src/qtwizard/DesignerWizard.cs @@ -46,11 +46,6 @@ namespace QtProjectWizard { public void BeforeOpeningFile(ProjectItem projectItem) { - if (projectItem.FileCount >= 1) { - var qtProject = QtProject.Create(projectItem.ContainingProject); - for (short i = 0; i < projectItem.FileCount; ++i) - qtProject.AdjustWhitespace(projectItem.FileNames[i]); - } } public void ProjectFinishedGenerating(Project project) @@ -101,6 +96,9 @@ namespace QtProjectWizard qtProject.AddFileToProject(data.PluginClass.ToLower() + @".json", Filters.OtherFiles()); + foreach (VCFile file in (IVCCollection) qtProject.VCProject.Files) + qtProject.AdjustWhitespace(file.FullPath); + qtProject.SetQtEnvironment(qtVersion); qtProject.Finish(); // Collapses all project nodes. } diff --git a/src/qtwizard/GuiWizard.cs b/src/qtwizard/GuiWizard.cs index bc989eec..cc88964c 100644 --- a/src/qtwizard/GuiWizard.cs +++ b/src/qtwizard/GuiWizard.cs @@ -252,6 +252,9 @@ namespace QtProjectWizard } catch { } } + foreach (VCFile file in (IVCCollection) qtProject.VCProject.Files) + qtProject.AdjustWhitespace(file.FullPath); + qtProject.SetQtEnvironment(qtVersion); qtProject.Finish(); // Collapses all project nodes. } @@ -262,11 +265,6 @@ namespace QtProjectWizard public void BeforeOpeningFile(ProjectItem projectItem) { - if (projectItem.FileCount >= 1) { - var qtProject = QtProject.Create(projectItem.ContainingProject); - for (short i = 0; i < projectItem.FileCount; ++i) - qtProject.AdjustWhitespace(projectItem.FileNames[i]); - } } public void RunFinished() diff --git a/src/qtwizard/LibraryWizard.cs b/src/qtwizard/LibraryWizard.cs index 69a8bb5b..24f42c21 100644 --- a/src/qtwizard/LibraryWizard.cs +++ b/src/qtwizard/LibraryWizard.cs @@ -45,11 +45,6 @@ namespace QtProjectWizard { public void BeforeOpeningFile(ProjectItem projectItem) { - if (projectItem.FileCount >= 1) { - var qtProject = QtProject.Create(projectItem.ContainingProject); - for (short i = 0; i < projectItem.FileCount; ++i) - qtProject.AdjustWhitespace(projectItem.FileNames[i]); - } } public void ProjectFinishedGenerating(Project project) @@ -92,6 +87,9 @@ namespace QtProjectWizard qtProject.AddFileToProject(@"stdafx.h", Filters.HeaderFiles()); } + foreach (VCFile file in (IVCCollection) qtProject.VCProject.Files) + qtProject.AdjustWhitespace(file.FullPath); + qtProject.AddDefine(projectDefine, BuildConfig.Both); if (data.CreateStaticLibrary) qtProject.AddDefine("BUILD_STATIC", BuildConfig.Both); diff --git a/src/qtwizard/ServerWizard.cs b/src/qtwizard/ServerWizard.cs index ce92e815..5db868b2 100644 --- a/src/qtwizard/ServerWizard.cs +++ b/src/qtwizard/ServerWizard.cs @@ -45,11 +45,6 @@ namespace QtProjectWizard { public void BeforeOpeningFile(ProjectItem projectItem) { - if (projectItem.FileCount >= 1) { - var qtProject = QtProject.Create(projectItem.ContainingProject); - for (short i = 0; i < projectItem.FileCount; ++i) - qtProject.AdjustWhitespace(projectItem.FileNames[i]); - } } public void ProjectFinishedGenerating(Project project) @@ -99,6 +94,10 @@ namespace QtProjectWizard qtProject.AddFileToProject(safeprojectname + @".def", Filters.SourceFiles()); qtProject.AddActiveQtBuildStep(@"1.0", safeprojectname + @".def"); + + foreach (VCFile file in (IVCCollection) qtProject.VCProject.Files) + qtProject.AdjustWhitespace(file.FullPath); + qtProject.SetQtEnvironment(qtVersion); qtProject.Finish(); // Collapses all project nodes. } -- cgit v1.2.3