scratch/esphome
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

[web_server] Use C++17 nested namespace syntax (#12663)

Browse Source
This commit is contained in:
J. Nick Koston
2025-12-26 08:44:34 -10:00
committed by GitHub
parent f1fecd22e3
commit 5a2e0612a8
9 changed files with 21 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
esphome/components/web_server/list_entities.cpp
View File

@@ -6,8 +6,7 @@
#include "web_server.h"
namespace esphome {
namespace web_server {
namespace esphome::web_server {
#ifdef USE_ESP32
ListEntitiesIterator::ListEntitiesIterator(const WebServer *ws, AsyncEventSource *es) : web_server_(ws), events_(es) {}
@@ -157,6 +156,5 @@ bool ListEntitiesIterator::on_update(update::UpdateEntity *obj) {
}
#endif
} // namespace web_server
} // namespace esphome
} // namespace esphome::web_server
#endif

11
esphome/components/web_server/list_entities.h
View File

@@ -4,13 +4,13 @@
#ifdef USE_WEBSERVER
#include "esphome/core/component.h"
#include "esphome/core/component_iterator.h"
namespace esphome {
namespace esphome::web_server_idf {
#ifdef USE_ESP32
namespace web_server_idf {
class AsyncEventSource;
}
#endif
namespace web_server {
} // namespace esphome::web_server_idf
namespace esphome::web_server {
#if !defined(USE_ESP32) && defined(USE_ARDUINO)
class DeferredUpdateEventSource;
@@ -99,6 +99,5 @@ class ListEntitiesIterator : public ComponentIterator {
#endif
};
} // namespace web_server
} // namespace esphome
} // namespace esphome::web_server
#endif

6
esphome/components/web_server/ota/ota_web_server.cpp
View File

@@ -23,8 +23,7 @@ using PlatformString = std::string;
using PlatformString = String;
#endif
namespace esphome {
namespace web_server {
namespace esphome::web_server {
static const char *const TAG = "web_server.ota";
@@ -236,7 +235,6 @@ void WebServerOTAComponent::setup() {
void WebServerOTAComponent::dump_config() { ESP_LOGCONFIG(TAG, "Web Server OTA"); }
} // namespace web_server
} // namespace esphome
} // namespace esphome::web_server
#endif // USE_WEBSERVER_OTA

6
esphome/components/web_server/ota/ota_web_server.h
View File

@@ -7,8 +7,7 @@
#include "esphome/components/web_server_base/web_server_base.h"
#include "esphome/core/component.h"
namespace esphome {
namespace web_server {
namespace esphome::web_server {
class WebServerOTAComponent : public ota::OTAComponent {
public:
@@ -20,7 +19,6 @@ class WebServerOTAComponent : public ota::OTAComponent {
friend class OTARequestHandler;
};
} // namespace web_server
} // namespace esphome
} // namespace esphome::web_server
#endif // USE_WEBSERVER_OTA

6
esphome/components/web_server/server_index_v2.h
View File

@@ -6,8 +6,7 @@
#include "esphome/core/hal.h"
namespace esphome {
namespace web_server {
namespace esphome::web_server {
const uint8_t INDEX_GZ[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xcd, 0x7d, 0xdb, 0x72, 0xdb, 0xc6, 0xb6, 0xe0, 0xf3,
@@ -644,8 +643,7 @@ const uint8_t INDEX_GZ[] PROGMEM = {
0x2b, 0x4d, 0x17, 0xb8, 0x87, 0x4c, 0xe9, 0x50, 0x19, 0x14, 0xba, 0x92, 0xde, 0x0a, 0xea, 0x97, 0xce, 0xad, 0x80,
0x4f, 0xc7, 0xf5, 0xfe, 0x1f, 0xe7, 0xe0, 0x1c, 0x12, 0xcf, 0x89, 0x00, 0x00};
} // namespace web_server
} // namespace esphome
} // namespace esphome::web_server
#endif
#endif

6
esphome/components/web_server/server_index_v3.h
View File

@@ -6,8 +6,7 @@
#include "esphome/core/hal.h"
namespace esphome {
namespace web_server {
namespace esphome::web_server {
const uint8_t INDEX_GZ[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xcc, 0xbd, 0xeb, 0x7a, 0x1b, 0xb7, 0xb2, 0x20, 0xfa,
@@ -4048,8 +4047,7 @@ const uint8_t INDEX_GZ[] PROGMEM = {
0x3b, 0x6c, 0x78, 0x02, 0xa6, 0xdc, 0xb4, 0xe8, 0xee, 0x6a, 0xc5, 0x97, 0x94, 0x7e, 0xd1, 0x9b, 0x83, 0x45, 0xb2,
0xf4, 0x87, 0xff, 0x07, 0x52, 0xaf, 0x09, 0x6c, 0x30, 0x6a, 0x03, 0x00};
} // namespace web_server
} // namespace esphome
} // namespace esphome::web_server
#endif
#endif

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

@@ -36,8 +36,7 @@
#endif
#endif
namespace esphome {
namespace web_server {
namespace esphome::web_server {
static const char *const TAG = "web_server";
@@ -2105,6 +2104,5 @@ void WebServer::add_sorting_group(uint64_t group_id, const std::string &group_na
}
#endif
} // namespace web_server
} // namespace esphome
} // namespace esphome::web_server
#endif

6
esphome/components/web_server/web_server.h
View File

@@ -33,8 +33,7 @@ extern const uint8_t ESPHOME_WEBSERVER_JS_INCLUDE[] PROGMEM;
extern const size_t ESPHOME_WEBSERVER_JS_INCLUDE_SIZE;
#endif
namespace esphome {
namespace web_server {
namespace esphome::web_server {
/// Internal helper struct that is used to parse incoming URLs
struct UrlMatch {
@@ -616,6 +615,5 @@ class WebServer : public Controller,
#endif
};
} // namespace web_server
} // namespace esphome
} // namespace esphome::web_server
#endif

6
esphome/components/web_server/web_server_v1.cpp
View File

@@ -3,8 +3,7 @@
#if USE_WEBSERVER_VERSION == 1
namespace esphome {
namespace web_server {
namespace esphome::web_server {
void write_row(AsyncResponseStream *stream, EntityBase *obj, const std::string &klass, const std::string &action,
const std::function<void(AsyncResponseStream &stream, EntityBase *obj)> &action_func = nullptr) {
@@ -215,6 +214,5 @@ void WebServer::handle_index_request(AsyncWebServerRequest *request) {
request->send(stream);
}
} // namespace web_server
} // namespace esphome
} // namespace esphome::web_server
#endif