Address review feedback

Author: AlanGriffiths

src/server/frontend_wayland/wayland_surface_observer.h

@@ -57,7 +57,7 @@ class WaylandSurfaceObserver : public scene::NullSurfaceObserver
     void input_consumed(scene::Surface const*, std::shared_ptr<MirEvent const> const& event) override;
     void entered_output(scene::Surface const*, graphics::DisplayConfigurationOutputId const& id) override;
     void left_output(scene::Surface const*, graphics::DisplayConfigurationOutputId const& id) override;
-    void rescale_output(const scene::Surface*, graphics::DisplayConfigurationOutputId const& id) override;
+    void rescale_output(scene::Surface const*, graphics::DisplayConfigurationOutputId const& id) override;
     ///@}
 
     /// Should only be called from the Wayland thread

src/server/frontend_wayland/window_wl_surface_role.cpp

@@ -461,7 +461,7 @@ auto mf::WindowWlSurfaceRole::output_config_changed(graphics::DisplayConfigurati
                     client,
                     [&](OutputInstance* instance)
                     {
-                        if (auto fractional_scale = surface.value().get_fractional_scale())
+                        if (auto const fractional_scale = surface.value().get_fractional_scale())
                             fractional_scale.value().output_entered(config);
                         surface.value().send_enter_event(instance->resource);
                         pending_enter_events.erase(id_it);
@@ -471,7 +471,7 @@ auto mf::WindowWlSurfaceRole::output_config_changed(graphics::DisplayConfigurati
 
         if (auto id_it{std::ranges::find(pending_rescale_events, config.id)}; id_it != pending_rescale_events.end())
         {
-            if (auto fractional_scale = surface.value().get_fractional_scale())
+            if (auto const fractional_scale = surface.value().get_fractional_scale())
                 fractional_scale.value().scale_change_on_output(config);
             pending_rescale_events.erase(id_it);
         }
@@ -533,7 +533,7 @@ void mf::WindowWlSurfaceRole::handle_enter_output(graphics::DisplayConfiguration
             auto const& config{global->current_config()};
             if (config.id == id)
             {
-                if (auto fractional_scale = surface.value().get_fractional_scale())
+                if (auto const fractional_scale = surface.value().get_fractional_scale())
                     fractional_scale.value().output_entered(config);
 
                 global->for_each_output_bound_by(
@@ -561,7 +561,7 @@ void mf::WindowWlSurfaceRole::handle_leave_output(graphics::DisplayConfiguration
             auto const& config{global->current_config()};
             if (config.id == id)
             {
-                if(auto fractional_scale = surface.value().get_fractional_scale())
+                if(auto const fractional_scale = surface.value().get_fractional_scale())
                     fractional_scale.value().output_left(config);
 
                 global->for_each_output_bound_by(

src/server/scene/basic_surface.cpp

@@ -170,7 +170,7 @@ class ms::BasicSurface::Multiplexer : public ObserverMultiplexer<SurfaceObserver
         for_each_observer(&SurfaceObserver::left_output, surf, id);
     }
 
-    void rescale_output(const Surface* surf, const graphics::DisplayConfigurationOutputId& id) override
+    void rescale_output(Surface const* surf, graphics::DisplayConfigurationOutputId const& id) override
     {
         for_each_observer(&SurfaceObserver::rescale_output, surf, id);
     }
@@ -1005,7 +1005,7 @@ void mir::scene::BasicSurface::track_outputs()
                 {
                     observers->entered_output(this, output.id);
                 }
-                tracked.insert({output.id, output.scale});
+                tracked.emplace(output.id, output.scale);
             }
         });
 

tests/mir_test_framework/window_management_test_harness.cpp

@@ -83,7 +83,7 @@ struct mir_test_framework::WindowManagementTestHarness::Self : public ms::Surfac
     void depth_layer_set_to(ms::Surface const*, MirDepthLayer) override {}
     void entered_output(ms::Surface const*, mg::DisplayConfigurationOutputId const&) override {}
     void left_output(ms::Surface const*, mg::DisplayConfigurationOutputId const&) override {}
-    void rescale_output(const mir::scene::Surface*, mir::graphics::DisplayConfigurationOutputId const&) override {}
+    void rescale_output(ms::Surface const*, mg::DisplayConfigurationOutputId const&) override {}
     std::mutex mutable mutex;
     std::vector<std::shared_ptr<mc::BufferStream>> streams;
     std::vector<std::shared_ptr<ms::Surface>> known_surfaces;