avoid declaration complexity

Author: d-a-v

libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h

@@ -457,21 +457,6 @@ void ESP8266WebServerTemplate<ServerType>::_prepareHeader(String& response, int
     _responseHeaders = "";
 }
 
-template <typename ServerType>
-void ESP8266WebServerTemplate<ServerType>::send(int code, char* content_type, const String& content) {
-  return send(code, (const char*)content_type, content);
-}
-
-template <typename ServerType>
-void ESP8266WebServerTemplate<ServerType>::send(int code, const char* content_type, const String& content) {
-  return send(code, content_type, content.c_str(), content.length());
-}
-
-template <typename ServerType>
-void ESP8266WebServerTemplate<ServerType>::send(int code, const String& content_type, const String& content) {
-  return send(code, (const char*)content_type.c_str(), content);
-}
-
 template <typename ServerType>
 void ESP8266WebServerTemplate<ServerType>::sendContent(const String& content) {
   StreamConstPtr ref(content.c_str(), content.length());
@@ -491,18 +476,6 @@ void ESP8266WebServerTemplate<ServerType>::send(int code, const char* content_ty
     return sendContent(stream, content_length);
 }
 
-template <typename ServerType>
-void ESP8266WebServerTemplate<ServerType>::send_P(int code, PGM_P content_type, PGM_P content) {
-  StreamConstPtr ref(content, strlen_P(content));
-  return send(code, String(content_type).c_str(), &ref);
-}
-
-template <typename ServerType>
-void ESP8266WebServerTemplate<ServerType>::send_P(int code, PGM_P content_type, PGM_P content, size_t contentLength) {
-  StreamConstPtr ref(content, contentLength);
-  return send(code, String(content_type).c_str(), &ref);
-}
-
 template <typename ServerType>
 void ESP8266WebServerTemplate<ServerType>::sendContent(Stream* content, ssize_t content_length /* = 0*/) {
   if (_currentMethod == HTTP_HEAD)

libraries/ESP8266WebServer/src/ESP8266WebServer.h

@@ -155,25 +155,37 @@ class ESP8266WebServerTemplate
   // code - HTTP response code, can be 200 or 404
   // content_type - HTTP content type, like "text/plain" or "image/png"
   // content - actual content body
-  void send(int code, const char* content_type = NULL, const String& content = emptyString);
-  void send(int code, char* content_type, const String& content);
-  void send(int code, const String& content_type, const String& content);
-  void send(int code, const char *content_type, const char *content) {
+  void send(int code, const char*   content_type = NULL, const String& content = emptyString) {
+    return send(code, content_type, content.c_str(), content.length());
+  }
+  void send(int code, char* content_type, const String& content) {
+    return send(code, (const char*)content_type, content);
+  }
+  void send(int code, const String& content_type, const String& content) {
+    return send(code, (const char*)content_type.c_str(), content);
+  }
+  void send(int code, const char* content_type, const char* content) {
     send_P(code, content_type, content);
   }
-  void send(int code, const char *content_type, const char *content, size_t content_length) {
+  void send(int code, const char* content_type, const char* content, size_t content_length) {
     send_P(code, content_type, content, content_length);
   }
-  void send(int code, const char *content_type, const uint8_t *content, size_t content_length) {
-    send_P(code, content_type, (const char *)content, content_length);
+  void send(int code, const char* content_type, const uint8_t* content, size_t content_length) {
+    send_P(code, content_type, (const char* )content, content_length);
   }
-  void send_P(int code, PGM_P content_type, PGM_P content);
-  void send_P(int code, PGM_P content_type, PGM_P content, size_t contentLength);
-
-  void send(int code, const char* content_type, Stream* stream, size_t content_length = 0);
   void send(int code, const char* content_type, Stream& stream, size_t content_length = 0) {
     send(code, content_type, &stream, content_length);
   }
+  void send_P(int code, PGM_P content_type, PGM_P content) {
+    StreamConstPtr ref(content, strlen_P(content));
+    return send(code, String(content_type).c_str(), &ref);
+  }
+  void send_P(int code, PGM_P content_type, PGM_P content, size_t contentLength) {
+    StreamConstPtr ref(content, contentLength);
+    return send(code, String(content_type).c_str(), &ref);
+  }
+
+  void send(int code, const char* content_type, Stream* stream, size_t content_length = 0);
 
   void setContentLength(const size_t contentLength);
   void sendHeader(const String& name, const String& value, bool first = false);