aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2023-02-13 11:24:11 +0100
committerKarsten Heimrich <karsten.heimrich@qt.io>2023-02-23 14:29:56 +0000
commit090f14e1ca378a4cca32b5b44cf4330dbda5301a (patch)
tree2a3e6423065ebdbbe7338d8bc0844a87424a7133
parentb12a10b1cc177b0f01b880f1a701c25be6c30d01 (diff)
Remove interface IQtVsToolsOptions
Change-Id: I4bb81e5567178c74b0bfe55c9bfa1d57468e3b3d Reviewed-by: Miguel Costa <miguel.costa@qt.io>
-rw-r--r--QtVsTools.Core/QtVSIPSettings.cs9
-rw-r--r--QtVsTools.Package/Options/QtOptionsPage.cs5
-rw-r--r--QtVsTools.Package/QtVsToolsPackage.cs2
3 files changed, 1 insertions, 15 deletions
diff --git a/QtVsTools.Core/QtVSIPSettings.cs b/QtVsTools.Core/QtVSIPSettings.cs
index c61d71c3..2e3efee2 100644
--- a/QtVsTools.Core/QtVSIPSettings.cs
+++ b/QtVsTools.Core/QtVSIPSettings.cs
@@ -13,14 +13,6 @@ using Microsoft.Win32;
namespace QtVsTools.Core
{
- public interface IQtVsToolsOptions
- {
- string QtMsBuildPath { get; }
- bool QmlDebuggerEnabled { get; }
- int QmlDebuggerTimeout { get; }
- bool HelpPreferenceOnline { get; }
- }
-
public static class QtVSIPSettings
{
private static readonly Dictionary<string, string> MocDirCache
@@ -30,7 +22,6 @@ namespace QtVsTools.Core
private static readonly Dictionary<string, string> RccDirCache
= new(StringComparer.OrdinalIgnoreCase);
- public static IQtVsToolsOptions Options { get; set; }
public static string GetMocDirectory()
{
diff --git a/QtVsTools.Package/Options/QtOptionsPage.cs b/QtVsTools.Package/Options/QtOptionsPage.cs
index 147b8d42..bcfddd5e 100644
--- a/QtVsTools.Package/Options/QtOptionsPage.cs
+++ b/QtVsTools.Package/Options/QtOptionsPage.cs
@@ -45,7 +45,7 @@ namespace QtVsTools.Options
using static Common.EnumExt;
- public class QtOptionsPage : DialogPage, IQtVsToolsOptions
+ public class QtOptionsPage : DialogPage
{
public enum QtMsBuild
{
@@ -175,7 +175,6 @@ namespace QtVsTools.Options
[DisplayName("Runtime connection timeout (msecs)")]
[TypeConverter(typeof(TimeoutConverter))]
public Timeout QmlDebuggerTimeout { get; set; }
- int IQtVsToolsOptions.QmlDebuggerTimeout => (int)QmlDebuggerTimeout;
[Category("Help")]
[DisplayName("Keyboard shortcut")]
@@ -186,8 +185,6 @@ namespace QtVsTools.Options
[Category("Help")]
[DisplayName("Preferred source")]
public QtHelp.SourcePreference HelpPreference { get; set; }
- bool IQtVsToolsOptions.HelpPreferenceOnline
- => (HelpPreference == QtHelp.SourcePreference.Online);
[Category("Help")]
[DisplayName("Try Qt documentation when F1 is pressed")]
diff --git a/QtVsTools.Package/QtVsToolsPackage.cs b/QtVsTools.Package/QtVsToolsPackage.cs
index ef8e26b2..6ab3be0c 100644
--- a/QtVsTools.Package/QtVsToolsPackage.cs
+++ b/QtVsTools.Package/QtVsToolsPackage.cs
@@ -172,8 +172,6 @@ namespace QtVsTools
if ((Dte = await VsServiceProvider.GetServiceAsync<DTE>()) == null)
throw new Exception("Unable to get service: DTE");
- QtVSIPSettings.Options = Options;
-
eventHandler = new DteEventsHandler(Dte);
Qml.Debug.Launcher.Initialize();