Remove ClientType from all templates, auto-infer

Remove the ClientType template parameter from all objects.  Simplifies
the code and makes it more foolproof.

Add a "using" in each server to define the type of connection returned
by all servers, which is then used in the above templates automatically.

Author: earlephilhower

libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer-impl.h

@@ -16,8 +16,8 @@ static const char serverIndex[] PROGMEM =
 static const char successResponse[] PROGMEM = 
   "<META http-equiv=\"refresh\" content=\"15;URL=/\">Update Success! Rebooting...\n";
 
-template <typename ServerType, typename ClientType>
-ESP8266HTTPUpdateServerTemplate<ServerType, ClientType>::ESP8266HTTPUpdateServerTemplate(bool serial_debug)
+template <typename ServerType>
+ESP8266HTTPUpdateServerTemplate<ServerType>::ESP8266HTTPUpdateServerTemplate(bool serial_debug)
 {
   _serial_output = serial_debug;
   _server = NULL;
@@ -26,8 +26,8 @@ ESP8266HTTPUpdateServerTemplate<ServerType, ClientType>::ESP8266HTTPUpdateServer
   _authenticated = false;
 }
 
-template <typename ServerType, typename ClientType>
-void ESP8266HTTPUpdateServerTemplate<ServerType, ClientType>::setup(ESP8266WebServerTemplate<ServerType, ClientType> *server, const String& path, const String& username, const String& password)
+template <typename ServerType>
+void ESP8266HTTPUpdateServerTemplate<ServerType>::setup(ESP8266WebServerTemplate<ServerType> *server, const String& path, const String& username, const String& password)
 {
     _server = server;
     _username = username;
@@ -97,8 +97,8 @@ void ESP8266HTTPUpdateServerTemplate<ServerType, ClientType>::setup(ESP8266WebSe
     });
 }
 
-template <typename ServerType, typename ClientType>
-void ESP8266HTTPUpdateServerTemplate<ServerType, ClientType>::_setUpdaterError()
+template <typename ServerType>
+void ESP8266HTTPUpdateServerTemplate<ServerType>::_setUpdaterError()
 {
   if (_serial_output) Update.printError(Serial);
   StreamString str;

libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer.h

@@ -3,28 +3,28 @@
 
 #include <ESP8266WebServer.h>
 
-template <typename ServerType, typename ClientType>
+template <typename ServerType>
 class ESP8266HTTPUpdateServerTemplate
 {
   public:
     ESP8266HTTPUpdateServerTemplate(bool serial_debug=false);
 
-    void setup(ESP8266WebServerTemplate<ServerType, ClientType> *server)
+    void setup(ESP8266WebServerTemplate<ServerType> *server)
     {
       setup(server, emptyString, emptyString);
     }
 
-    void setup(ESP8266WebServerTemplate<ServerType, ClientType> *server, const String& path)
+    void setup(ESP8266WebServerTemplate<ServerType> *server, const String& path)
     {
       setup(server, path, emptyString, emptyString);
     }
 
-    void setup(ESP8266WebServerTemplate<ServerType, ClientType> *server, const String& username, const String& password)
+    void setup(ESP8266WebServerTemplate<ServerType> *server, const String& username, const String& password)
     {
       setup(server, "/update", username, password);
     }
 
-    void setup(ESP8266WebServerTemplate<ServerType, ClientType> *server, const String& path, const String& username, const String& password);
+    void setup(ESP8266WebServerTemplate<ServerType> *server, const String& path, const String& username, const String& password);
 
     void updateCredentials(const String& username, const String& password)
     {
@@ -37,7 +37,7 @@ class ESP8266HTTPUpdateServerTemplate
 
   private:
     bool _serial_output;
-    ESP8266WebServerTemplate<ServerType, ClientType> *_server;
+    ESP8266WebServerTemplate<ServerType> *_server;
     String _username;
     String _password;
     bool _authenticated;
@@ -47,14 +47,14 @@ class ESP8266HTTPUpdateServerTemplate
 #include "ESP8266HTTPUpdateServer-impl.h"
 
 
-using ESP8266HTTPUpdateServer = ESP8266HTTPUpdateServerTemplate<WiFiServer, WiFiClient>;
+using ESP8266HTTPUpdateServer = ESP8266HTTPUpdateServerTemplate<WiFiServer>;
 
 namespace BearSSL {
-using ESP8266HTTPUpdateServerSecure = ESP8266HTTPUpdateServerTemplate<WiFiServerSecure, WiFiClientSecure>;
+using ESP8266HTTPUpdateServerSecure = ESP8266HTTPUpdateServerTemplate<WiFiServerSecure>;
 };
 
 namespace axTLS {
-using ESP8266HTTPUpdateServerSecure = ESP8266HTTPUpdateServerTemplate<WiFiServerSecure, WiFiClientSecure>;
+using ESP8266HTTPUpdateServerSecure = ESP8266HTTPUpdateServerTemplate<WiFiServerSecure>;
 };
 
 #endif