X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Ftimex%2FTimeEvent.hpp;h=d399420e1acf8406c8c37e50c4d7669f102db356;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=e87fa6294a478c23a83cdab841047c1fa3a612ff;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git

diff --git a/include/anna/timex/TimeEvent.hpp b/include/anna/timex/TimeEvent.hpp
index e87fa62..d399420 100644
--- a/include/anna/timex/TimeEvent.hpp
+++ b/include/anna/timex/TimeEvent.hpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness 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 //
 
 
 #ifndef anna_timex_TimeEvent_hpp
@@ -72,13 +44,13 @@ public:
      Devuelve el identificador de este evento.
      \return El identificador de este evento.
   */
-  Id getId() const throw() { return a_id; }
+  Id getId() const { return a_id; }
 
   /**
      Devuelve la duracion maxima a este evento indicada en milisegundos.
      @return La duracion maxima de este evento indicada en milisegundos.
   */
-  const Millisecond & getTimeout() const throw() { return a_timeout; }
+  const Millisecond & getTimeout() const { return a_timeout; }
 
   /**
      Devuelve la instancia del objeto encargado de gestionar el espacio asociado a
@@ -86,7 +58,7 @@ public:
      \return La instancia del objeto encargado de gestionar el espacio asociado a
      esta instancia.
   */
-  const TimeEventObserver* getObserver() const throw() { return a_observer; }
+  const TimeEventObserver* getObserver() const { return a_observer; }
 
   /**
      Establece el identificador de este evento de tiempo.
@@ -94,13 +66,13 @@ public:
 
      \warning Exclusivamente uso interno.
   */
-  void setId(const Id id) throw() { a_id = id; }
+  void setId(const Id id) { a_id = id; }
 
   /**
      Establece la duracion de este evento indicada en milisegundos.
      \param timeout Establece la duracion de este evento.
   */
-  void setTimeout(const Millisecond & timeout) throw() { a_timeout = timeout; }
+  void setTimeout(const Millisecond & timeout) { a_timeout = timeout; }
 
   /**
      Establece la instancia de objeto encargado de gestionar el espacio asociado a esta
@@ -110,19 +82,19 @@ public:
      \param observer Instancia del objeto encargada de gestional el espacio asignado a esta
      instancia.
   */
-  void setObserver(TimeEventObserver* observer) throw() { a_observer = observer; }
+  void setObserver(TimeEventObserver* observer) { a_observer = observer; }
 
   /**
      Devuelve el estado de activacin de este evento de tiempo.
      @return \em false si el evento esta activado o \em false en otro caso.
   */
-  bool isActive() const throw() { return (a_controller != NULL); }
+  bool isActive() const { return (a_controller != NULL); }
 
   /**
      Devuelve una cadena con la informacion sobre este evento.
      \return Una cadena con la informacion sobre este evento.
   */
-  virtual std::string asString() const throw();
+  virtual std::string asString() const ;
 
 protected:
   /**
@@ -155,7 +127,7 @@ protected:
 
      @param timeController Controlador de tiempo asociado al evento que esta expirando.
   */
-  virtual void expire(Engine* timeController) throw(RuntimeException) = 0;
+  virtual void expire(Engine* timeController) noexcept(false) = 0;
 
   /**
      metodo que debemos re-escribir para particularizar el comportamiento de nuestra clase cuando
@@ -165,7 +137,7 @@ protected:
 
      Las acciones realizadas nunca deber�n generar nuevos eventos. Por defecto no hace nada.
   */
-  virtual void stop() throw(RuntimeException) {;}
+  virtual void stop() noexcept(false) {;}
 
 private:
   Id a_id;