From 84c0c4a041e8f0b70cb68ecd4113233a0a3e475a Mon Sep 17 00:00:00 2001 From: tian-lt Date: Wed, 13 Apr 2022 02:06:58 +0800 Subject: [PATCH] resolve warning WMC1507 --- src/CalcViewModel/Common/NavCategory.cpp | 14 ++++++------- src/CalcViewModel/Common/NavCategory.h | 20 ++++++++++--------- .../DataLoaders/UnitConverterDataLoader.cpp | 2 +- src/Calculator/App.xaml.cs | 4 ++-- src/Calculator/Views/MainPage.xaml | 2 +- src/Calculator/Views/MainPage.xaml.cs | 2 +- .../NavCategoryUnitTests.cpp | 2 +- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/CalcViewModel/Common/NavCategory.cpp b/src/CalcViewModel/Common/NavCategory.cpp index 564e00f0..85731eb2 100644 --- a/src/CalcViewModel/Common/NavCategory.cpp +++ b/src/CalcViewModel/Common/NavCategory.cpp @@ -289,28 +289,28 @@ static std::vector s_categoryManifest = [] { return res; }(); -bool NavCategory::IsCalculatorViewMode(ViewMode mode) +bool NavCategory::IsCalculatorViewMode(ViewModeType mode) { // Historically, Calculator modes are Standard, Scientific, and Programmer. return !IsDateCalculatorViewMode(mode) && !IsGraphingCalculatorViewMode(mode) && IsModeInCategoryGroup(mode, CategoryGroupType::Calculator); } -bool NavCategory::IsGraphingCalculatorViewMode(ViewMode mode) +bool NavCategory::IsGraphingCalculatorViewMode(ViewModeType mode) { - return mode == ViewMode::Graphing; + return mode == ViewModeType::Graphing; } -bool NavCategory::IsDateCalculatorViewMode(ViewMode mode) +bool NavCategory::IsDateCalculatorViewMode(ViewModeType mode) { - return mode == ViewMode::Date; + return mode == ViewModeType::Date; } -bool NavCategory::IsConverterViewMode(ViewMode mode) +bool NavCategory::IsConverterViewMode(ViewModeType mode) { return IsModeInCategoryGroup(mode, CategoryGroupType::Converter); } -bool NavCategory::IsModeInCategoryGroup(ViewMode mode, CategoryGroupType type) +bool NavCategory::IsModeInCategoryGroup(ViewModeType mode, CategoryGroupType type) { return std::any_of( s_categoryManifest.cbegin(), diff --git a/src/CalcViewModel/Common/NavCategory.h b/src/CalcViewModel/Common/NavCategory.h index 2e7a7fbc..1c91bde8 100644 --- a/src/CalcViewModel/Common/NavCategory.h +++ b/src/CalcViewModel/Common/NavCategory.h @@ -91,23 +91,25 @@ namespace CalculatorApp::ViewModel [Windows::UI::Xaml::Data::Bindable] public ref class NavCategory sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged { + private: + using ViewModeType = ::CalculatorApp::ViewModel::Common::ViewMode; public: OBSERVABLE_OBJECT(); PROPERTY_R(Platform::String ^, Name); PROPERTY_R(Platform::String ^, AutomationName); PROPERTY_R(Platform::String ^, Glyph); - PROPERTY_R(ViewMode, Mode); + PROPERTY_R(ViewModeType, ViewMode); PROPERTY_R(Platform::String ^, AccessKey); PROPERTY_R(bool, SupportsNegative); PROPERTY_RW(bool, IsEnabled); property Platform::String - ^ AutomationId { Platform::String ^ get() { return m_Mode.ToString(); } } + ^ AutomationId { Platform::String ^ get() { return m_ViewMode.ToString(); } } - static bool IsCalculatorViewMode(ViewMode mode); - static bool IsGraphingCalculatorViewMode(ViewMode mode); - static bool IsDateCalculatorViewMode(ViewMode mode); - static bool IsConverterViewMode(ViewMode mode); + static bool IsCalculatorViewMode(ViewModeType mode); + static bool IsGraphingCalculatorViewMode(ViewModeType mode); + static bool IsDateCalculatorViewMode(ViewModeType mode); + static bool IsConverterViewMode(ViewModeType mode); internal : NavCategory( Platform::String ^ name, @@ -115,7 +117,7 @@ namespace CalculatorApp::ViewModel Platform::String ^ glyph, Platform::String ^ accessKey, Platform::String ^ mode, - ViewMode viewMode, + ViewModeType viewMode, bool supportsNegative, bool isEnabled) : m_Name(name) @@ -123,14 +125,14 @@ namespace CalculatorApp::ViewModel , m_Glyph(glyph) , m_AccessKey(accessKey) , m_modeString(mode) - , m_Mode(viewMode) + , m_ViewMode(viewMode) , m_SupportsNegative(supportsNegative) , m_IsEnabled(isEnabled) { } private: - static bool IsModeInCategoryGroup(ViewMode mode, CategoryGroupType groupType); + static bool IsModeInCategoryGroup(ViewModeType mode, CategoryGroupType groupType); Platform::String ^ m_modeString; }; diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp index c666c71a..3ce1cb69 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp @@ -152,7 +152,7 @@ void UnitConverterDataLoader::GetCategories(_In_ shared_ptrCategories) { /* Id, CategoryName, SupportsNegative */ - categoriesList->emplace_back(NavCategoryStates::Serialize(category->Mode), category->Name->Data(), category->SupportsNegative); + categoriesList->emplace_back(NavCategoryStates::Serialize(category->ViewMode), category->Name->Data(), category->SupportsNegative); } } diff --git a/src/Calculator/App.xaml.cs b/src/Calculator/App.xaml.cs index bd075bdf..c18e76a6 100644 --- a/src/Calculator/App.xaml.cs +++ b/src/Calculator/App.xaml.cs @@ -415,11 +415,11 @@ namespace CalculatorApp foreach (NavCategory option in calculatorOptions.Categories) { - if (!NavCategoryStates.IsViewModeEnabled(option.Mode)) + if (!NavCategoryStates.IsViewModeEnabled(option.ViewMode)) { continue; } - ViewMode mode = option.Mode; + ViewMode mode = option.ViewMode; var item = JumpListItem.CreateWithArguments(((int)mode).ToString(), "ms-resource:///Resources/" + NavCategoryStates.GetNameResourceKey(mode)); item.Description = "ms-resource:///Resources/" + NavCategoryStates.GetNameResourceKey(mode); item.Logo = new Uri("ms-appx:///Assets/" + mode.ToString() + ".png"); diff --git a/src/Calculator/Views/MainPage.xaml b/src/Calculator/Views/MainPage.xaml index 051f1937..be31db11 100644 --- a/src/Calculator/Views/MainPage.xaml +++ b/src/Calculator/Views/MainPage.xaml @@ -29,7 +29,7 @@ Size, index); NavCategory ^ category = categories->GetAt(index); - VERIFY_ARE_EQUAL(expectedMode, category->Mode); + VERIFY_ARE_EQUAL(expectedMode, category->ViewMode); } };