aboutsummaryrefslogtreecommitdiffstats
path: root/QtVsTools.Core
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2022-02-08 13:43:03 +0100
committerKarsten Heimrich <karsten.heimrich@qt.io>2022-02-09 18:54:42 +0000
commite908aba3ab490e3449d21fdc6a10052c1a2f4547 (patch)
tree26b38df29e53b3bed96a59868646370a174c66d2 /QtVsTools.Core
parent4e745ba2da57d920c813f77e0e5d5f80c84ae49c (diff)
Sort modifier
Change-Id: I546409ef6d88571e7fe9299bef858e431085fea2 Reviewed-by: Miguel Costa <miguel.costa@qt.io>
Diffstat (limited to 'QtVsTools.Core')
-rw-r--r--QtVsTools.Core/HelperFunctions.cs26
-rw-r--r--QtVsTools.Core/Messages.cs12
-rw-r--r--QtVsTools.Core/QtProject.cs8
-rw-r--r--QtVsTools.Core/QtVersionManager.cs2
4 files changed, 24 insertions, 24 deletions
diff --git a/QtVsTools.Core/HelperFunctions.cs b/QtVsTools.Core/HelperFunctions.cs
index df92470b..12a4933f 100644
--- a/QtVsTools.Core/HelperFunctions.cs
+++ b/QtVsTools.Core/HelperFunctions.cs
@@ -52,14 +52,14 @@ namespace QtVsTools.Core
{
static readonly HashSet<string> _sources = new HashSet<string>(new[] { ".c", ".cpp", ".cxx" },
StringComparer.OrdinalIgnoreCase);
- static public bool IsSourceFile(string fileName)
+ public static bool IsSourceFile(string fileName)
{
return _sources.Contains(Path.GetExtension(fileName));
}
static readonly HashSet<string> _headers = new HashSet<string>(new[] { ".h", ".hpp", ".hxx" },
StringComparer.OrdinalIgnoreCase);
- static public bool IsHeaderFile(string fileName)
+ public static bool IsHeaderFile(string fileName)
{
return _headers.Contains(Path.GetExtension(fileName));
}
@@ -94,25 +94,25 @@ namespace QtVsTools.Core
return ".qml".Equals(Path.GetExtension(fileName), StringComparison.OrdinalIgnoreCase);
}
- static public void SetDebuggingEnvironment(Project prj)
+ public static void SetDebuggingEnvironment(Project prj)
{
ThreadHelper.ThrowIfNotOnUIThread();
SetDebuggingEnvironment(prj, string.Empty);
}
- static public void SetDebuggingEnvironment(Project prj, string solutionConfig)
+ public static void SetDebuggingEnvironment(Project prj, string solutionConfig)
{
ThreadHelper.ThrowIfNotOnUIThread();
SetDebuggingEnvironment(prj, "PATH=$(QTDIR)\\bin;$(PATH)", false, solutionConfig);
}
- static public void SetDebuggingEnvironment(Project prj, string envpath, bool overwrite)
+ public static void SetDebuggingEnvironment(Project prj, string envpath, bool overwrite)
{
ThreadHelper.ThrowIfNotOnUIThread();
SetDebuggingEnvironment(prj, envpath, overwrite, string.Empty);
}
- static public void SetDebuggingEnvironment(Project prj, string envpath, bool overwrite, string solutionConfig)
+ public static void SetDebuggingEnvironment(Project prj, string envpath, bool overwrite, string solutionConfig)
{
if (QtProject.GetFormatVersion(prj) >= Resources.qtMinFormatVersion_Settings)
return;
@@ -194,13 +194,13 @@ namespace QtVsTools.Core
/// Returns the normalized file path of a given file.
/// </summary>
/// <param name="name">file name</param>
- static public string NormalizeFilePath(string name)
+ public static string NormalizeFilePath(string name)
{
var fi = new FileInfo(name);
return fi.FullName;
}
- static public string NormalizeRelativeFilePath(string path)
+ public static string NormalizeRelativeFilePath(string path)
{
if (path == null)
return ".\\";
@@ -226,7 +226,7 @@ namespace QtVsTools.Core
return path;
}
- static public bool IsAbsoluteFilePath(string path)
+ public static bool IsAbsoluteFilePath(string path)
{
path = path.Trim();
if (path.Length >= 2 && path[1] == ':')
@@ -243,7 +243,7 @@ namespace QtVsTools.Core
/// </summary>
/// <param name="streamReader"></param>
/// <returns>the composite string</returns>
- static private string ReadProFileLine(StreamReader streamReader)
+ private static string ReadProFileLine(StreamReader streamReader)
{
var line = streamReader.ReadLine();
if (line == null)
@@ -264,7 +264,7 @@ namespace QtVsTools.Core
/// </summary>
/// <param name="profile">full name of .pro file to read</param>
/// <returns>true if this is a subdirs file</returns>
- static public bool IsSubDirsFile(string profile)
+ public static bool IsSubDirsFile(string profile)
{
StreamReader sr = null;
try {
@@ -392,7 +392,7 @@ namespace QtVsTools.Core
/// </summary>
/// <param name="config">File configuration</param>
/// <returns></returns>
- static public VCCustomBuildTool GetCustomBuildTool(VCFileConfiguration config)
+ public static VCCustomBuildTool GetCustomBuildTool(VCFileConfiguration config)
{
var file = config.File as VCFile;
if (file == null || file.ItemType != "CustomBuild")
@@ -417,7 +417,7 @@ namespace QtVsTools.Core
/// has to be "CustomBuild"
/// </summary>
/// <param name="projectItem">Project Item which needs to have custom build tool</param>
- static public void EnsureCustomBuildToolAvailable(ProjectItem projectItem)
+ public static void EnsureCustomBuildToolAvailable(ProjectItem projectItem)
{
ThreadHelper.ThrowIfNotOnUIThread();
diff --git a/QtVsTools.Core/Messages.cs b/QtVsTools.Core/Messages.cs
index 7ec98a9e..0f2680a7 100644
--- a/QtVsTools.Core/Messages.cs
+++ b/QtVsTools.Core/Messages.cs
@@ -121,35 +121,35 @@ namespace QtVsTools.Core
private static readonly string WarningString = SR.GetString("Messages_Warning");
private static readonly string SolutionString = SR.GetString("Messages_SolveProblem");
- static public void DisplayCriticalErrorMessage(System.Exception e)
+ public static void DisplayCriticalErrorMessage(System.Exception e)
{
MessageBox.Show(ErrorString +
ExceptionToString(e),
SR.GetString("Resources_QtVsTools"), MessageBoxButtons.OK, MessageBoxIcon.Error);
}
- static public void DisplayCriticalErrorMessage(string msg)
+ public static void DisplayCriticalErrorMessage(string msg)
{
MessageBox.Show(ErrorString +
msg,
SR.GetString("Resources_QtVsTools"), MessageBoxButtons.OK, MessageBoxIcon.Error);
}
- static public void DisplayErrorMessage(System.Exception e)
+ public static void DisplayErrorMessage(System.Exception e)
{
MessageBox.Show(ErrorString +
ExceptionToString(e),
SR.GetString("Resources_QtVsTools"), MessageBoxButtons.OK, MessageBoxIcon.Error);
}
- static public void DisplayErrorMessage(string msg)
+ public static void DisplayErrorMessage(string msg)
{
MessageBox.Show(ErrorString +
msg,
SR.GetString("Resources_QtVsTools"), MessageBoxButtons.OK, MessageBoxIcon.Error);
}
- static public void DisplayWarningMessage(System.Exception e, string solution)
+ public static void DisplayWarningMessage(System.Exception e, string solution)
{
MessageBox.Show(WarningString +
ExceptionToString(e) +
@@ -158,7 +158,7 @@ namespace QtVsTools.Core
SR.GetString("Resources_QtVsTools"), MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
- static public void DisplayWarningMessage(string msg)
+ public static void DisplayWarningMessage(string msg)
{
MessageBox.Show(WarningString +
msg,
diff --git a/QtVsTools.Core/QtProject.cs b/QtVsTools.Core/QtProject.cs
index 283d2fa1..5965635e 100644
--- a/QtVsTools.Core/QtProject.cs
+++ b/QtVsTools.Core/QtProject.cs
@@ -1493,7 +1493,7 @@ namespace QtVsTools.Core
}
}
- static public void ExcludeFromAllBuilds(VCFile file)
+ public static void ExcludeFromAllBuilds(VCFile file)
{
if (file == null)
return;
@@ -3040,7 +3040,7 @@ namespace QtVsTools.Core
resFile.Remove();
}
- static private void AddPlatformToVCProj(string projectFileName, string oldPlatformName, string newPlatformName)
+ private static void AddPlatformToVCProj(string projectFileName, string oldPlatformName, string newPlatformName)
{
var tempFileName = Path.GetTempFileName();
var fi = new FileInfo(projectFileName);
@@ -3055,7 +3055,7 @@ namespace QtVsTools.Core
fi.Delete();
}
- static private void AddPlatformToVCProj(XmlDocument doc, string oldPlatformName, string newPlatformName)
+ private static void AddPlatformToVCProj(XmlDocument doc, string oldPlatformName, string newPlatformName)
{
var vsProj = doc.DocumentElement.SelectSingleNode("/VisualStudioProject");
var platforms = vsProj.SelectSingleNode("Platforms");
@@ -3089,7 +3089,7 @@ namespace QtVsTools.Core
}
}
- static private void SetTargetMachine(VCLinkerTool linker, VersionInformation versionInfo)
+ private static void SetTargetMachine(VCLinkerTool linker, VersionInformation versionInfo)
{
var qMakeLFlagsWindows = versionInfo.GetQMakeConfEntry("QMAKE_LFLAGS_WINDOWS");
var rex = new Regex("/MACHINE:(\\S+)");
diff --git a/QtVsTools.Core/QtVersionManager.cs b/QtVsTools.Core/QtVersionManager.cs
index ef7c3da1..4b813c23 100644
--- a/QtVsTools.Core/QtVersionManager.cs
+++ b/QtVsTools.Core/QtVersionManager.cs
@@ -74,7 +74,7 @@ namespace QtVsTools.Core
private static readonly EventWaitHandle packageInit = new EventWaitHandle(false, EventResetMode.ManualReset);
private static EventWaitHandle packageInitDone = null;
- static public QtVersionManager The(EventWaitHandle initDone = null)
+ public static QtVersionManager The(EventWaitHandle initDone = null)
{
if (initDone == null) {
packageInit.WaitOne();