Add const keyword to resolve warnings (treated as errors) C26462 and …

…C26496 (#8567) * Add const keyword as needed to resolve warnings C26462,C26496 * fix typo * few more fixes * add deprecated link * fix pointer in const --------- Co-authored-by: Dmitriy Komin <[email protected]> Co-authored-by: Ranjesh Jaganathan <[email protected]> Co-authored-by: Karen Lai <[email protected]>
microsoft · Jun 22, 2023 · e30572d · e30572d
1 parent d6033df
commit e30572d
Show file tree

Hide file tree

Showing 43 changed files with 98 additions and 98 deletions.
diff --git a/dev/AutoSuggestBox/AutoSuggestBoxHelper.cpp b/dev/AutoSuggestBox/AutoSuggestBoxHelper.cpp
@@ -54,7 +54,7 @@ void AutoSuggestBoxHelper::OnKeepInteriorCornersSquarePropertyChanged(
 {
     if (auto autoSuggestBox = sender.try_as<winrt::AutoSuggestBox>())
     {
-        bool shouldMonitorAutoSuggestEvents = unbox_value<bool>(args.NewValue());
+        const bool shouldMonitorAutoSuggestEvents = unbox_value<bool>(args.NewValue());
         if (shouldMonitorAutoSuggestEvents)
         {
             auto revokersInspectable = winrt::make<AutoSuggestEventRevokers>();

diff --git a/dev/Breadcrumb/BreadcrumbBarItem.cpp b/dev/Breadcrumb/BreadcrumbBarItem.cpp
@@ -732,7 +732,7 @@ bool BreadcrumbBarItem::IgnorePointerId(const winrt::PointerRoutedEventArgs& arg
 {
     MUX_ASSERT(m_isEllipsisDropDownItem);
 
-    uint32_t pointerId = args.Pointer().PointerId();
+    const uint32_t pointerId = args.Pointer().PointerId();
 
     if (m_trackedPointerId == 0)
     {

diff --git a/dev/Breadcrumb/BreadcrumbLayout.cpp b/dev/Breadcrumb/BreadcrumbLayout.cpp
@@ -106,7 +106,7 @@ int BreadcrumbLayout::GetFirstBreadcrumbBarItemToArrange(winrt::NonVirtualizingL
 
     for (int i = itemCount - 2; i >= 0; --i)
     {
-        float newAccumLength = accumLength + GetElementAt(context, i).DesiredSize().Width;
+        const float newAccumLength = accumLength + GetElementAt(context, i).DesiredSize().Width;
         if (newAccumLength > m_availableSize.Width)
         {
             return i + 1;

diff --git a/dev/ColorPicker/ColorPicker.cpp b/dev/ColorPicker/ColorPicker.cpp
@@ -323,8 +323,8 @@ void ColorPicker::OnColorChanged(winrt::DependencyPropertyChangedEventArgs const
         UpdateColorControls(ColorUpdateReason::ColorPropertyChanged);
     }
 
-    winrt::Color oldColor = unbox_value<winrt::Color>(args.OldValue());
-    winrt::Color newColor = unbox_value<winrt::Color>(args.NewValue());
+    const winrt::Color oldColor = unbox_value<winrt::Color>(args.OldValue());
+    const winrt::Color newColor = unbox_value<winrt::Color>(args.NewValue());
 
     if (oldColor.A != newColor.A ||
         oldColor.R != newColor.R ||

diff --git a/dev/ColorPicker/ColorPickerSlider.cpp b/dev/ColorPicker/ColorPickerSlider.cpp
@@ -59,7 +59,7 @@ void ColorPickerSlider::OnKeyDown(winrt::KeyRoutedEventArgs const& args)
         return;
     }
 
-    bool isControlDown = (winrt::Window::Current().CoreWindow().GetKeyState(winrt::VirtualKey::Control) & winrt::CoreVirtualKeyStates::Down) == winrt::CoreVirtualKeyStates::Down;
+    const bool isControlDown = (winrt::Window::Current().CoreWindow().GetKeyState(winrt::VirtualKey::Control) & winrt::CoreVirtualKeyStates::Down) == winrt::CoreVirtualKeyStates::Down;
 
     double minBound = 0;
     double maxBound = 0;

diff --git a/dev/ColorPicker/ColorSpectrum.cpp b/dev/ColorPicker/ColorSpectrum.cpp
@@ -106,7 +106,7 @@ void ColorSpectrum::OnKeyDown(winrt::KeyRoutedEventArgs const& args)
         return;
     }
 
-    bool isControlDown = (winrt::Window::Current().CoreWindow().GetKeyState(winrt::VirtualKey::Control) & winrt::CoreVirtualKeyStates::Down) == winrt::CoreVirtualKeyStates::Down;
+    const bool isControlDown = (winrt::Window::Current().CoreWindow().GetKeyState(winrt::VirtualKey::Control) & winrt::CoreVirtualKeyStates::Down) == winrt::CoreVirtualKeyStates::Down;
 
     winrt::ColorPickerHsvChannel incrementChannel = winrt::ColorPickerHsvChannel::Hue;
 

diff --git a/dev/ColorPicker/ColorSpectrumAutomationPeer.cpp b/dev/ColorPicker/ColorSpectrumAutomationPeer.cpp
@@ -89,7 +89,7 @@ winrt::hstring ColorSpectrumAutomationPeer::Value()
 void ColorSpectrumAutomationPeer::SetValue(winrt::hstring const& value)
 {
     winrt::ColorSpectrum colorSpectrumOwner = Owner().as<winrt::ColorSpectrum>();
-    winrt::Color color = unbox_value<winrt::Color>(winrt::XamlBindingHelper::ConvertValue({ winrt::hstring_name_of<winrt::Color>(), winrt::TypeKind::Metadata }, box_value(value)));
+    const winrt::Color color = unbox_value<winrt::Color>(winrt::XamlBindingHelper::ConvertValue({ winrt::hstring_name_of<winrt::Color>(), winrt::TypeKind::Metadata }, box_value(value)));
 
     colorSpectrumOwner.Color(color);
 

diff --git a/dev/ComboBox/ComboBoxHelper.cpp b/dev/ComboBox/ComboBoxHelper.cpp
@@ -53,7 +53,7 @@ void ComboBoxHelper::OnKeepInteriorCornersSquarePropertyChanged(
 {
     if (auto comboBox = sender.try_as<winrt::ComboBox>())
     {
-        bool shouldMonitorDropDownState = unbox_value<bool>(args.NewValue());
+        const bool shouldMonitorDropDownState = unbox_value<bool>(args.NewValue());
         if (shouldMonitorDropDownState)
         {
             auto revokersInspectable = winrt::make<ComboBoxDropDownEventRevokers>();

diff --git a/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.cpp b/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.cpp
@@ -556,7 +556,7 @@ void CommandBarFlyoutCommandBar::UpdateVisualState(
 
         // If there isn't enough space to display the overflow below the command bar,
         // and if there is enough space above, then we'll display it above instead.
-        if (auto window = winrt::Window::Current() && !hadActualPlacement && m_secondaryItemsRoot)
+        if (const auto window = winrt::Window::Current() && !hadActualPlacement && m_secondaryItemsRoot)
         {
             double availableHeight = -1;
             const auto controlBounds = TransformToVisual(nullptr).TransformBounds({ 0, 0, static_cast<float>(ActualWidth()), static_cast<float>(ActualHeight()) });
@@ -595,7 +595,7 @@ void CommandBarFlyoutCommandBar::UpdateVisualState(
         winrt::VisualStateManager::GoToState(*this, shouldExpandUp ? L"ExpandedUp" : L"ExpandedDown", useTransitions && !isForSizeChange);
 
         // Union of AvailableCommandsStates and ExpansionStates
-        bool hasPrimaryCommands = (PrimaryCommands().Size() != 0);
+        const bool hasPrimaryCommands = (PrimaryCommands().Size() != 0);
         if (hasPrimaryCommands)
         {
             if (shouldExpandUp)

diff --git a/dev/CommandBarFlyout/TextCommandBarFlyout.cpp b/dev/CommandBarFlyout/TextCommandBarFlyout.cpp
@@ -208,7 +208,7 @@ void TextCommandBarFlyout::UpdateButtons()
 
     winrt::MenuFlyout proofingMenuFlyout = proofingFlyout.try_as<winrt::MenuFlyout>();
 
-    bool shouldIncludeProofingMenu =
+    const bool shouldIncludeProofingMenu =
         static_cast<bool>(proofingFlyout) &&
         (!proofingMenuFlyout || proofingMenuFlyout.Items().Size() > 0);
 
@@ -323,7 +323,7 @@ void TextCommandBarFlyout::UpdateButtons()
     addRichEditButtonToCommandsIfPresent(TextControlButtons::Underline, PrimaryCommands(),
         [](winrt::ITextSelection textSelection)
     {
-        auto underline = textSelection.CharacterFormat().Underline();
+        const auto underline = textSelection.CharacterFormat().Underline();
         return (underline != winrt::UnderlineType::None) && (underline != winrt::UnderlineType::Undefined);
     });
 
@@ -554,7 +554,7 @@ TextControlButtons TextCommandBarFlyout::GetPasswordBoxButtonsToAdd(winrt::Passw
 bool TextCommandBarFlyout::IsButtonInPrimaryCommands(TextControlButtons button)
 {
     uint32_t buttonIndex = 0;
-    bool wasFound = PrimaryCommands().IndexOf(GetButton(button), buttonIndex);
+    const bool wasFound = PrimaryCommands().IndexOf(GetButton(button), buttonIndex);
     return wasFound;
 }
 

diff --git a/dev/InfoBar/InfoBarPanel.cpp b/dev/InfoBar/InfoBarPanel.cpp
@@ -132,7 +132,7 @@ winrt::Size InfoBarPanel::ArrangeOverride(winrt::Size const& finalSize)
                 auto const desiredSize = child.DesiredSize();
                 if (desiredSize.Width != 0 && desiredSize.Height != 0)
                 {
-                    auto horizontalMargin = winrt::InfoBarPanel::GetHorizontalOrientationMargin(child);
+                    const auto horizontalMargin = winrt::InfoBarPanel::GetHorizontalOrientationMargin(child);
 
                     horizontalOffset += hasPreviousElement ? (float)horizontalMargin.Left : 0;
                     if (i < childCount - 1)

diff --git a/dev/Lights/MaterialHelper.cpp b/dev/Lights/MaterialHelper.cpp
@@ -970,7 +970,7 @@ winrt::CompositionSurfaceBrush MaterialHelper::GetNoiseBrushImpl()
 
         try
         {
-            winrt::ResolutionScale resScale{ winrt::DisplayInformation::GetForCurrentView().ResolutionScale() };
+            const winrt::ResolutionScale resScale{ winrt::DisplayInformation::GetForCurrentView().ResolutionScale() };
             if (resScale != winrt::ResolutionScale::Invalid)
             {
                 resScaleInt = static_cast<int>(resScale);

diff --git a/dev/Materials/Backdrop/SystemBackdropWindowHandler.cpp b/dev/Materials/Backdrop/SystemBackdropWindowHandler.cpp
@@ -209,7 +209,7 @@ namespace SystemBackdropComponentInternal
         else if (retryOnNextTick && !m_nextTickRevoker)
         {
             // We don't have a root yet so let's start with the system theme as the best we can do until the content appears.
-            auto systemTheme = winrt::Application::Current().RequestedTheme();
+            const auto systemTheme = winrt::Application::Current().RequestedTheme();
             m_actualTheme = (systemTheme == winrt::ApplicationTheme::Dark) ? winrt::ElementTheme::Dark : winrt::ElementTheme::Light;
             m_controller->UpdateTheme(m_actualTheme);
 

diff --git a/dev/Materials/Reveal/RevealBrush.cpp b/dev/Materials/Reveal/RevealBrush.cpp
@@ -506,7 +506,7 @@ winrt::Windows::Graphics::Effects::IGraphicsEffect RevealBrush::CreateRevealHove
     //              </CompositeStepEffect>
     //          </ColorMatrixEffect>
     //      </ArithmeticCompositeEffect>
-    winrt::Color initBaseColor{ 0, 0, 0, 0 };
+    const winrt::Color initBaseColor{ 0, 0, 0, 0 };
 
     // (9) Noise image BorderEffect (infinitely tiles noise image)
     auto noiseBorderEffect = winrt::make_self<Microsoft::UI::Private::Composition::Effects::BorderEffect>();
@@ -881,8 +881,8 @@ bool RevealBrush::ValidatePublicRootAncestor()
     // Either Window.Content is a Canvas, in which case it's the immediate child of the root visual and we should set lights
     // on it directly, or it isn't, in which case we should have walked up to the RootScrollViewer and set lights there.
     auto ancestor = GetAncestor(windowRoot);
-    bool windowContentIsCanvas = static_cast<bool>(windowRoot.try_as<winrt::Canvas>());
-    bool walkedUpToScrollViewer = winrt::VisualTreeHelper::GetParent(windowRoot) &&
+    const bool windowContentIsCanvas = static_cast<bool>(windowRoot.try_as<winrt::Canvas>());
+    const bool walkedUpToScrollViewer = winrt::VisualTreeHelper::GetParent(windowRoot) &&
         static_cast<bool>(ancestor.try_as<winrt::FxScrollViewer>());
 
     // On MUX + RS3/RS4, it's possible XCB::OnConnected is called before visual tree is constructed and the ancestor walk returns a false elemenet.
@@ -1054,7 +1054,7 @@ void RevealBrush::OnIsContainerPropertyChanged(
 {
     if (auto elementSender = sender.try_as<winrt::IUIElement5>())
     {
-        bool isAdding = unbox_value<bool>(args.NewValue());
+        const bool isAdding = unbox_value<bool>(args.NewValue());
 
         auto lights = elementSender.Lights();
         int i = 0;

diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp
@@ -993,7 +993,7 @@ void NavigationView::RaiseItemInvokedForNavigationViewItem(const winrt::Navigati
     if (auto itemsSourceView = parentIR.ItemsSourceView())
     {
         auto inspectingDataSource = static_cast<InspectingDataSource*>(winrt::get_self<ItemsSourceView>(itemsSourceView));
-        auto itemIndex = parentIR.GetElementIndex(nvi);
+        const auto itemIndex = parentIR.GetElementIndex(nvi);
 
         // Check that index is NOT -1, meaning it is actually realized
         if (itemIndex != -1)
@@ -1005,7 +1005,7 @@ void NavigationView::RaiseItemInvokedForNavigationViewItem(const winrt::Navigati
 
     // Determine the recommeded transition direction.
     // Any transitions other than `Default` only apply in top nav scenarios.
-    auto recommendedDirection = [this, prevItem, nvi, parentIR]()
+    const auto recommendedDirection = [this, prevItem, nvi, parentIR]()
     {
         if (IsTopNavigationView() && nvi.SelectsOnInvoked())
         {
@@ -1209,7 +1209,7 @@ void NavigationView::OnRepeaterElementPrepared(const winrt::ItemsRepeater& ir, c
         nvibImpl->IsTopLevelItem(IsTopLevelItem(nvib));
 
         // Visual state info propagation
-        auto position = [this, ir]()
+        const auto position = [this, ir]()
         {
             if (IsTopNavigationView())
             {
@@ -2350,7 +2350,7 @@ void NavigationView::ChangeSelection(const winrt::IInspectable& prevItem, const
         // otherwise if prevItem is on left side of nextActualItem, transition is from left
         //           if prevItem is on right side of nextActualItem, transition is from right
         // click on Settings item is considered Default
-        auto recommendedDirection = [this, prevItem, nextItem]()
+        const auto recommendedDirection = [this, prevItem, nextItem]()
         {
             if (IsTopNavigationView())
             {
@@ -2943,7 +2943,7 @@ void NavigationView::OnKeyDown(winrt::KeyRoutedEventArgs const& e)
         m_TabKeyPrecedesFocusChange = true;
         break;
     case winrt::VirtualKey::Left:
-        auto altState = winrt::CoreWindow::GetForCurrentThread().GetKeyState(winrt::VirtualKey::Menu);
+        const auto altState = winrt::CoreWindow::GetForCurrentThread().GetKeyState(winrt::VirtualKey::Menu);
         const bool isAltPressed = (altState & winrt::CoreVirtualKeyStates::Down) == winrt::CoreVirtualKeyStates::Down;
 
         if (isAltPressed && IsPaneOpen() && IsLightDismissible())
@@ -4936,7 +4936,7 @@ void NavigationView::UpdatePaneShadow()
 
         // Shadow will get clipped if casting on the splitView.Content directly
         // Creating a canvas with negative margins as receiver to allow shadow to be drawn outside the content grid 
-        winrt::Thickness shadowReceiverMargin = { 0, -c_paneElevationTranslationZ, -c_paneElevationTranslationZ, -c_paneElevationTranslationZ };
+        const winrt::Thickness shadowReceiverMargin = { 0, -c_paneElevationTranslationZ, -c_paneElevationTranslationZ, -c_paneElevationTranslationZ };
 
         // Ensuring shadow is aligned to the left
         shadowReceiver.HorizontalAlignment(winrt::HorizontalAlignment::Left);

diff --git a/dev/NavigationView/NavigationViewItem.cpp b/dev/NavigationView/NavigationViewItem.cpp
@@ -847,7 +847,7 @@ void NavigationViewItem::PropagateDepthToChildren(int depth)
 {
     if (auto const repeater = m_repeater.get())
     {
-        auto itemsCount = repeater.ItemsSourceView().Count();
+        const auto itemsCount = repeater.ItemsSourceView().Count();
         for (int index = 0; index < itemsCount; index++)
         {
             if (auto const element = repeater.TryGetElement(index))
@@ -933,7 +933,7 @@ void NavigationViewItem::ResetTrackedPointerId()
 // Returns True when the provided pointer Id does not match the currently tracked Id.
 bool NavigationViewItem::IgnorePointerId(const winrt::PointerRoutedEventArgs& args)
 {
-    uint32_t pointerId = args.Pointer().PointerId();
+    const uint32_t pointerId = args.Pointer().PointerId();
 
     if (m_trackedPointerId == 0)
     {

diff --git a/dev/NavigationView/NavigationViewItemsFactory.cpp b/dev/NavigationView/NavigationViewItemsFactory.cpp
@@ -129,7 +129,7 @@ void NavigationViewItemsFactory::RecycleElementCore(winrt::ElementFactoryRecycle
         }
 
         // Do not recycle SettingsItem
-        bool isSettingsItem = m_settingsItem && m_settingsItem == args.Element();
+        const bool isSettingsItem = m_settingsItem && m_settingsItem == args.Element();
 
         UnlinkElementFromParent(args);
         if (m_itemTemplateWrapper && !isSettingsItem)

diff --git a/dev/ParallaxView/ScrollInputHelper.cpp b/dev/ParallaxView/ScrollInputHelper.cpp
@@ -366,7 +366,7 @@ void ScrollInputHelper::UpdateContentSize()
         return;
     }
 
-    int childrenCount = winrt::VisualTreeHelper::GetChildrenCount(itemsPresenter);
+    const int childrenCount = winrt::VisualTreeHelper::GetChildrenCount(itemsPresenter);
 
     if (childrenCount > 0)
     {
@@ -474,7 +474,7 @@ void ScrollInputHelper::UpdateViewportSize()
 
             if (itemsPresenter)
             {
-                int childrenCount = winrt::VisualTreeHelper::GetChildrenCount(itemsPresenter);
+                const int childrenCount = winrt::VisualTreeHelper::GetChildrenCount(itemsPresenter);
 
                 if (childrenCount > 0)
                 {
@@ -580,8 +580,8 @@ void ScrollInputHelper::UpdateIsTargetElementInSource()
 
     if (targetElement)
     {
-        bool sourceIsScrollViewer = m_scrollViewer != nullptr;
-        bool sourceIsScrollPresenter = m_scrollPresenter != nullptr;
+        const bool sourceIsScrollViewer = m_scrollViewer != nullptr;
+        const bool sourceIsScrollPresenter = m_scrollPresenter != nullptr;
 
         if (sourceIsScrollViewer || sourceIsScrollPresenter)
         {
@@ -820,7 +820,7 @@ bool ScrollInputHelper::IsScrollContentPresenterIScrollInfoProvider() const
 
             if (itemsPresenter)
             {
-                int childrenCount = winrt::VisualTreeHelper::GetChildrenCount(itemsPresenter);
+                const int childrenCount = winrt::VisualTreeHelper::GetChildrenCount(itemsPresenter);
 
                 if (childrenCount > 0)
                 {

diff --git a/dev/PersonPicture/InitialsGenerator.cpp b/dev/PersonPicture/InitialsGenerator.cpp
@@ -37,7 +37,7 @@ winrt::hstring InitialsGenerator::InitialsFromContactObject(const winrt::Contact
     // available, that is the data which should be used.
     if (!contact.FirstName().empty() && !contact.LastName().empty())
     {
-        CharacterType type = GetCharacterType(contact.FirstName());
+        const CharacterType type = GetCharacterType(contact.FirstName());
 
         // We'll attempt to make initials only if we recognize a name in the Standard character set.
         if (type == CharacterType::Standard)

diff --git a/dev/RatingControl/RatingControl.cpp b/dev/RatingControl/RatingControl.cpp
@@ -70,7 +70,7 @@ void RatingControl::UpdateCaptionMargins()
     // When text scale changes we need to update top margin to make the text follow start center.
     if (auto captionTextBlock = m_captionTextBlock.safe_get())
     {
-        double textScaleFactor = GetUISettings().TextScaleFactor();
+        const double textScaleFactor = GetUISettings().TextScaleFactor();
         winrt::Thickness margin = captionTextBlock.Margin();
         margin.Top = c_defaultCaptionTopMargin - (ActualRatingFontSize() * c_verticalScaleAnimationCenterPoint);
 
@@ -767,7 +767,7 @@ void RatingControl::OnPointerMovedOverBackgroundStackPanel(const winrt::IInspect
         if (ShouldEnableAnimation())
         {
             m_sharedPointerPropertySet.InsertScalar(L"starsScaleFocalPoint", xPosition);
-            auto deviceType = args.Pointer().PointerDeviceType();
+            const auto deviceType = args.Pointer().PointerDeviceType();
 
             switch (deviceType)
             {
@@ -914,7 +914,7 @@ void RatingControl::OnKeyDown(winrt::KeyRoutedEventArgs const& eventArgs)
             flowDirectionReverser *= -1.0;
         }
 
-        auto originalKey = eventArgs.as<winrt::KeyRoutedEventArgs>().OriginalKey();
+        const auto originalKey = eventArgs.as<winrt::KeyRoutedEventArgs>().OriginalKey();
 
         // Up down are right/left in keyboard only
         if (originalKey == winrt::VirtualKey::Up)
@@ -989,7 +989,7 @@ void RatingControl::OnPreviewKeyDown(winrt::KeyRoutedEventArgs const& eventArgs)
 
     if (!IsReadOnly() && IsFocusEngaged() && IsFocusEngagementEnabled())
     {
-        auto originalKey = eventArgs.as<winrt::KeyRoutedEventArgs>().OriginalKey();
+        const auto originalKey = eventArgs.as<winrt::KeyRoutedEventArgs>().OriginalKey();
         if (originalKey == winrt::VirtualKey::GamepadA)
         {
             m_shouldDiscardValue = false;
@@ -1024,7 +1024,7 @@ void RatingControl::OnPreviewKeyDown(winrt::KeyRoutedEventArgs const& eventArgs)
 
 void RatingControl::OnPreviewKeyUp(winrt::KeyRoutedEventArgs const& eventArgs)
 {
-    auto originalKey = eventArgs.as<winrt::KeyRoutedEventArgs>().OriginalKey();
+    const auto originalKey = eventArgs.as<winrt::KeyRoutedEventArgs>().OriginalKey();
 
     if (IsFocusEngagementEnabled() && originalKey == winrt::VirtualKey::GamepadA && m_disengagedWithA)
     {
-Original file line number
+Diff line change
@@ Expand Up @@
             return;
         }
-        bool isControlDown = (winrt::Window::Current().CoreWindow().GetKeyState(winrt::VirtualKey::Control) & winrt::CoreVirtualKeyStates::Down) == winrt::CoreVirtualKeyStates::Down;
+        const bool isControlDown = (winrt::Window::Current().CoreWindow().GetKeyState(winrt::VirtualKey::Control) & winrt::CoreVirtualKeyStates::Down) == winrt::CoreVirtualKeyStates::Down;
         winrt::ColorPickerHsvChannel incrementChannel = winrt::ColorPickerHsvChannel::Hue;
@@ Expand Down @@