From 3e9ef271ae242f455398ad99dc6333dc47ffbd98 Mon Sep 17 00:00:00 2001 From: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com> Date: Tue, 17 Feb 2026 11:47:23 -0500 Subject: [PATCH] [esp32_touch] Modernize to combined namespace syntax Co-Authored-By: Claude Opus 4.6 --- esphome/components/esp32_touch/esp32_touch.cpp | 6 ++---- esphome/components/esp32_touch/esp32_touch.h | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/esphome/components/esp32_touch/esp32_touch.cpp b/esphome/components/esp32_touch/esp32_touch.cpp index 0bfcadb851..0db70df5f7 100644 --- a/esphome/components/esp32_touch/esp32_touch.cpp +++ b/esphome/components/esp32_touch/esp32_touch.cpp @@ -7,8 +7,7 @@ #include -namespace esphome { -namespace esp32_touch { +namespace esphome::esp32_touch { static const char *const TAG = "esp32_touch"; @@ -632,7 +631,6 @@ void ESP32TouchComponent::check_and_disable_loop_if_all_released_(size_t pads_of } } -} // namespace esp32_touch -} // namespace esphome +} // namespace esphome::esp32_touch #endif // USE_ESP32 diff --git a/esphome/components/esp32_touch/esp32_touch.h b/esphome/components/esp32_touch/esp32_touch.h index c69d0aeb45..8f47661281 100644 --- a/esphome/components/esp32_touch/esp32_touch.h +++ b/esphome/components/esp32_touch/esp32_touch.h @@ -11,8 +11,7 @@ #include #include -namespace esphome { -namespace esp32_touch { +namespace esphome::esp32_touch { // IMPORTANT: Touch detection logic differs between ESP32 variants: // - ESP32 v1 (original): Touch detected when value < threshold (absolute threshold, capacitance increase causes @@ -254,7 +253,6 @@ class ESP32TouchBinarySensor : public binary_sensor::BinarySensor { bool initial_state_published_{false}; }; -} // namespace esp32_touch -} // namespace esphome +} // namespace esphome::esp32_touch #endif