From 575ff31ce56e056ac4f97f0cb5faa1c46d20f612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=98=E9=9F=AC=20=E5=BC=A0?= Date: Mon, 15 Feb 2021 17:17:03 +0800 Subject: [PATCH] change format Initialize out variable inline, and use discard varable for unused variable --- .../Programs/UWP.cs | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs index 69afecb4f..855a11c86 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs @@ -56,10 +56,9 @@ namespace Flow.Launcher.Plugin.Program.Programs var namespaces = XmlNamespaces(path); InitPackageVersion(namespaces); - IStream stream; const uint noAttribute = 0x80; const Stgm exclusiveRead = Stgm.Read | Stgm.ShareExclusive; - var hResult = SHCreateStreamOnFileEx(path, exclusiveRead, noAttribute, false, null, out stream); + var hResult = SHCreateStreamOnFileEx(path, exclusiveRead, noAttribute, false, null, out IStream stream); if (hResult == Hresult.Ok) { @@ -345,14 +344,13 @@ namespace Flow.Launcher.Plugin.Program.Programs private async void Launch(IPublicAPI api) { var appManager = new ApplicationActivationHelper.ApplicationActivationManager(); - uint unusedPid; const string noArgs = ""; const ApplicationActivationHelper.ActivateOptions noFlags = ApplicationActivationHelper.ActivateOptions.None; await Task.Run(() => { try { - appManager.ActivateApplication(UserModelId, noArgs, noFlags, out unusedPid); + appManager.ActivateApplication(UserModelId, noArgs, noFlags, out _); } catch (Exception) { @@ -366,19 +364,13 @@ namespace Flow.Launcher.Plugin.Program.Programs public Application(AppxPackageHelper.IAppxManifestApplication manifestApp, UWP package) { // This is done because we cannot use the keyword 'out' along with a property - string tmpUserModelId; - string tmpUniqueIdentifier; - string tmpDisplayName; - string tmpDescription; - string tmpBackgroundColor; - string tmpEntryPoint; - manifestApp.GetAppUserModelId(out tmpUserModelId); - manifestApp.GetAppUserModelId(out tmpUniqueIdentifier); - manifestApp.GetStringValue("DisplayName", out tmpDisplayName); - manifestApp.GetStringValue("Description", out tmpDescription); - manifestApp.GetStringValue("BackgroundColor", out tmpBackgroundColor); - manifestApp.GetStringValue("EntryPoint", out tmpEntryPoint); + manifestApp.GetAppUserModelId(out string tmpUserModelId); + manifestApp.GetAppUserModelId(out string tmpUniqueIdentifier); + manifestApp.GetStringValue("DisplayName", out string tmpDisplayName); + manifestApp.GetStringValue("Description", out string tmpDescription); + manifestApp.GetStringValue("BackgroundColor", out string tmpBackgroundColor); + manifestApp.GetStringValue("EntryPoint", out string tmpEntryPoint); UserModelId = tmpUserModelId; UniqueIdentifier = tmpUniqueIdentifier; @@ -464,9 +456,8 @@ namespace Flow.Launcher.Plugin.Program.Programs }; if (logoKeyFromVersion.ContainsKey(Package.Version)) { - string logoUri; var key = logoKeyFromVersion[Package.Version]; - app.GetStringValue(key, out logoUri); + app.GetStringValue(key, out string logoUri); return logoUri; } else