From 59a18370efee18a86f8ac347af25552abf8930fa Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Tue, 4 Aug 2020 20:10:42 +1000 Subject: [PATCH] remove in use obsolete GetAllRemainingParameter and use Search --- Flow.Launcher.Core/Plugin/QueryBuilder.cs | 6 +----- Flow.Launcher.Plugin/Query.cs | 4 +--- Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Flow.Launcher.Core/Plugin/QueryBuilder.cs b/Flow.Launcher.Core/Plugin/QueryBuilder.cs index 9ad6466e9..df336e14b 100644 --- a/Flow.Launcher.Core/Plugin/QueryBuilder.cs +++ b/Flow.Launcher.Core/Plugin/QueryBuilder.cs @@ -29,7 +29,6 @@ namespace Flow.Launcher.Core.Plugin else { // non action keyword actionKeyword = string.Empty; - actionParameters = terms.ToList(); search = rawQuery; } @@ -38,10 +37,7 @@ namespace Flow.Launcher.Core.Plugin Terms = terms, RawQuery = rawQuery, ActionKeyword = actionKeyword, - Search = search, - // Obsolete value initialisation - ActionName = actionKeyword, - ActionParameters = actionParameters + Search = search }; return query; diff --git a/Flow.Launcher.Plugin/Query.cs b/Flow.Launcher.Plugin/Query.cs index 4078a680e..1eb5c9c14 100644 --- a/Flow.Launcher.Plugin/Query.cs +++ b/Flow.Launcher.Plugin/Query.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; @@ -94,7 +94,5 @@ namespace Flow.Launcher.Plugin } public override string ToString() => RawQuery; - [Obsolete("Use Search instead, this method will be removed in v1.3.0")] - public string GetAllRemainingParameter() => Search; } } diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs index 5d74ed4ad..67ee87f94 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs @@ -33,7 +33,7 @@ namespace Flow.Launcher.Plugin.BrowserBookmark public List Query(Query query) { - string param = query.GetAllRemainingParameter().TrimStart(); + string param = query.Search.TrimStart(); // Should top results be returned? (true if no search parameters have been passed) var topResults = string.IsNullOrEmpty(param);