mail[Wesnoth-commits] r44693 - in /trunk/src: ./ ana/api/ ana/apps/chat/ ana/src/ ana/test/


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by billybiset on July 26, 2010 - 09:37:
Author: billynux
Date: Mon Jul 26 09:37:39 2010
New Revision: 44693

URL: http://svn.gna.org/viewcvs/wesnoth?rev=44693&view=rev
Log:
Change a method name in ANA to make things more symmetrical. 
s/handle_message/handle_receive/. Suggestion by Crab_.

Modified:
    trunk/src/ana/api/ana.hpp
    trunk/src/ana/apps/chat/client.cpp
    trunk/src/ana/apps/chat/server.cpp
    trunk/src/ana/src/asio_listener.cpp
    trunk/src/ana/test/ana_client.cpp
    trunk/src/network_manager_ana.cpp
    trunk/src/network_manager_ana.hpp

Modified: trunk/src/ana/api/ana.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ana/api/ana.hpp?rev=44693&r1=44692&r2=44693&view=diff
==============================================================================
--- trunk/src/ana/api/ana.hpp (original)
+++ trunk/src/ana/api/ana.hpp Mon Jul 26 09:37:39 2010
@@ -135,7 +135,7 @@
          * \sa error_code
          * \sa net_id
          */
-        virtual void handle_message   (error_code, net_id, 
detail::read_buffer) = 0;
+        virtual void handle_receive   (error_code, net_id, 
detail::read_buffer) = 0;
 
         /**
          * Handle a disconnect event.

Modified: trunk/src/ana/apps/chat/client.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ana/apps/chat/client.cpp?rev=44693&r1=44692&r2=44693&view=diff
==============================================================================
--- trunk/src/ana/apps/chat/client.cpp (original)
+++ trunk/src/ana/apps/chat/client.cpp Mon Jul 26 09:37:39 2010
@@ -237,7 +237,7 @@
             continue_ = false;
         }
 
-        virtual void handle_message( ana::error_code error, net_id, 
ana::detail::read_buffer msg)
+        virtual void handle_receive( ana::error_code error, net_id, 
ana::detail::read_buffer msg)
         {
             if (! error)
             {

Modified: trunk/src/ana/apps/chat/server.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ana/apps/chat/server.cpp?rev=44693&r1=44692&r2=44693&view=diff
==============================================================================
--- trunk/src/ana/apps/chat/server.cpp (original)
+++ trunk/src/ana/apps/chat/server.cpp Mon Jul 26 09:37:39 2010
@@ -124,7 +124,7 @@
             }
         }
 
-        virtual void handle_message( ana::error_code          error,
+        virtual void handle_receive( ana::error_code          error,
                                      net_id                   client,
                                      ana::detail::read_buffer buffer)
         {

Modified: trunk/src/ana/src/asio_listener.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ana/src/asio_listener.cpp?rev=44693&r1=44692&r2=44693&view=diff
==============================================================================
--- trunk/src/ana/src/asio_listener.cpp (original)
+++ trunk/src/ana/src/asio_listener.cpp Mon Jul 26 09:37:39 2010
@@ -75,7 +75,7 @@
         else
         {
             log_conditional_receive( buf );
-            listener_->handle_message( ec, id(), buf );
+            listener_->handle_receive( ec, id(), buf );
             listen_one_message();
         }
     }
@@ -134,7 +134,7 @@
                 for (size_t i(0); i< ana::HEADER_LENGTH; ++i)
                     static_cast<char*>(read_buf->base())[i] = header[i];
 
-                listener_->handle_message( ec, id(), read_buf );
+                listener_->handle_receive( ec, id(), read_buf );
             }
         }
     }
@@ -166,7 +166,7 @@
 
             if ( accumulated == buffer->size() )
             {
-                listener_->handle_message( ec, id(), buffer );
+                listener_->handle_receive( ec, id(), buffer );
                 listen_one_message();
             }
             else
@@ -197,7 +197,7 @@
         {
             buf->resize( read_size );
             log_conditional_receive( buf );
-            listener_->handle_message( ec, id(), buf );
+            listener_->handle_receive( ec, id(), buf );
             listen_one_message();
         }
     }

Modified: trunk/src/ana/test/ana_client.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ana/test/ana_client.cpp?rev=44693&r1=44692&r2=44693&view=diff
==============================================================================
--- trunk/src/ana/test/ana_client.cpp (original)
+++ trunk/src/ana/test/ana_client.cpp Mon Jul 26 09:37:39 2010
@@ -187,7 +187,7 @@
             continue_ = false;
         }
 
-        virtual void handle_message( ana::error_code error, net_id, 
ana::detail::read_buffer msg)
+        virtual void handle_receive( ana::error_code error, net_id, 
ana::detail::read_buffer msg)
         {
             if (! error)
             {

Modified: trunk/src/network_manager_ana.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/network_manager_ana.cpp?rev=44693&r1=44692&r2=44693&view=diff
==============================================================================
--- trunk/src/network_manager_ana.cpp (original)
+++ trunk/src/network_manager_ana.cpp Mon Jul 26 09:37:39 2010
@@ -140,7 +140,7 @@
     mutex_.unlock();
 }
 
-void ana_receive_handler::handle_message(ana::error_code          error_c,
+void ana_receive_handler::handle_receive(ana::error_code          error_c,
                                          ana::net_id              client,
                                          ana::detail::read_buffer 
read_buffer)
 {
@@ -266,7 +266,7 @@
     mutex_.unlock();
 }
 
-void ana_multiple_receive_handler::handle_message(ana::error_code          
error_c,
+void ana_multiple_receive_handler::handle_receive(ana::error_code          
error_c,
                                                   ana::net_id              
id,
                                                   ana::detail::read_buffer 
read_buffer)
 {
@@ -1180,7 +1180,7 @@
         network::disconnect( client );
 }
 
-void ana_network_manager::handle_message( ana::error_code          error,
+void ana_network_manager::handle_receive( ana::error_code          error,
                                           ana::net_id              client,
                                           ana::detail::read_buffer buffer)
 {

Modified: trunk/src/network_manager_ana.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/network_manager_ana.hpp?rev=44693&r1=44692&r2=44693&view=diff
==============================================================================
--- trunk/src/network_manager_ana.hpp (original)
+++ trunk/src/network_manager_ana.hpp Mon Jul 26 09:37:39 2010
@@ -246,7 +246,7 @@
         }
 
     private:
-        virtual void handle_message   (ana::error_code, ana::net_id, 
ana::detail::read_buffer);
+        virtual void handle_receive   (ana::error_code, ana::net_id, 
ana::detail::read_buffer);
         virtual void handle_disconnect(ana::error_code, ana::net_id);
 
         void handle_timeout(ana::error_code error_code);
@@ -308,7 +308,7 @@
         }
 
     private:
-        virtual void handle_message   (ana::error_code, ana::net_id, 
ana::detail::read_buffer);
+        virtual void handle_receive   (ana::error_code, ana::net_id, 
ana::detail::read_buffer);
         virtual void handle_disconnect(ana::error_code, ana::net_id);
 
         void handle_timeout(ana::error_code error_code);
@@ -480,7 +480,7 @@
     private:
         virtual void handle_send(ana::error_code, ana::net_id, 
ana::operation_id);
 
-        virtual void handle_message( ana::error_code          error,
+        virtual void handle_receive( ana::error_code          error,
                                      ana::net_id              client,
                                      ana::detail::read_buffer buffer);
 




Related Messages


Powered by MHonArc, Updated Mon Jul 26 10:00:14 2010