X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fhttp%2FkClient%2Fmain.cpp;h=082edce25b78037ae3d53ed04b61ddcda185fdde;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=1f6713898061a07a0d2629e5024379c7749ebc60;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/example/http/kClient/main.cpp b/example/http/kClient/main.cpp
index 1f67138..082edce 100644
--- a/example/http/kClient/main.cpp
+++ b/example/http/kClient/main.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not 'N' Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// https://bitbucket.org/testillano/anna
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
 
 
 /*
@@ -66,8 +38,8 @@ private:
    http::Response a_httpResponse;
    test::Response a_testResponse;
 
-   void evRequest (ClientSocket&, const http::Request&) throw (RuntimeException) {;}
-   void evResponse (ClientSocket&, const http::Response&) throw (RuntimeException);
+   void evRequest (ClientSocket&, const http::Request&) noexcept(false) {;}
+   void evResponse (ClientSocket&, const http::Response&) noexcept(false);
 };
 
 class MyCommunicator : public Communicator {
@@ -83,24 +55,24 @@ private:
    http::Request a_httpRequest;
    test::Request a_testRequest;
 
-   void eventReceiveMessage (ClientSocket &, const Message&) throw (RuntimeException);
-   void eventUser (const char* id, const void* context) throw ();
+   void eventReceiveMessage (ClientSocket &, const Message&) noexcept(false);
+   void eventUser (const char* id, const void* context) ;
 };
 
 class HTTPKClient : public anna::comm::Application {
 public:
    HTTPKClient ();
 
-   Server* getServer () const throw () { return a_server; }
-   const test::Menu& getMenu () const throw () { return a_menu; }
+   Server* getServer () const { return a_server; }
+   const test::Menu& getMenu () const { return a_menu; }
 
 private:
    MyCommunicator a_communicator;
    test::Menu a_menu;
    Server* a_server;
 
-   void initialize () throw (RuntimeException);
-   void run () throw (RuntimeException);
+   void initialize () noexcept(false);
+   void run () noexcept(false);
 };
 
 using namespace std;
@@ -140,7 +112,7 @@ HTTPKClient::HTTPKClient () :
 }
 
 void HTTPKClient::initialize () 
-   throw (RuntimeException)
+   noexcept(false)
 {
    CommandLine& cl (CommandLine::instantiate ());
 
@@ -154,14 +126,14 @@ void HTTPKClient::initialize ()
 }
 
 void HTTPKClient::run ()
-   throw (RuntimeException)
+   noexcept(false)
 {
    a_menu.paint ();
    a_communicator.accept ();
 }
 
 void MyCommunicator::eventReceiveMessage (ClientSocket& clientSocket, const Message& message)
-   throw (RuntimeException)
+   noexcept(false)
 {
    LOGMETHOD (TraceMethod tm ("MyCommunicator", "eventReceiveMessage", ANNA_FILE_LOCATION));
 
@@ -176,7 +148,7 @@ void MyCommunicator::eventReceiveMessage (ClientSocket& clientSocket, const Mess
 // notifica al comunicador mediante un evento de usuario.
 //-----------------------------------------------------------------------------------------
 void MyCommunicator::eventUser (const char* id, const void* context)
-   throw ()
+   
 {
    LOGMETHOD (TraceMethod tm ("MyCommunicator", "eventUser", ANNA_FILE_LOCATION));
 
@@ -201,7 +173,7 @@ void MyCommunicator::eventUser (const char* id, const void* context)
 }
 
 void MyHandler::evResponse (ClientSocket& clientSocket, const http::Response& response)
-   throw (RuntimeException)
+   noexcept(false)
 {
    if (response.getStatusCode () == 200) {
       a_testResponse.decode (response.getBody ());