Again some consting and int -> void.

diff --git a/src/ip_service.h b/src/ip_service.h
index ee0742a..6ed211c 100644 (file)
--- a/src/ip_service.h
+++ b/src/ip_service.h
@@ -30,7 +30,7 @@ public:
 
     virtual void write_to_socket(const std::string& data) = 0;
 
-    virtual int close() = 0;
+    virtual void close() = 0;
 };
 
 #endif

diff --git a/src/net_helper.cpp b/src/net_helper.cpp
index 0050b75..47a325f 100644 (file)
--- a/src/net_helper.cpp
+++ b/src/net_helper.cpp
@@ -69,7 +69,7 @@ int NetHelper::open_connection(const string& hostname, const string& port) const
  * @param data Data to send
  * @return 0 if all is fine, -1 on error.
  */
-int NetHelper::send_data(const std::string& data)
+int NetHelper::send_data(const std::string& data) const
 {
     try
     {
@@ -90,7 +90,7 @@ int NetHelper::send_data(const std::string& data)
  * Receive all available data from the peer.
  * @return The data received.
  */
-std::string NetHelper::receive_data()
+std::string NetHelper::receive_data() const
 {
     string received_data;
     try
@@ -112,7 +112,7 @@ std::string NetHelper::receive_data()
  * Close the active session.
  * @return 0 if all is fine, -1 on error
  */
-int NetHelper::close_connection()
+int NetHelper::close_connection() const
 {
     try
     {

diff --git a/src/net_helper.h b/src/net_helper.h
index 3658ac7..5d62439 100644 (file)
--- a/src/net_helper.h
+++ b/src/net_helper.h
@@ -36,11 +36,11 @@ public:
 
     int open_connection(const std::string& _host, const std::string& _port) const;
 
-    int send_data(const std::string& data);
+    int send_data(const std::string& data) const;
 
-    std::string receive_data();
+    std::string receive_data() const;
 
-    int close_connection();
+    int close_connection() const;
 
 };
 

diff --git a/src/service.cpp b/src/service.cpp
index d25e5bb..b7cbb60 100644 (file)
--- a/src/service.cpp
+++ b/src/service.cpp
@@ -147,7 +147,7 @@ void Service::set_last_updates(std::list<int> _last_updates)
  * Getter for member Lastupdated.
  * @return Value of member Lastupdated.
  */
-list<int> Service::get_last_updates()
+list<int> Service::get_last_updates() const
 {
     return LastUpdates;
 }

diff --git a/src/service.h b/src/service.h
index 338f33e..6fe6420 100644 (file)
--- a/src/service.h
+++ b/src/service.h
@@ -92,7 +92,7 @@ public:
     std::string get_password() const;
 
     void set_last_updates(std::list<int> _last_updates);
-    std::list<int> get_last_updates();
+    std::list<int> get_last_updates() const;
 
     void set_actual_ip(const std::string& _actual_ip);
     std::string get_actual_ip() const;

diff --git a/src/tcp_service.cpp b/src/tcp_service.cpp
index 0c2d635..7a6e3d0 100644 (file)
--- a/src/tcp_service.cpp
+++ b/src/tcp_service.cpp
@@ -154,7 +154,7 @@ void TCPService::write_to_socket(const string& data) throw (boost::system::syste
  * Will close the session.
  * @return 0 if all is fine, throws boost::syste::system_error if something went wrong.
  */
-int TCPService::close() throw (boost::system::system_error)
+void TCPService::close() throw (boost::system::system_error)
 {
     boost::system::error_code error_code;
 
@@ -168,5 +168,5 @@ int TCPService::close() throw (boost::system::system_error)
     if ( error_code )
         throw boost::system::system_error(error_code);
 
-    return 0;
+    return;
 }

diff --git a/src/tcp_service.h b/src/tcp_service.h
index 135a6fa..27a29c1 100644 (file)
--- a/src/tcp_service.h
+++ b/src/tcp_service.h
@@ -43,7 +43,7 @@ public:
 
     void write_to_socket(const std::string& data) throw (boost::system::system_error);
 
-    int close() throw (boost::system::system_error);
+    void close() throw (boost::system::system_error);
 };
 
 #endif