Removed uneeded function calls from public api

smasherprog · smasherprog · commit eba71dd1293f · 2017-05-28T20:59:11.000-07:00
diff --git a/include/WS_Lite.h b/include/WS_Lite.h
@@ -83,34 +83,22 @@ namespace SL {
         class WSListener {
             std::shared_ptr<WSListenerImpl> Impl_;
         public:
-            //when a connection is fully established. If onconnect is called, then a matching onDisconnection is guaranteed
-            void onConnection(std::function<void(WSocket&, const std::unordered_map<std::string, std::string>&)>& handle);
             //when a connection is fully established.  If onconnect is called, then a matching onDisconnection is guaranteed
             void onConnection(const std::function<void(WSocket&, const std::unordered_map<std::string, std::string>&)>& handle);
             //when a message has been received
-            void onMessage(std::function<void(WSocket&, const WSMessage&)>& handle);
-            //when a message has been received
             void onMessage(const std::function<void(WSocket&, const WSMessage&)>& handle);
             //when a socket is closed down for ANY reason. If onconnect is called, then a matching onDisconnection is guaranteed
-            void onDisconnection(std::function<void(WSocket&, unsigned short, const std::string&)>& handle);
-            //when a socket is closed down for ANY reason. If onconnect is called, then a matching onDisconnection is guaranteed
             void onDisconnection(const std::function<void(WSocket&, unsigned short, const std::string&)>& handle);
             //when a ping is received from a client
-            void onPing(std::function<void(WSocket&, const unsigned char *, size_t)>& handle);
-            //when a ping is received from a client
             void onPing(const std::function<void(WSocket&, const unsigned char *, size_t)>& handle);
             //when a pong is received from a client
-            void onPong(std::function<void(WSocket&, const unsigned char *, size_t)>& handle);
-            //when a pong is received from a client
             void onPong(const std::function<void(WSocket&, const unsigned char *, size_t)>& handle);
             //before onconnection is called, the conection is upgraded
-            void onHttpUpgrade(std::function<void(WSocket&)>& handle);
-            //before onconnection is called, the conection is upgraded
             void onHttpUpgrade(const std::function<void(WSocket&)>& handle);
             //the maximum payload size
             void set_MaxPayload(size_t bytes);
             //the maximum payload size
-            unsigned long long int get_MaxPayload();
+            size_t get_MaxPayload();
             //maximum time in seconds before a client is considered disconnected -- for reads
             void set_ReadTimeout(std::chrono::seconds seconds);
             //get the current read timeout in seconds
@@ -131,34 +119,22 @@ namespace SL {
         class WSClient {
             std::shared_ptr<WSClientImpl> Impl_;
         public:
-            //when a connection is fully established. If onconnect is called, then a matching onDisconnection is guaranteed
-            void onConnection(std::function<void(WSocket&, const std::unordered_map<std::string, std::string>&)>& handle);
             //when a connection is fully established.  If onconnect is called, then a matching onDisconnection is guaranteed
             void onConnection(const std::function<void(WSocket&, const std::unordered_map<std::string, std::string>&)>& handle);
             //when a message has been received
-            void onMessage(std::function<void(WSocket&, const WSMessage&)>& handle);
-            //when a message has been received
             void onMessage(const std::function<void(WSocket&, const WSMessage&)>& handle);
             //when a socket is closed down for ANY reason. If onconnect is called, then a matching onDisconnection is guaranteed
-            void onDisconnection(std::function<void(WSocket&, unsigned short, const std::string&)>& handle);
-            //when a socket is closed down for ANY reason. If onconnect is called, then a matching onDisconnection is guaranteed
             void onDisconnection(const std::function<void(WSocket&, unsigned short, const std::string&)>& handle);
             //when a ping is received from a client
-            void onPing(std::function<void(WSocket&, const unsigned char *, size_t)>& handle);
-            //when a ping is received from a client
             void onPing(const std::function<void(WSocket&, const unsigned char *, size_t)>& handle);
             //when a pong is received from a client
-            void onPong(std::function<void(WSocket&, const unsigned char *, size_t)>& handle);
-            //when a pong is received from a client
             void onPong(const std::function<void(WSocket&, const unsigned char *, size_t)>& handle);
             //before onconnection is called, the conection is upgraded
-            void onHttpUpgrade(std::function<void(WSocket&)>& handle);
-            //before onconnection is called, the conection is upgraded
             void onHttpUpgrade(const std::function<void(WSocket&)>& handle);
             //the maximum payload size
             void set_MaxPayload(size_t bytes);
             //the maximum payload size
-            unsigned long long int get_MaxPayload();
+            size_t get_MaxPayload();
             //maximum time in seconds before a client is considered disconnected -- for reads
             void set_ReadTimeout(std::chrono::seconds seconds);
             //get the current read timeout in seconds
diff --git a/src/internal/ClientImpl.cpp b/src/internal/ClientImpl.cpp
@@ -194,39 +194,21 @@ namespace SL {
             }
         }
 
-        void WSClient::onConnection(std::function<void(WSocket&, const std::unordered_map<std::string, std::string>&)>& handle) {
-            Impl_->onConnection = handle;
-        }
         void WSClient::onConnection(const std::function<void(WSocket&, const std::unordered_map<std::string, std::string>&)>& handle) {
             Impl_->onConnection = handle;
         }
-        void WSClient::onMessage(std::function<void(WSocket&, const WSMessage&)>& handle) {
-            Impl_->onMessage = handle;
-        }
         void WSClient::onMessage(const std::function<void(WSocket&, const WSMessage&)>& handle) {
             Impl_->onMessage = handle;
         }
-        void WSClient::onDisconnection(std::function<void(WSocket&, unsigned short, const std::string&)>& handle) {
-            Impl_->onDisconnection = handle;
-        }
         void WSClient::onDisconnection(const std::function<void(WSocket&, unsigned short, const std::string&)>& handle) {
             Impl_->onDisconnection = handle;
         }
-        void WSClient::onPing(std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {
-            Impl_->onPing = handle;
-        }
         void WSClient::onPing(const std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {
             Impl_->onPing = handle;
         }
-        void WSClient::onPong(std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {
-            Impl_->onPong = handle;
-        }
         void WSClient::onPong(const std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {
             Impl_->onPong = handle;
         }
-        void WSClient::onHttpUpgrade(std::function<void(WSocket&)>& handle) {
-            Impl_->onHttpUpgrade = handle;
-        }
         void WSClient::onHttpUpgrade(const std::function<void(WSocket&)>& handle) {
             Impl_->onHttpUpgrade = handle;
         }
@@ -245,7 +227,7 @@ namespace SL {
         void WSClient::set_MaxPayload(size_t bytes) {
             Impl_->MaxPayload = bytes;
         }
-        unsigned long long int WSClient::get_MaxPayload() {
+        size_t WSClient::get_MaxPayload() {
             return  Impl_->MaxPayload;
         }
 
diff --git a/src/internal/ListenerImpl.cpp b/src/internal/ListenerImpl.cpp
@@ -118,39 +118,21 @@ namespace SL {
                 Listen(Impl_, createsocket);
             }
         }
-        void WSListener::onConnection(std::function<void(WSocket&, const std::unordered_map<std::string, std::string>&)>& handle) {
-            Impl_->onConnection = handle;
-        }
         void WSListener::onConnection(const std::function<void(WSocket&, const std::unordered_map<std::string, std::string>&)>& handle) {
             Impl_->onConnection = handle;
         }
-        void WSListener::onMessage(std::function<void(WSocket&, const WSMessage&)>& handle) {
-            Impl_->onMessage = handle;
-        }
         void WSListener::onMessage(const std::function<void(WSocket&, const WSMessage&)>& handle) {
             Impl_->onMessage = handle;
         }
-        void WSListener::onDisconnection(std::function<void(WSocket&, unsigned short, const std::string&)>& handle) {
-            Impl_->onDisconnection = handle;
-        }
         void WSListener::onDisconnection(const std::function<void(WSocket&, unsigned short, const std::string&)>& handle) {
             Impl_->onDisconnection = handle;
         }
-        void WSListener::onPing(std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {
-            Impl_->onPing = handle;
-        }
         void WSListener::onPing(const std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {
             Impl_->onPing = handle;
         }
-        void WSListener::onPong(std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {
-            Impl_->onPong = handle;
-        }
         void WSListener::onPong(const std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {
             Impl_->onPong = handle;
         }
-        void WSListener::onHttpUpgrade(std::function<void(WSocket&)>& handle) {
-            Impl_->onHttpUpgrade = handle;
-        }
         void WSListener::onHttpUpgrade(const std::function<void(WSocket&)>& handle) {
             Impl_->onHttpUpgrade = handle;
         }
@@ -169,7 +151,7 @@ namespace SL {
         void WSListener::set_MaxPayload(size_t bytes) {
             Impl_->MaxPayload = bytes;
         }
-        unsigned long long int WSListener::get_MaxPayload() {
+        size_t WSListener::get_MaxPayload() {
             return  Impl_->MaxPayload;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -194,39 +194,21 @@ namespace SL {`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`
`197`		`- void WSClient::onConnection(std::function<void(WSocket&, const std::unordered_map<std::string, std::string>&)>& handle) {`
`198`		`- Impl_->onConnection = handle;`
`199`		`- }`
`200`	`197`	`void WSClient::onConnection(const std::function<void(WSocket&, const std::unordered_map<std::string, std::string>&)>& handle) {`
`201`	`198`	`Impl_->onConnection = handle;`
`202`	`199`	`}`
`203`		`- void WSClient::onMessage(std::function<void(WSocket&, const WSMessage&)>& handle) {`
`204`		`- Impl_->onMessage = handle;`
`205`		`- }`
`206`	`200`	`void WSClient::onMessage(const std::function<void(WSocket&, const WSMessage&)>& handle) {`
`207`	`201`	`Impl_->onMessage = handle;`
`208`	`202`	`}`
`209`		`- void WSClient::onDisconnection(std::function<void(WSocket&, unsigned short, const std::string&)>& handle) {`
`210`		`- Impl_->onDisconnection = handle;`
`211`		`- }`
`212`	`203`	`void WSClient::onDisconnection(const std::function<void(WSocket&, unsigned short, const std::string&)>& handle) {`
`213`	`204`	`Impl_->onDisconnection = handle;`
`214`	`205`	`}`
`215`		`- void WSClient::onPing(std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {`
`216`		`- Impl_->onPing = handle;`
`217`		`- }`
`218`	`206`	`void WSClient::onPing(const std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {`
`219`	`207`	`Impl_->onPing = handle;`
`220`	`208`	`}`
`221`		`- void WSClient::onPong(std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {`
`222`		`- Impl_->onPong = handle;`
`223`		`- }`
`224`	`209`	`void WSClient::onPong(const std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {`
`225`	`210`	`Impl_->onPong = handle;`
`226`	`211`	`}`
`227`		`- void WSClient::onHttpUpgrade(std::function<void(WSocket&)>& handle) {`
`228`		`- Impl_->onHttpUpgrade = handle;`
`229`		`- }`
`230`	`212`	`void WSClient::onHttpUpgrade(const std::function<void(WSocket&)>& handle) {`
`231`	`213`	`Impl_->onHttpUpgrade = handle;`
`232`	`214`	`}`
`@@ -245,7 +227,7 @@ namespace SL {`
`245`	`227`	`void WSClient::set_MaxPayload(size_t bytes) {`
`246`	`228`	`Impl_->MaxPayload = bytes;`
`247`	`229`	`}`
`248`		`- unsigned long long int WSClient::get_MaxPayload() {`
	`230`	`+ size_t WSClient::get_MaxPayload() {`
`249`	`231`	`return Impl_->MaxPayload;`
`250`	`232`	`}`
`251`	`233`
Original file line number	Diff line number	Diff line change
`@@ -118,39 +118,21 @@ namespace SL {`
`118`	`118`	`Listen(Impl_, createsocket);`
`119`	`119`	`}`
`120`	`120`	`}`
`121`		`- void WSListener::onConnection(std::function<void(WSocket&, const std::unordered_map<std::string, std::string>&)>& handle) {`
`122`		`- Impl_->onConnection = handle;`
`123`		`- }`
`124`	`121`	`void WSListener::onConnection(const std::function<void(WSocket&, const std::unordered_map<std::string, std::string>&)>& handle) {`
`125`	`122`	`Impl_->onConnection = handle;`
`126`	`123`	`}`
`127`		`- void WSListener::onMessage(std::function<void(WSocket&, const WSMessage&)>& handle) {`
`128`		`- Impl_->onMessage = handle;`
`129`		`- }`
`130`	`124`	`void WSListener::onMessage(const std::function<void(WSocket&, const WSMessage&)>& handle) {`
`131`	`125`	`Impl_->onMessage = handle;`
`132`	`126`	`}`
`133`		`- void WSListener::onDisconnection(std::function<void(WSocket&, unsigned short, const std::string&)>& handle) {`
`134`		`- Impl_->onDisconnection = handle;`
`135`		`- }`
`136`	`127`	`void WSListener::onDisconnection(const std::function<void(WSocket&, unsigned short, const std::string&)>& handle) {`
`137`	`128`	`Impl_->onDisconnection = handle;`
`138`	`129`	`}`
`139`		`- void WSListener::onPing(std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {`
`140`		`- Impl_->onPing = handle;`
`141`		`- }`
`142`	`130`	`void WSListener::onPing(const std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {`
`143`	`131`	`Impl_->onPing = handle;`
`144`	`132`	`}`
`145`		`- void WSListener::onPong(std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {`
`146`		`- Impl_->onPong = handle;`
`147`		`- }`
`148`	`133`	`void WSListener::onPong(const std::function<void(WSocket&, const unsigned char *, size_t)>& handle) {`
`149`	`134`	`Impl_->onPong = handle;`
`150`	`135`	`}`
`151`		`- void WSListener::onHttpUpgrade(std::function<void(WSocket&)>& handle) {`
`152`		`- Impl_->onHttpUpgrade = handle;`
`153`		`- }`
`154`	`136`	`void WSListener::onHttpUpgrade(const std::function<void(WSocket&)>& handle) {`
`155`	`137`	`Impl_->onHttpUpgrade = handle;`
`156`	`138`	`}`
`@@ -169,7 +151,7 @@ namespace SL {`
`169`	`151`	`void WSListener::set_MaxPayload(size_t bytes) {`
`170`	`152`	`Impl_->MaxPayload = bytes;`
`171`	`153`	`}`
`172`		`- unsigned long long int WSListener::get_MaxPayload() {`
	`154`	`+ size_t WSListener::get_MaxPayload() {`
`173`	`155`	`return Impl_->MaxPayload;`
`174`	`156`	`}`
`175`	`157`