From 2d7942e788dc36e5d8de504d58764dc03646e481 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Tue, 18 Nov 2025 21:46:47 -0600
Subject: [PATCH] [ld24xx] Modernize namespace declarations to C++17 syntax

---
 esphome/components/ld2410/automation.h                      | 6 ++----
 esphome/components/ld2410/button/factory_reset_button.cpp   | 6 ++----
 esphome/components/ld2410/button/factory_reset_button.h     | 6 ++----
 esphome/components/ld2410/button/query_button.cpp           | 6 ++----
 esphome/components/ld2410/button/query_button.h             | 6 ++----
 esphome/components/ld2410/button/restart_button.cpp         | 6 ++----
 esphome/components/ld2410/button/restart_button.h           | 6 ++----
 esphome/components/ld2410/ld2410.cpp                        | 6 ++----
 esphome/components/ld2410/ld2410.h                          | 6 ++----
 esphome/components/ld2410/number/gate_threshold_number.cpp  | 6 ++----
 esphome/components/ld2410/number/gate_threshold_number.h    | 6 ++----
 esphome/components/ld2410/number/light_threshold_number.cpp | 6 ++----
 esphome/components/ld2410/number/light_threshold_number.h   | 6 ++----
 .../ld2410/number/max_distance_timeout_number.cpp           | 6 ++----
 .../components/ld2410/number/max_distance_timeout_number.h  | 6 ++----
 esphome/components/ld2410/select/baud_rate_select.cpp       | 6 ++----
 esphome/components/ld2410/select/baud_rate_select.h         | 6 ++----
 .../components/ld2410/select/distance_resolution_select.cpp | 6 ++----
 .../components/ld2410/select/distance_resolution_select.h   | 6 ++----
 .../components/ld2410/select/light_out_control_select.cpp   | 6 ++----
 esphome/components/ld2410/select/light_out_control_select.h | 6 ++----
 esphome/components/ld2410/switch/bluetooth_switch.cpp       | 6 ++----
 esphome/components/ld2410/switch/bluetooth_switch.h         | 6 ++----
 .../components/ld2410/switch/engineering_mode_switch.cpp    | 6 ++----
 esphome/components/ld2410/switch/engineering_mode_switch.h  | 6 ++----
 esphome/components/ld2412/button/factory_reset_button.cpp   | 6 ++----
 esphome/components/ld2412/button/factory_reset_button.h     | 6 ++----
 esphome/components/ld2412/button/query_button.cpp           | 6 ++----
 esphome/components/ld2412/button/query_button.h             | 6 ++----
 esphome/components/ld2412/button/restart_button.cpp         | 6 ++----
 esphome/components/ld2412/button/restart_button.h           | 6 ++----
 .../button/start_dynamic_background_correction_button.cpp   | 6 ++----
 .../button/start_dynamic_background_correction_button.h     | 6 ++----
 esphome/components/ld2412/ld2412.cpp                        | 6 ++----
 esphome/components/ld2412/ld2412.h                          | 6 ++----
 esphome/components/ld2412/number/gate_threshold_number.cpp  | 6 ++----
 esphome/components/ld2412/number/gate_threshold_number.h    | 6 ++----
 esphome/components/ld2412/number/light_threshold_number.cpp | 6 ++----
 esphome/components/ld2412/number/light_threshold_number.h   | 6 ++----
 .../ld2412/number/max_distance_timeout_number.cpp           | 6 ++----
 .../components/ld2412/number/max_distance_timeout_number.h  | 6 ++----
 esphome/components/ld2412/select/baud_rate_select.cpp       | 6 ++----
 esphome/components/ld2412/select/baud_rate_select.h         | 6 ++----
 .../components/ld2412/select/distance_resolution_select.cpp | 6 ++----
 .../components/ld2412/select/distance_resolution_select.h   | 6 ++----
 .../components/ld2412/select/light_out_control_select.cpp   | 6 ++----
 esphome/components/ld2412/select/light_out_control_select.h | 6 ++----
 esphome/components/ld2412/switch/bluetooth_switch.cpp       | 6 ++----
 esphome/components/ld2412/switch/bluetooth_switch.h         | 6 ++----
 .../components/ld2412/switch/engineering_mode_switch.cpp    | 6 ++----
 esphome/components/ld2412/switch/engineering_mode_switch.h  | 6 ++----
 .../ld2420/binary_sensor/ld2420_binary_sensor.cpp           | 6 ++----
 .../components/ld2420/binary_sensor/ld2420_binary_sensor.h  | 6 ++----
 esphome/components/ld2420/button/reconfig_buttons.cpp       | 6 ++----
 esphome/components/ld2420/button/reconfig_buttons.h         | 6 ++----
 esphome/components/ld2420/ld2420.cpp                        | 6 ++----
 esphome/components/ld2420/ld2420.h                          | 6 ++----
 esphome/components/ld2420/number/gate_config_number.cpp     | 6 ++----
 esphome/components/ld2420/number/gate_config_number.h       | 6 ++----
 esphome/components/ld2420/select/operating_mode_select.cpp  | 6 ++----
 esphome/components/ld2420/select/operating_mode_select.h    | 6 ++----
 esphome/components/ld2420/sensor/ld2420_sensor.cpp          | 6 ++----
 esphome/components/ld2420/sensor/ld2420_sensor.h            | 6 ++----
 .../components/ld2420/text_sensor/ld2420_text_sensor.cpp    | 6 ++----
 esphome/components/ld2420/text_sensor/ld2420_text_sensor.h  | 6 ++----
 esphome/components/ld2450/button/factory_reset_button.cpp   | 6 ++----
 esphome/components/ld2450/button/factory_reset_button.h     | 6 ++----
 esphome/components/ld2450/button/restart_button.cpp         | 6 ++----
 esphome/components/ld2450/button/restart_button.h           | 6 ++----
 esphome/components/ld2450/ld2450.cpp                        | 6 ++----
 esphome/components/ld2450/ld2450.h                          | 6 ++----
 .../components/ld2450/number/presence_timeout_number.cpp    | 6 ++----
 esphome/components/ld2450/number/presence_timeout_number.h  | 6 ++----
 esphome/components/ld2450/number/zone_coordinate_number.cpp | 6 ++----
 esphome/components/ld2450/number/zone_coordinate_number.h   | 6 ++----
 esphome/components/ld2450/select/baud_rate_select.cpp       | 6 ++----
 esphome/components/ld2450/select/baud_rate_select.h         | 6 ++----
 esphome/components/ld2450/select/zone_type_select.cpp       | 6 ++----
 esphome/components/ld2450/select/zone_type_select.h         | 6 ++----
 esphome/components/ld2450/switch/bluetooth_switch.cpp       | 6 ++----
 esphome/components/ld2450/switch/bluetooth_switch.h         | 6 ++----
 esphome/components/ld2450/switch/multi_target_switch.cpp    | 6 ++----
 esphome/components/ld2450/switch/multi_target_switch.h      | 6 ++----
 esphome/components/ld24xx/ld24xx.h                          | 6 ++----
 84 files changed, 168 insertions(+), 336 deletions(-)

diff --git a/esphome/components/ld2410/automation.h b/esphome/components/ld2410/automation.h
index f4f1c197b2..614453b575 100644
--- a/esphome/components/ld2410/automation.h
+++ b/esphome/components/ld2410/automation.h
@@ -4,8 +4,7 @@
 #include "esphome/core/component.h"
 #include "ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 template<typename... Ts> class BluetoothPasswordSetAction : public Action<Ts...> {
  public:
@@ -18,5 +17,4 @@ template<typename... Ts> class BluetoothPasswordSetAction : public Action<Ts...>
   LD2410Component *ld2410_comp_;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/button/factory_reset_button.cpp b/esphome/components/ld2410/button/factory_reset_button.cpp
index a848b02a9d..0223df7086 100644
--- a/esphome/components/ld2410/button/factory_reset_button.cpp
+++ b/esphome/components/ld2410/button/factory_reset_button.cpp
@@ -1,9 +1,7 @@
 #include "factory_reset_button.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void FactoryResetButton::press_action() { this->parent_->factory_reset(); }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/button/factory_reset_button.h b/esphome/components/ld2410/button/factory_reset_button.h
index 45bf979033..715a8c4056 100644
--- a/esphome/components/ld2410/button/factory_reset_button.h
+++ b/esphome/components/ld2410/button/factory_reset_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class FactoryResetButton : public button::Button, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class FactoryResetButton : public button::Button, public Parented<LD2410Componen
   void press_action() override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/button/query_button.cpp b/esphome/components/ld2410/button/query_button.cpp
index 47ab416f5a..4085dc3d11 100644
--- a/esphome/components/ld2410/button/query_button.cpp
+++ b/esphome/components/ld2410/button/query_button.cpp
@@ -1,9 +1,7 @@
 #include "query_button.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void QueryButton::press_action() { this->parent_->read_all_info(); }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/button/query_button.h b/esphome/components/ld2410/button/query_button.h
index c7a47e32d8..7a786901ae 100644
--- a/esphome/components/ld2410/button/query_button.h
+++ b/esphome/components/ld2410/button/query_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class QueryButton : public button::Button, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class QueryButton : public button::Button, public Parented<LD2410Component> {
   void press_action() override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/button/restart_button.cpp b/esphome/components/ld2410/button/restart_button.cpp
index de0d36c1ef..0d5002d3c6 100644
--- a/esphome/components/ld2410/button/restart_button.cpp
+++ b/esphome/components/ld2410/button/restart_button.cpp
@@ -1,9 +1,7 @@
 #include "restart_button.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void RestartButton::press_action() { this->parent_->restart_and_read_all_info(); }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/button/restart_button.h b/esphome/components/ld2410/button/restart_button.h
index d00dc05a53..9bf8639a8c 100644
--- a/esphome/components/ld2410/button/restart_button.h
+++ b/esphome/components/ld2410/button/restart_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class RestartButton : public button::Button, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class RestartButton : public button::Button, public Parented<LD2410Component> {
   void press_action() override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/ld2410.cpp b/esphome/components/ld2410/ld2410.cpp
index 391f2024cd..bb2e4e2f4c 100644
--- a/esphome/components/ld2410/ld2410.cpp
+++ b/esphome/components/ld2410/ld2410.cpp
@@ -9,8 +9,7 @@
 
 #include "esphome/core/application.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 static const char *const TAG = "ld2410";
 
@@ -782,5 +781,4 @@ void LD2410Component::set_gate_still_sensor(uint8_t gate, sensor::Sensor *s) {
 }
 #endif
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/ld2410.h b/esphome/components/ld2410/ld2410.h
index 52cf76b5b6..efe585fb76 100644
--- a/esphome/components/ld2410/ld2410.h
+++ b/esphome/components/ld2410/ld2410.h
@@ -29,8 +29,7 @@
 
 #include <array>
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 using namespace ld24xx;
 
@@ -133,5 +132,4 @@ class LD2410Component : public Component, public uart::UARTDevice {
 #endif
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/number/gate_threshold_number.cpp b/esphome/components/ld2410/number/gate_threshold_number.cpp
index 5d040554d7..65e864a4d7 100644
--- a/esphome/components/ld2410/number/gate_threshold_number.cpp
+++ b/esphome/components/ld2410/number/gate_threshold_number.cpp
@@ -1,7 +1,6 @@
 #include "gate_threshold_number.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 GateThresholdNumber::GateThresholdNumber(uint8_t gate) : gate_(gate) {}
 
@@ -10,5 +9,4 @@ void GateThresholdNumber::control(float value) {
   this->parent_->set_gate_threshold(this->gate_);
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/number/gate_threshold_number.h b/esphome/components/ld2410/number/gate_threshold_number.h
index 2806ecce63..63491f18d3 100644
--- a/esphome/components/ld2410/number/gate_threshold_number.h
+++ b/esphome/components/ld2410/number/gate_threshold_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class GateThresholdNumber : public number::Number, public Parented<LD2410Component> {
  public:
@@ -15,5 +14,4 @@ class GateThresholdNumber : public number::Number, public Parented<LD2410Compone
   void control(float value) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/number/light_threshold_number.cpp b/esphome/components/ld2410/number/light_threshold_number.cpp
index 0ff35782cd..55f69ff1fc 100644
--- a/esphome/components/ld2410/number/light_threshold_number.cpp
+++ b/esphome/components/ld2410/number/light_threshold_number.cpp
@@ -1,12 +1,10 @@
 #include "light_threshold_number.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void LightThresholdNumber::control(float value) {
   this->publish_state(value);
   this->parent_->set_light_out_control();
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/number/light_threshold_number.h b/esphome/components/ld2410/number/light_threshold_number.h
index 8f014373c0..3c5e433416 100644
--- a/esphome/components/ld2410/number/light_threshold_number.h
+++ b/esphome/components/ld2410/number/light_threshold_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class LightThresholdNumber : public number::Number, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class LightThresholdNumber : public number::Number, public Parented<LD2410Compon
   void control(float value) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/number/max_distance_timeout_number.cpp b/esphome/components/ld2410/number/max_distance_timeout_number.cpp
index 8a946f7ea9..b8667f5dbc 100644
--- a/esphome/components/ld2410/number/max_distance_timeout_number.cpp
+++ b/esphome/components/ld2410/number/max_distance_timeout_number.cpp
@@ -1,12 +1,10 @@
 #include "max_distance_timeout_number.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void MaxDistanceTimeoutNumber::control(float value) {
   this->publish_state(value);
   this->parent_->set_max_distances_timeout();
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/number/max_distance_timeout_number.h b/esphome/components/ld2410/number/max_distance_timeout_number.h
index 7d91b4b5fe..35f4cbbfae 100644
--- a/esphome/components/ld2410/number/max_distance_timeout_number.h
+++ b/esphome/components/ld2410/number/max_distance_timeout_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2410Co
   void control(float value) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/select/baud_rate_select.cpp b/esphome/components/ld2410/select/baud_rate_select.cpp
index 6da7c1d5f5..a533a2e2d6 100644
--- a/esphome/components/ld2410/select/baud_rate_select.cpp
+++ b/esphome/components/ld2410/select/baud_rate_select.cpp
@@ -1,12 +1,10 @@
 #include "baud_rate_select.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void BaudRateSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_baud_rate(this->option_at(index));
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/select/baud_rate_select.h b/esphome/components/ld2410/select/baud_rate_select.h
index 9385c8cf7e..fb1d016b1f 100644
--- a/esphome/components/ld2410/select/baud_rate_select.h
+++ b/esphome/components/ld2410/select/baud_rate_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class BaudRateSelect : public select::Select, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class BaudRateSelect : public select::Select, public Parented<LD2410Component> {
   void control(size_t index) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/select/distance_resolution_select.cpp b/esphome/components/ld2410/select/distance_resolution_select.cpp
index 4fc4c5af02..635bf206d3 100644
--- a/esphome/components/ld2410/select/distance_resolution_select.cpp
+++ b/esphome/components/ld2410/select/distance_resolution_select.cpp
@@ -1,12 +1,10 @@
 #include "distance_resolution_select.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void DistanceResolutionSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_distance_resolution(this->option_at(index));
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/select/distance_resolution_select.h b/esphome/components/ld2410/select/distance_resolution_select.h
index 1a04f843a6..be2389d36e 100644
--- a/esphome/components/ld2410/select/distance_resolution_select.h
+++ b/esphome/components/ld2410/select/distance_resolution_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class DistanceResolutionSelect : public select::Select, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class DistanceResolutionSelect : public select::Select, public Parented<LD2410Co
   void control(size_t index) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/select/light_out_control_select.cpp b/esphome/components/ld2410/select/light_out_control_select.cpp
index 25d7ced666..1c55721d52 100644
--- a/esphome/components/ld2410/select/light_out_control_select.cpp
+++ b/esphome/components/ld2410/select/light_out_control_select.cpp
@@ -1,12 +1,10 @@
 #include "light_out_control_select.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void LightOutControlSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_light_out_control();
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/select/light_out_control_select.h b/esphome/components/ld2410/select/light_out_control_select.h
index e8cd8f1d6a..608c311af4 100644
--- a/esphome/components/ld2410/select/light_out_control_select.h
+++ b/esphome/components/ld2410/select/light_out_control_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class LightOutControlSelect : public select::Select, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class LightOutControlSelect : public select::Select, public Parented<LD2410Compo
   void control(size_t index) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/switch/bluetooth_switch.cpp b/esphome/components/ld2410/switch/bluetooth_switch.cpp
index 9bcee9b049..c85dd70ec9 100644
--- a/esphome/components/ld2410/switch/bluetooth_switch.cpp
+++ b/esphome/components/ld2410/switch/bluetooth_switch.cpp
@@ -1,12 +1,10 @@
 #include "bluetooth_switch.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void BluetoothSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_bluetooth(state);
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/switch/bluetooth_switch.h b/esphome/components/ld2410/switch/bluetooth_switch.h
index 35ae1ec0c9..07804e2292 100644
--- a/esphome/components/ld2410/switch/bluetooth_switch.h
+++ b/esphome/components/ld2410/switch/bluetooth_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class BluetoothSwitch : public switch_::Switch, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class BluetoothSwitch : public switch_::Switch, public Parented<LD2410Component>
   void write_state(bool state) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/switch/engineering_mode_switch.cpp b/esphome/components/ld2410/switch/engineering_mode_switch.cpp
index 967c87c887..4f2f08b03e 100644
--- a/esphome/components/ld2410/switch/engineering_mode_switch.cpp
+++ b/esphome/components/ld2410/switch/engineering_mode_switch.cpp
@@ -1,12 +1,10 @@
 #include "engineering_mode_switch.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void EngineeringModeSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_engineering_mode(state);
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/switch/engineering_mode_switch.h b/esphome/components/ld2410/switch/engineering_mode_switch.h
index e521200cd6..4dd8e16653 100644
--- a/esphome/components/ld2410/switch/engineering_mode_switch.h
+++ b/esphome/components/ld2410/switch/engineering_mode_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2410Comp
   void write_state(bool state) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2412/button/factory_reset_button.cpp b/esphome/components/ld2412/button/factory_reset_button.cpp
index 7ee85bc8f9..e8fd891c0f 100644
--- a/esphome/components/ld2412/button/factory_reset_button.cpp
+++ b/esphome/components/ld2412/button/factory_reset_button.cpp
@@ -1,9 +1,7 @@
 #include "factory_reset_button.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void FactoryResetButton::press_action() { this->parent_->factory_reset(); }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/button/factory_reset_button.h b/esphome/components/ld2412/button/factory_reset_button.h
index 36a3fffcd5..1ef6b23b80 100644
--- a/esphome/components/ld2412/button/factory_reset_button.h
+++ b/esphome/components/ld2412/button/factory_reset_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class FactoryResetButton : public button::Button, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class FactoryResetButton : public button::Button, public Parented<LD2412Componen
   void press_action() override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/button/query_button.cpp b/esphome/components/ld2412/button/query_button.cpp
index 536f74427f..9affb26556 100644
--- a/esphome/components/ld2412/button/query_button.cpp
+++ b/esphome/components/ld2412/button/query_button.cpp
@@ -1,9 +1,7 @@
 #include "query_button.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void QueryButton::press_action() { this->parent_->read_all_info(); }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/button/query_button.h b/esphome/components/ld2412/button/query_button.h
index 595ef6d1e9..373e135802 100644
--- a/esphome/components/ld2412/button/query_button.h
+++ b/esphome/components/ld2412/button/query_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class QueryButton : public button::Button, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class QueryButton : public button::Button, public Parented<LD2412Component> {
   void press_action() override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/button/restart_button.cpp b/esphome/components/ld2412/button/restart_button.cpp
index aca0d17841..430f6c998f 100644
--- a/esphome/components/ld2412/button/restart_button.cpp
+++ b/esphome/components/ld2412/button/restart_button.cpp
@@ -1,9 +1,7 @@
 #include "restart_button.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void RestartButton::press_action() { this->parent_->restart_and_read_all_info(); }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/button/restart_button.h b/esphome/components/ld2412/button/restart_button.h
index 5cd582e2a3..80c79f5e7d 100644
--- a/esphome/components/ld2412/button/restart_button.h
+++ b/esphome/components/ld2412/button/restart_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class RestartButton : public button::Button, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class RestartButton : public button::Button, public Parented<LD2412Component> {
   void press_action() override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/button/start_dynamic_background_correction_button.cpp b/esphome/components/ld2412/button/start_dynamic_background_correction_button.cpp
index 9b37243b82..8ba41a03fb 100644
--- a/esphome/components/ld2412/button/start_dynamic_background_correction_button.cpp
+++ b/esphome/components/ld2412/button/start_dynamic_background_correction_button.cpp
@@ -2,10 +2,8 @@
 
 #include "restart_button.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void StartDynamicBackgroundCorrectionButton::press_action() { this->parent_->start_dynamic_background_correction(); }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/button/start_dynamic_background_correction_button.h b/esphome/components/ld2412/button/start_dynamic_background_correction_button.h
index 3af0a8a149..b1f2127896 100644
--- a/esphome/components/ld2412/button/start_dynamic_background_correction_button.h
+++ b/esphome/components/ld2412/button/start_dynamic_background_correction_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class StartDynamicBackgroundCorrectionButton : public button::Button, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class StartDynamicBackgroundCorrectionButton : public button::Button, public Par
   void press_action() override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/ld2412.cpp b/esphome/components/ld2412/ld2412.cpp
index 4f2fd7c2bd..0f6fe62d30 100644
--- a/esphome/components/ld2412/ld2412.cpp
+++ b/esphome/components/ld2412/ld2412.cpp
@@ -10,8 +10,7 @@
 #include "esphome/core/application.h"
 #include "esphome/core/helpers.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 static const char *const TAG = "ld2412";
 
@@ -855,5 +854,4 @@ void LD2412Component::set_gate_still_sensor(uint8_t gate, sensor::Sensor *s) {
 }
 #endif
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/ld2412.h b/esphome/components/ld2412/ld2412.h
index 2bed34bdd8..5dd5e7bcde 100644
--- a/esphome/components/ld2412/ld2412.h
+++ b/esphome/components/ld2412/ld2412.h
@@ -29,8 +29,7 @@
 
 #include <array>
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 using namespace ld24xx;
 
@@ -137,5 +136,4 @@ class LD2412Component : public Component, public uart::UARTDevice {
 #endif
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/number/gate_threshold_number.cpp b/esphome/components/ld2412/number/gate_threshold_number.cpp
index 47f8cd9107..8d12bad115 100644
--- a/esphome/components/ld2412/number/gate_threshold_number.cpp
+++ b/esphome/components/ld2412/number/gate_threshold_number.cpp
@@ -1,7 +1,6 @@
 #include "gate_threshold_number.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 GateThresholdNumber::GateThresholdNumber(uint8_t gate) : gate_(gate) {}
 
@@ -10,5 +9,4 @@ void GateThresholdNumber::control(float value) {
   this->parent_->set_gate_threshold();
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/number/gate_threshold_number.h b/esphome/components/ld2412/number/gate_threshold_number.h
index 61d9945a0a..78c2e54d82 100644
--- a/esphome/components/ld2412/number/gate_threshold_number.h
+++ b/esphome/components/ld2412/number/gate_threshold_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class GateThresholdNumber : public number::Number, public Parented<LD2412Component> {
  public:
@@ -15,5 +14,4 @@ class GateThresholdNumber : public number::Number, public Parented<LD2412Compone
   void control(float value) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/number/light_threshold_number.cpp b/esphome/components/ld2412/number/light_threshold_number.cpp
index 5dab1716bf..81e668e779 100644
--- a/esphome/components/ld2412/number/light_threshold_number.cpp
+++ b/esphome/components/ld2412/number/light_threshold_number.cpp
@@ -1,12 +1,10 @@
 #include "light_threshold_number.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void LightThresholdNumber::control(float value) {
   this->publish_state(value);
   this->parent_->set_light_out_control();
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/number/light_threshold_number.h b/esphome/components/ld2412/number/light_threshold_number.h
index d8727d3c98..81fd73111c 100644
--- a/esphome/components/ld2412/number/light_threshold_number.h
+++ b/esphome/components/ld2412/number/light_threshold_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class LightThresholdNumber : public number::Number, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class LightThresholdNumber : public number::Number, public Parented<LD2412Compon
   void control(float value) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/number/max_distance_timeout_number.cpp b/esphome/components/ld2412/number/max_distance_timeout_number.cpp
index 1c6471bc72..0d156fbc00 100644
--- a/esphome/components/ld2412/number/max_distance_timeout_number.cpp
+++ b/esphome/components/ld2412/number/max_distance_timeout_number.cpp
@@ -1,12 +1,10 @@
 #include "max_distance_timeout_number.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void MaxDistanceTimeoutNumber::control(float value) {
   this->publish_state(value);
   this->parent_->set_basic_config();
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/number/max_distance_timeout_number.h b/esphome/components/ld2412/number/max_distance_timeout_number.h
index af0dcf68c5..c1e947fa19 100644
--- a/esphome/components/ld2412/number/max_distance_timeout_number.h
+++ b/esphome/components/ld2412/number/max_distance_timeout_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2412Co
   void control(float value) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/select/baud_rate_select.cpp b/esphome/components/ld2412/select/baud_rate_select.cpp
index 7bc4683853..8e351a6541 100644
--- a/esphome/components/ld2412/select/baud_rate_select.cpp
+++ b/esphome/components/ld2412/select/baud_rate_select.cpp
@@ -1,12 +1,10 @@
 #include "baud_rate_select.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void BaudRateSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_baud_rate(this->option_at(index));
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/select/baud_rate_select.h b/esphome/components/ld2412/select/baud_rate_select.h
index ffe0329341..4666dd2fa0 100644
--- a/esphome/components/ld2412/select/baud_rate_select.h
+++ b/esphome/components/ld2412/select/baud_rate_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class BaudRateSelect : public select::Select, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class BaudRateSelect : public select::Select, public Parented<LD2412Component> {
   void control(size_t index) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/select/distance_resolution_select.cpp b/esphome/components/ld2412/select/distance_resolution_select.cpp
index 5a6f46a071..95b80f87fb 100644
--- a/esphome/components/ld2412/select/distance_resolution_select.cpp
+++ b/esphome/components/ld2412/select/distance_resolution_select.cpp
@@ -1,12 +1,10 @@
 #include "distance_resolution_select.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void DistanceResolutionSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_distance_resolution(this->option_at(index));
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/select/distance_resolution_select.h b/esphome/components/ld2412/select/distance_resolution_select.h
index 842f63b7b1..d3b7fad2f9 100644
--- a/esphome/components/ld2412/select/distance_resolution_select.h
+++ b/esphome/components/ld2412/select/distance_resolution_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class DistanceResolutionSelect : public select::Select, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class DistanceResolutionSelect : public select::Select, public Parented<LD2412Co
   void control(size_t index) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/select/light_out_control_select.cpp b/esphome/components/ld2412/select/light_out_control_select.cpp
index cfbc7f7d7c..bdfb78d687 100644
--- a/esphome/components/ld2412/select/light_out_control_select.cpp
+++ b/esphome/components/ld2412/select/light_out_control_select.cpp
@@ -1,12 +1,10 @@
 #include "light_out_control_select.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void LightOutControlSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_light_out_control();
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/select/light_out_control_select.h b/esphome/components/ld2412/select/light_out_control_select.h
index 7a50970d0d..9f86189878 100644
--- a/esphome/components/ld2412/select/light_out_control_select.h
+++ b/esphome/components/ld2412/select/light_out_control_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class LightOutControlSelect : public select::Select, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class LightOutControlSelect : public select::Select, public Parented<LD2412Compo
   void control(size_t index) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/switch/bluetooth_switch.cpp b/esphome/components/ld2412/switch/bluetooth_switch.cpp
index 14387aa276..e5f49a819a 100644
--- a/esphome/components/ld2412/switch/bluetooth_switch.cpp
+++ b/esphome/components/ld2412/switch/bluetooth_switch.cpp
@@ -1,12 +1,10 @@
 #include "bluetooth_switch.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void BluetoothSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_bluetooth(state);
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/switch/bluetooth_switch.h b/esphome/components/ld2412/switch/bluetooth_switch.h
index 730d338d87..0c0d1fa550 100644
--- a/esphome/components/ld2412/switch/bluetooth_switch.h
+++ b/esphome/components/ld2412/switch/bluetooth_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class BluetoothSwitch : public switch_::Switch, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class BluetoothSwitch : public switch_::Switch, public Parented<LD2412Component>
   void write_state(bool state) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/switch/engineering_mode_switch.cpp b/esphome/components/ld2412/switch/engineering_mode_switch.cpp
index 29ca0c22a8..28b4e5d9e6 100644
--- a/esphome/components/ld2412/switch/engineering_mode_switch.cpp
+++ b/esphome/components/ld2412/switch/engineering_mode_switch.cpp
@@ -1,12 +1,10 @@
 #include "engineering_mode_switch.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void EngineeringModeSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_engineering_mode(state);
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/switch/engineering_mode_switch.h b/esphome/components/ld2412/switch/engineering_mode_switch.h
index aaa404c673..4e75a8a185 100644
--- a/esphome/components/ld2412/switch/engineering_mode_switch.h
+++ b/esphome/components/ld2412/switch/engineering_mode_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2412Comp
   void write_state(bool state) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp b/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp
index d8632e9c19..6297cba2e7 100644
--- a/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp
+++ b/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp
@@ -2,8 +2,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 static const char *const TAG = "ld2420.binary_sensor";
 
@@ -12,5 +11,4 @@ void LD2420BinarySensor::dump_config() {
   LOG_BINARY_SENSOR("  ", "Presence", this->presence_bsensor_);
 }
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.h b/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.h
index ee06439090..ec52312f92 100644
--- a/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.h
+++ b/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.h
@@ -3,8 +3,7 @@
 #include "../ld2420.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 class LD2420BinarySensor : public LD2420Listener, public Component, binary_sensor::BinarySensor {
  public:
@@ -21,5 +20,4 @@ class LD2420BinarySensor : public LD2420Listener, public Component, binary_senso
   binary_sensor::BinarySensor *presence_bsensor_{nullptr};
 };
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/button/reconfig_buttons.cpp b/esphome/components/ld2420/button/reconfig_buttons.cpp
index fb8ec2b5a6..1e748e59b8 100644
--- a/esphome/components/ld2420/button/reconfig_buttons.cpp
+++ b/esphome/components/ld2420/button/reconfig_buttons.cpp
@@ -4,13 +4,11 @@
 
 static const char *const TAG = "ld2420.button";
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 void LD2420ApplyConfigButton::press_action() { this->parent_->apply_config_action(); }
 void LD2420RevertConfigButton::press_action() { this->parent_->revert_config_action(); }
 void LD2420RestartModuleButton::press_action() { this->parent_->restart_module_action(); }
 void LD2420FactoryResetButton::press_action() { this->parent_->factory_reset_action(); }
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/button/reconfig_buttons.h b/esphome/components/ld2420/button/reconfig_buttons.h
index 4e9e7a3692..72171ef386 100644
--- a/esphome/components/ld2420/button/reconfig_buttons.h
+++ b/esphome/components/ld2420/button/reconfig_buttons.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2420.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 class LD2420ApplyConfigButton : public button::Button, public Parented<LD2420Component> {
  public:
@@ -38,5 +37,4 @@ class LD2420FactoryResetButton : public button::Button, public Parented<LD2420Co
   void press_action() override;
 };
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/ld2420.cpp b/esphome/components/ld2420/ld2420.cpp
index f544acc112..4fca9494aa 100644
--- a/esphome/components/ld2420/ld2420.cpp
+++ b/esphome/components/ld2420/ld2420.cpp
@@ -58,8 +58,7 @@ Gate 0 high thresh = 10 00 uint16_t 0x0010, Threshold value = 60 EA 00 00 uint32
 Gate 0 low thresh = 20 00 uint16_t 0x0020, Threshold value = 60 EA 00 00 uint32_t 0x0000EA60
 */
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 static const char *const TAG = "ld2420";
 
@@ -880,5 +879,4 @@ void LD2420Component::refresh_gate_config_numbers() {
 
 #endif
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/ld2420.h b/esphome/components/ld2420/ld2420.h
index 128baab604..50ddf45264 100644
--- a/esphome/components/ld2420/ld2420.h
+++ b/esphome/components/ld2420/ld2420.h
@@ -17,8 +17,7 @@
 #include "esphome/components/button/button.h"
 #endif
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 static const uint8_t CALIBRATE_SAMPLES = 64;
 static const uint8_t MAX_LINE_LENGTH = 46;  // Max characters for serial buffer
@@ -193,5 +192,4 @@ class LD2420Component : public Component, public uart::UARTDevice {
   std::vector<LD2420Listener *> listeners_{};
 };
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/number/gate_config_number.cpp b/esphome/components/ld2420/number/gate_config_number.cpp
index a373753770..998eed2188 100644
--- a/esphome/components/ld2420/number/gate_config_number.cpp
+++ b/esphome/components/ld2420/number/gate_config_number.cpp
@@ -4,8 +4,7 @@
 
 static const char *const TAG = "ld2420.number";
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 void LD2420TimeoutNumber::control(float timeout) {
   this->publish_state(timeout);
@@ -69,5 +68,4 @@ void LD2420StillThresholdNumbers::control(float still_threshold) {
   }
 }
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/number/gate_config_number.h b/esphome/components/ld2420/number/gate_config_number.h
index 459a8026e3..8a8b9c61b1 100644
--- a/esphome/components/ld2420/number/gate_config_number.h
+++ b/esphome/components/ld2420/number/gate_config_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2420.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 class LD2420TimeoutNumber : public number::Number, public Parented<LD2420Component> {
  public:
@@ -74,5 +73,4 @@ class LD2420MoveThresholdNumbers : public number::Number, public Parented<LD2420
   void control(float move_threshold) override;
 };
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/select/operating_mode_select.cpp b/esphome/components/ld2420/select/operating_mode_select.cpp
index 5bf80b33c9..82939e18d3 100644
--- a/esphome/components/ld2420/select/operating_mode_select.cpp
+++ b/esphome/components/ld2420/select/operating_mode_select.cpp
@@ -2,8 +2,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 static const char *const TAG = "ld2420.select";
 
@@ -12,5 +11,4 @@ void LD2420Select::control(size_t index) {
   this->parent_->set_operating_mode(this->option_at(index));
 }
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/select/operating_mode_select.h b/esphome/components/ld2420/select/operating_mode_select.h
index f59eb33432..c1b8e0b11b 100644
--- a/esphome/components/ld2420/select/operating_mode_select.h
+++ b/esphome/components/ld2420/select/operating_mode_select.h
@@ -3,8 +3,7 @@
 #include "../ld2420.h"
 #include "esphome/components/select/select.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 class LD2420Select : public Component, public select::Select, public Parented<LD2420Component> {
  public:
@@ -14,5 +13,4 @@ class LD2420Select : public Component, public select::Select, public Parented<LD
   void control(size_t index) override;
 };
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/sensor/ld2420_sensor.cpp b/esphome/components/ld2420/sensor/ld2420_sensor.cpp
index 723604f396..02b5826f98 100644
--- a/esphome/components/ld2420/sensor/ld2420_sensor.cpp
+++ b/esphome/components/ld2420/sensor/ld2420_sensor.cpp
@@ -2,8 +2,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 static const char *const TAG = "ld2420.sensor";
 
@@ -12,5 +11,4 @@ void LD2420Sensor::dump_config() {
   LOG_SENSOR("  ", "Distance", this->distance_sensor_);
 }
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/sensor/ld2420_sensor.h b/esphome/components/ld2420/sensor/ld2420_sensor.h
index 82730d60e3..4849cfa047 100644
--- a/esphome/components/ld2420/sensor/ld2420_sensor.h
+++ b/esphome/components/ld2420/sensor/ld2420_sensor.h
@@ -3,8 +3,7 @@
 #include "../ld2420.h"
 #include "esphome/components/sensor/sensor.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 class LD2420Sensor : public LD2420Listener, public Component, sensor::Sensor {
  public:
@@ -30,5 +29,4 @@ class LD2420Sensor : public LD2420Listener, public Component, sensor::Sensor {
   std::vector<sensor::Sensor *> energy_sensors_ = std::vector<sensor::Sensor *>(TOTAL_GATES);
 };
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/text_sensor/ld2420_text_sensor.cpp b/esphome/components/ld2420/text_sensor/ld2420_text_sensor.cpp
index f647a36936..f7b016c9d9 100644
--- a/esphome/components/ld2420/text_sensor/ld2420_text_sensor.cpp
+++ b/esphome/components/ld2420/text_sensor/ld2420_text_sensor.cpp
@@ -2,8 +2,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 static const char *const TAG = "ld2420.text_sensor";
 
@@ -12,5 +11,4 @@ void LD2420TextSensor::dump_config() {
   LOG_TEXT_SENSOR("  ", "Firmware", this->fw_version_text_sensor_);
 }
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/text_sensor/ld2420_text_sensor.h b/esphome/components/ld2420/text_sensor/ld2420_text_sensor.h
index 073ddd5d0f..1932eaaf69 100644
--- a/esphome/components/ld2420/text_sensor/ld2420_text_sensor.h
+++ b/esphome/components/ld2420/text_sensor/ld2420_text_sensor.h
@@ -3,8 +3,7 @@
 #include "../ld2420.h"
 #include "esphome/components/text_sensor/text_sensor.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 class LD2420TextSensor : public LD2420Listener, public Component, text_sensor::TextSensor {
  public:
@@ -20,5 +19,4 @@ class LD2420TextSensor : public LD2420Listener, public Component, text_sensor::T
   text_sensor::TextSensor *fw_version_text_sensor_{nullptr};
 };
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2450/button/factory_reset_button.cpp b/esphome/components/ld2450/button/factory_reset_button.cpp
index bcac7ada2f..7a8eb5b0dd 100644
--- a/esphome/components/ld2450/button/factory_reset_button.cpp
+++ b/esphome/components/ld2450/button/factory_reset_button.cpp
@@ -1,9 +1,7 @@
 #include "factory_reset_button.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 void FactoryResetButton::press_action() { this->parent_->factory_reset(); }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/button/factory_reset_button.h b/esphome/components/ld2450/button/factory_reset_button.h
index 8e80347119..392fc67ffd 100644
--- a/esphome/components/ld2450/button/factory_reset_button.h
+++ b/esphome/components/ld2450/button/factory_reset_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class FactoryResetButton : public button::Button, public Parented<LD2450Component> {
  public:
@@ -14,5 +13,4 @@ class FactoryResetButton : public button::Button, public Parented<LD2450Componen
   void press_action() override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/button/restart_button.cpp b/esphome/components/ld2450/button/restart_button.cpp
index ee2f5ac12f..572df80325 100644
--- a/esphome/components/ld2450/button/restart_button.cpp
+++ b/esphome/components/ld2450/button/restart_button.cpp
@@ -1,9 +1,7 @@
 #include "restart_button.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 void RestartButton::press_action() { this->parent_->restart_and_read_all_info(); }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/button/restart_button.h b/esphome/components/ld2450/button/restart_button.h
index a44ae5a4d2..9219011f8b 100644
--- a/esphome/components/ld2450/button/restart_button.h
+++ b/esphome/components/ld2450/button/restart_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class RestartButton : public button::Button, public Parented<LD2450Component> {
  public:
@@ -14,5 +13,4 @@ class RestartButton : public button::Button, public Parented<LD2450Component> {
   void press_action() override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/ld2450.cpp b/esphome/components/ld2450/ld2450.cpp
index 8e5287aec7..e69ef31d4f 100644
--- a/esphome/components/ld2450/ld2450.cpp
+++ b/esphome/components/ld2450/ld2450.cpp
@@ -13,8 +13,7 @@
 #include <cmath>
 #include <numbers>
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 static const char *const TAG = "ld2450";
 
@@ -939,5 +938,4 @@ float LD2450Component::restore_from_flash_() {
 }
 #endif
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/ld2450.h b/esphome/components/ld2450/ld2450.h
index 44b63be444..b94c3cac37 100644
--- a/esphome/components/ld2450/ld2450.h
+++ b/esphome/components/ld2450/ld2450.h
@@ -31,8 +31,7 @@
 
 #include <array>
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 using namespace ld24xx;
 
@@ -193,5 +192,4 @@ class LD2450Component : public Component, public uart::UARTDevice {
 #endif
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/number/presence_timeout_number.cpp b/esphome/components/ld2450/number/presence_timeout_number.cpp
index ecfe71f484..19a1ada0d7 100644
--- a/esphome/components/ld2450/number/presence_timeout_number.cpp
+++ b/esphome/components/ld2450/number/presence_timeout_number.cpp
@@ -1,12 +1,10 @@
 #include "presence_timeout_number.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 void PresenceTimeoutNumber::control(float value) {
   this->publish_state(value);
   this->parent_->set_presence_timeout();
 }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/number/presence_timeout_number.h b/esphome/components/ld2450/number/presence_timeout_number.h
index b18699792f..09c8afca55 100644
--- a/esphome/components/ld2450/number/presence_timeout_number.h
+++ b/esphome/components/ld2450/number/presence_timeout_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class PresenceTimeoutNumber : public number::Number, public Parented<LD2450Component> {
  public:
@@ -14,5 +13,4 @@ class PresenceTimeoutNumber : public number::Number, public Parented<LD2450Compo
   void control(float value) override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/number/zone_coordinate_number.cpp b/esphome/components/ld2450/number/zone_coordinate_number.cpp
index 5338d7e5ee..83be3cbec4 100644
--- a/esphome/components/ld2450/number/zone_coordinate_number.cpp
+++ b/esphome/components/ld2450/number/zone_coordinate_number.cpp
@@ -1,7 +1,6 @@
 #include "zone_coordinate_number.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 ZoneCoordinateNumber::ZoneCoordinateNumber(uint8_t zone) : zone_(zone) {}
 
@@ -10,5 +9,4 @@ void ZoneCoordinateNumber::control(float value) {
   this->parent_->set_zone_coordinate(this->zone_);
 }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/number/zone_coordinate_number.h b/esphome/components/ld2450/number/zone_coordinate_number.h
index 72b83889c4..f5a389d712 100644
--- a/esphome/components/ld2450/number/zone_coordinate_number.h
+++ b/esphome/components/ld2450/number/zone_coordinate_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class ZoneCoordinateNumber : public number::Number, public Parented<LD2450Component> {
  public:
@@ -15,5 +14,4 @@ class ZoneCoordinateNumber : public number::Number, public Parented<LD2450Compon
   void control(float value) override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/select/baud_rate_select.cpp b/esphome/components/ld2450/select/baud_rate_select.cpp
index 754972214e..7b18b28006 100644
--- a/esphome/components/ld2450/select/baud_rate_select.cpp
+++ b/esphome/components/ld2450/select/baud_rate_select.cpp
@@ -1,12 +1,10 @@
 #include "baud_rate_select.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 void BaudRateSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_baud_rate(this->option_at(index));
 }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/select/baud_rate_select.h b/esphome/components/ld2450/select/baud_rate_select.h
index 22810d5f13..cb53118170 100644
--- a/esphome/components/ld2450/select/baud_rate_select.h
+++ b/esphome/components/ld2450/select/baud_rate_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class BaudRateSelect : public select::Select, public Parented<LD2450Component> {
  public:
@@ -14,5 +13,4 @@ class BaudRateSelect : public select::Select, public Parented<LD2450Component> {
   void control(size_t index) override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/select/zone_type_select.cpp b/esphome/components/ld2450/select/zone_type_select.cpp
index 1111428c7c..39642b99ad 100644
--- a/esphome/components/ld2450/select/zone_type_select.cpp
+++ b/esphome/components/ld2450/select/zone_type_select.cpp
@@ -1,12 +1,10 @@
 #include "zone_type_select.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 void ZoneTypeSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_zone_type(this->option_at(index));
 }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/select/zone_type_select.h b/esphome/components/ld2450/select/zone_type_select.h
index fc95ec1021..566346eb48 100644
--- a/esphome/components/ld2450/select/zone_type_select.h
+++ b/esphome/components/ld2450/select/zone_type_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class ZoneTypeSelect : public select::Select, public Parented<LD2450Component> {
  public:
@@ -14,5 +13,4 @@ class ZoneTypeSelect : public select::Select, public Parented<LD2450Component> {
   void control(size_t index) override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/switch/bluetooth_switch.cpp b/esphome/components/ld2450/switch/bluetooth_switch.cpp
index fa0d4fb06a..0e19a3e6c6 100644
--- a/esphome/components/ld2450/switch/bluetooth_switch.cpp
+++ b/esphome/components/ld2450/switch/bluetooth_switch.cpp
@@ -1,12 +1,10 @@
 #include "bluetooth_switch.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 void BluetoothSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_bluetooth(state);
 }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/switch/bluetooth_switch.h b/esphome/components/ld2450/switch/bluetooth_switch.h
index 3c1c4f755c..3d48a89b57 100644
--- a/esphome/components/ld2450/switch/bluetooth_switch.h
+++ b/esphome/components/ld2450/switch/bluetooth_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class BluetoothSwitch : public switch_::Switch, public Parented<LD2450Component> {
  public:
@@ -14,5 +13,4 @@ class BluetoothSwitch : public switch_::Switch, public Parented<LD2450Component>
   void write_state(bool state) override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/switch/multi_target_switch.cpp b/esphome/components/ld2450/switch/multi_target_switch.cpp
index a163e29fc5..0b1cb04a68 100644
--- a/esphome/components/ld2450/switch/multi_target_switch.cpp
+++ b/esphome/components/ld2450/switch/multi_target_switch.cpp
@@ -1,12 +1,10 @@
 #include "multi_target_switch.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 void MultiTargetSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_multi_target(state);
 }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/switch/multi_target_switch.h b/esphome/components/ld2450/switch/multi_target_switch.h
index ca6253588d..739f308cce 100644
--- a/esphome/components/ld2450/switch/multi_target_switch.h
+++ b/esphome/components/ld2450/switch/multi_target_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class MultiTargetSwitch : public switch_::Switch, public Parented<LD2450Component> {
  public:
@@ -14,5 +13,4 @@ class MultiTargetSwitch : public switch_::Switch, public Parented<LD2450Componen
   void write_state(bool state) override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld24xx/ld24xx.h b/esphome/components/ld24xx/ld24xx.h
index e695b00705..cbd86e4e40 100644
--- a/esphome/components/ld24xx/ld24xx.h
+++ b/esphome/components/ld24xx/ld24xx.h
@@ -37,8 +37,7 @@
 #define highbyte(val) (uint8_t)((val) >> 8)
 #define lowbyte(val) (uint8_t)((val) &0xff)
 
-namespace esphome {
-namespace ld24xx {
+namespace esphome::ld24xx {
 
 static const char *const UNKNOWN_MAC = "unknown";
 static const char *const VERSION_FMT = "%u.%02X.%02X%02X%02X%02X";
@@ -83,5 +82,4 @@ template<typename T> class SensorWithDedup {
   Deduplicator<T> publish_dedup;
 };
 #endif
-}  // namespace ld24xx
-}  // namespace esphome
+}  // namespace esphome::ld24xx