aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2023-02-07 16:22:08 +0100
committerKarsten Heimrich <karsten.heimrich@qt.io>2023-02-23 14:29:53 +0000
commitb12a10b1cc177b0f01b880f1a701c25be6c30d01 (patch)
treeb0f941bd365ac1a1d46a2f12464d4736ac0340c6
parent219753233ee5d62113a54fd6d3627c936b54dc7f (diff)
Use index property
Change-Id: Ic5deec80b05842a3d3810b77fe29388af6040a10 Reviewed-by: Miguel Costa <miguel.costa@qt.io>
-rw-r--r--QtVsTools.Core/HelperFunctions.cs2
-rw-r--r--QtVsTools.Core/QtProject.cs4
-rw-r--r--QtVsTools.Core/QtVersionManager.cs10
-rw-r--r--QtVsTools.Package/Package/DteEventsHandler.cs11
4 files changed, 13 insertions, 14 deletions
diff --git a/QtVsTools.Core/HelperFunctions.cs b/QtVsTools.Core/HelperFunctions.cs
index 1ae247a9..6bd7a6c9 100644
--- a/QtVsTools.Core/HelperFunctions.cs
+++ b/QtVsTools.Core/HelperFunctions.cs
@@ -262,7 +262,7 @@ namespace QtVsTools.Core
foreach (var global in envPro.Globals.VariableNames as string[]) {
if (global.StartsWith("Qt5Version", StringComparison.Ordinal)
- && envPro.Globals.get_VariablePersists(global)) {
+ && envPro.Globals.VariablePersists[global]) {
return true;
}
}
diff --git a/QtVsTools.Core/QtProject.cs b/QtVsTools.Core/QtProject.cs
index a11ce6c4..9ba757a8 100644
--- a/QtVsTools.Core/QtProject.cs
+++ b/QtVsTools.Core/QtProject.cs
@@ -177,7 +177,7 @@ namespace QtVsTools.Core
if (envPro.Globals != null && envPro.Globals.VariableNames != null) {
foreach (var global in envPro.Globals.VariableNames as string[]) {
if (global.StartsWith("Qt5Version", StringComparison.Ordinal)
- && envPro.Globals.get_VariablePersists(global)) {
+ && envPro.Globals.VariablePersists[global]) {
return 200;
}
}
@@ -771,7 +771,7 @@ namespace QtVsTools.Core
}
try {
- var prop = dte.get_Properties("TextEditor", "C/C++");
+ var prop = dte.Properties["TextEditor", "C/C++"];
var tabSize = Convert.ToInt64(prop.Item("TabSize").Value);
var insertTabs = Convert.ToBoolean(prop.Item("InsertTabs").Value);
diff --git a/QtVsTools.Core/QtVersionManager.cs b/QtVsTools.Core/QtVersionManager.cs
index 70b211ed..b8e6102d 100644
--- a/QtVsTools.Core/QtVersionManager.cs
+++ b/QtVsTools.Core/QtVersionManager.cs
@@ -296,10 +296,10 @@ namespace QtVsTools.Core
return false;
}
var key = "Qt5Version " + platform;
- if (!project.Globals.get_VariableExists(key) || project.Globals[key].ToString() != version)
+ if (!project.Globals.VariableExists[key] || project.Globals[key].ToString() != version)
project.Globals[key] = version;
- if (!project.Globals.get_VariablePersists(key))
- project.Globals.set_VariablePersists(key, true);
+ if (!project.Globals.VariablePersists[key])
+ project.Globals.VariablePersists[key] = true;
return true;
}
@@ -317,7 +317,7 @@ namespace QtVsTools.Core
}
var version = GetProjectQtVersion(project, config);
- if (version == null && project.Globals.get_VariablePersists("Qt5Version")) {
+ if (version == null && project.Globals.VariablePersists["Qt5Version"]) {
version = (string)project.Globals["Qt5Version"];
ExpandEnvironmentVariablesInQtVersion(ref version);
return VerifyIfQtVersionExists(version) ? version : null;
@@ -333,7 +333,7 @@ namespace QtVsTools.Core
return QtProject.GetPropertyValue(project, config, "QtInstall");
var key = "Qt5Version " + config.PlatformName;
- if (!project.Globals.get_VariablePersists(key))
+ if (!project.Globals.VariablePersists[key])
return null;
var version = (string)project.Globals[key];
ExpandEnvironmentVariablesInQtVersion(ref version);
diff --git a/QtVsTools.Package/Package/DteEventsHandler.cs b/QtVsTools.Package/Package/DteEventsHandler.cs
index 541b3538..1c1dc2d8 100644
--- a/QtVsTools.Package/Package/DteEventsHandler.cs
+++ b/QtVsTools.Package/Package/DteEventsHandler.cs
@@ -64,7 +64,7 @@ namespace QtVsTools
buildEvents.OnBuildBegin += buildEvents_OnBuildBegin;
buildEvents.OnBuildProjConfigBegin += OnBuildProjConfigBegin;
- documentEvents = events.get_DocumentEvents(null);
+ documentEvents = events.DocumentEvents;
documentEvents.DocumentSaved += DocumentSaved;
projectItemsEvents = events.ProjectItemsEvents;
@@ -82,15 +82,14 @@ namespace QtVsTools
windowEvents.WindowActivated += WindowEvents_WindowActivated;
var debugCommandsGUID = "{5EFC7975-14BC-11CF-9B2B-00AA00573819}";
- debugStartEvents = events.get_CommandEvents(debugCommandsGUID, 295);
+ debugStartEvents = events.CommandEvents[debugCommandsGUID, 295];
debugStartEvents.BeforeExecute += DebugStartEvents_BeforeExecute;
- debugStartWithoutDebuggingEvents = events.get_CommandEvents(debugCommandsGUID, 368);
+ debugStartWithoutDebuggingEvents = events.CommandEvents[debugCommandsGUID, 368];
debugStartWithoutDebuggingEvents.BeforeExecute += DebugStartWithoutDebuggingEvents_BeforeExecute;
- f1HelpEvents = events.get_CommandEvents(
- typeof(VSConstants.VSStd97CmdID).GUID.ToString("B"),
- (int)VSConstants.VSStd97CmdID.F1Help);
+ f1HelpEvents = events.CommandEvents[typeof(VSConstants.VSStd97CmdID).GUID.ToString("B"),
+ (int)VSConstants.VSStd97CmdID.F1Help];
f1HelpEvents.BeforeExecute += F1HelpEvents_BeforeExecute;
InitializeVCProjects();