mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-01-10 12:10:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

[alarm_control_panel] Use C++17 nested namespace and remove unused include (#12662)

Browse Source
This commit is contained in:
J. Nick Koston
2025-12-26 07:57:33 -10:00
committed by GitHub
parent 958a35e262
commit 4f70663658
7 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
esphome/components/alarm_control_panel/alarm_control_panel.cpp
View File

@@ -8,8 +8,7 @@
#include "esphome/core/helpers.h" #include "esphome/core/helpers.h"
#include "esphome/core/log.h" #include "esphome/core/log.h"
namespace esphome { namespace esphome::alarm_control_panel {
namespace alarm_control_panel {
static const char *const TAG = "alarm_control_panel"; static const char *const TAG = "alarm_control_panel";
@@ -115,5 +114,4 @@ void AlarmControlPanel::disarm(optional<std::string> code) {
call.perform(); call.perform();
} }
} // namespace alarm_control_panel } // namespace esphome::alarm_control_panel
} // namespace esphome

8
esphome/components/alarm_control_panel/alarm_control_panel.h
View File

@@ -1,7 +1,5 @@
#pragma once #pragma once
#include <map>
#include "alarm_control_panel_call.h" #include "alarm_control_panel_call.h"
#include "alarm_control_panel_state.h" #include "alarm_control_panel_state.h"
@@ -9,8 +7,7 @@
#include "esphome/core/entity_base.h" #include "esphome/core/entity_base.h"
#include "esphome/core/log.h" #include "esphome/core/log.h"
namespace esphome { namespace esphome::alarm_control_panel {
namespace alarm_control_panel {
enum AlarmControlPanelFeature : uint8_t { enum AlarmControlPanelFeature : uint8_t {
// Matches Home Assistant values // Matches Home Assistant values
@@ -141,5 +138,4 @@ class AlarmControlPanel : public EntityBase {
LazyCallbackManager<void()> ready_callback_{}; LazyCallbackManager<void()> ready_callback_{};
}; };
} // namespace alarm_control_panel } // namespace esphome::alarm_control_panel
} // namespace esphome

6
esphome/components/alarm_control_panel/alarm_control_panel_call.cpp
View File

@@ -4,8 +4,7 @@
#include "esphome/core/log.h" #include "esphome/core/log.h"
namespace esphome { namespace esphome::alarm_control_panel {
namespace alarm_control_panel {
static const char *const TAG = "alarm_control_panel"; static const char *const TAG = "alarm_control_panel";
@@ -99,5 +98,4 @@ void AlarmControlPanelCall::perform() {
} }
} }
} // namespace alarm_control_panel } // namespace esphome::alarm_control_panel
} // namespace esphome

6
esphome/components/alarm_control_panel/alarm_control_panel_call.h
View File

@@ -6,8 +6,7 @@
#include "esphome/core/helpers.h" #include "esphome/core/helpers.h"
namespace esphome { namespace esphome::alarm_control_panel {
namespace alarm_control_panel {
class AlarmControlPanel; class AlarmControlPanel;
@@ -36,5 +35,4 @@ class AlarmControlPanelCall {
void validate_(); void validate_();
}; };
} // namespace alarm_control_panel } // namespace esphome::alarm_control_panel
} // namespace esphome

6
esphome/components/alarm_control_panel/alarm_control_panel_state.cpp
View File

@@ -1,7 +1,6 @@
#include "alarm_control_panel_state.h" #include "alarm_control_panel_state.h"
namespace esphome { namespace esphome::alarm_control_panel {
namespace alarm_control_panel {
const LogString *alarm_control_panel_state_to_string(AlarmControlPanelState state) { const LogString *alarm_control_panel_state_to_string(AlarmControlPanelState state) {
switch (state) { switch (state) {
@@ -30,5 +29,4 @@ const LogString *alarm_control_panel_state_to_string(AlarmControlPanelState stat
} }
} }
} // namespace alarm_control_panel } // namespace esphome::alarm_control_panel
} // namespace esphome

6
esphome/components/alarm_control_panel/alarm_control_panel_state.h
View File

@@ -3,8 +3,7 @@
#include <cstdint> #include <cstdint>
#include "esphome/core/log.h" #include "esphome/core/log.h"
namespace esphome { namespace esphome::alarm_control_panel {
namespace alarm_control_panel {
enum AlarmControlPanelState : uint8_t { enum AlarmControlPanelState : uint8_t {
ACP_STATE_DISARMED = 0, ACP_STATE_DISARMED = 0,
@@ -25,5 +24,4 @@ enum AlarmControlPanelState : uint8_t {
*/ */
const LogString *alarm_control_panel_state_to_string(AlarmControlPanelState state); const LogString *alarm_control_panel_state_to_string(AlarmControlPanelState state);
} // namespace alarm_control_panel } // namespace esphome::alarm_control_panel
} // namespace esphome

6
esphome/components/alarm_control_panel/automation.h
View File

@@ -3,8 +3,7 @@
#include "esphome/core/automation.h" #include "esphome/core/automation.h"
#include "alarm_control_panel.h" #include "alarm_control_panel.h"
namespace esphome { namespace esphome::alarm_control_panel {
namespace alarm_control_panel {
/// Trigger on any state change /// Trigger on any state change
class StateTrigger : public Trigger<> { class StateTrigger : public Trigger<> {
@@ -165,5 +164,4 @@ template<typename... Ts> class AlarmControlPanelCondition : public Condition<Ts.
AlarmControlPanel *parent_; AlarmControlPanel *parent_;
}; };
} // namespace alarm_control_panel } // namespace esphome::alarm_control_panel
} // namespace esphome