X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Foam%2FConfiguration.cpp;h=d7c5bb3833d9e2508ac3dc20f8bbc7618c462c23;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=9b90e32d33d6977c7e4c328c6089a313d04327cf;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git

diff --git a/source/core/oam/Configuration.cpp b/source/core/oam/Configuration.cpp
index 9b90e32..d7c5bb3 100644
--- a/source/core/oam/Configuration.cpp
+++ b/source/core/oam/Configuration.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// http://redmine.teslayout.com/projects/anna-suite
-//
-// 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 the copyright holder 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 //
 
 
 #include <anna/core/tracing/Logger.hpp>
@@ -67,7 +39,7 @@ anna::oam::Configuration::Configuration() {
 //------------------------------------------------------------------------------
 //-------------------------------------- Configuration::setAlarmTextDelimiters()
 //------------------------------------------------------------------------------
-void anna::oam::Configuration::setAlarmTextDelimiters(const char zS, const std::string & psL, const std::string & psS, const std::string & psR) throw() {
+void anna::oam::Configuration::setAlarmTextDelimiters(const char zS, const std::string & psL, const std::string & psS, const std::string & psR) {
   a_alarm_text_delimiter_zS = zS;
   a_alarm_text_delimiter_psL = psL;
   a_alarm_text_delimiter_psS = psS;
@@ -78,7 +50,7 @@ void anna::oam::Configuration::setAlarmTextDelimiters(const char zS, const std::
 //------------------------------------------------------------------------------
 //-------------------------------------- Configuration::getAlarmTextDelimiters()
 //------------------------------------------------------------------------------
-void anna::oam::Configuration::getAlarmTextDelimiters(char & zS, std::string & psL, std::string & psS, std::string & psR) const throw() {
+void anna::oam::Configuration::getAlarmTextDelimiters(char & zS, std::string & psL, std::string & psS, std::string & psR) const {
   zS = a_alarm_text_delimiter_zS;
   psL = a_alarm_text_delimiter_psL;
   psS = a_alarm_text_delimiter_psS;
@@ -89,7 +61,7 @@ void anna::oam::Configuration::getAlarmTextDelimiters(char & zS, std::string & p
 //------------------------------------------------------------------------------
 //----------------------------------------- Configuration::enableAlarmsPreffix()
 //------------------------------------------------------------------------------
-void anna::oam::Configuration::enableAlarmsPreffix(void) throw() {
+void anna::oam::Configuration::enableAlarmsPreffix(void) {
   a_alarms_preffix_enabled = true;
   LOGDEBUG(anna::Logger::debug("Alarm preffix global components SHOWN", ANNA_FILE_LOCATION));
 }
@@ -98,7 +70,7 @@ void anna::oam::Configuration::enableAlarmsPreffix(void) throw() {
 //------------------------------------------------------------------------------
 //------------------------------------------ Configuration::enableAlarmsSuffix()
 //------------------------------------------------------------------------------
-void anna::oam::Configuration::enableAlarmsSuffix(void) throw() {
+void anna::oam::Configuration::enableAlarmsSuffix(void) {
   a_alarms_suffix_enabled = true;
   LOGDEBUG(anna::Logger::debug("Alarm suffix global components SHOWN", ANNA_FILE_LOCATION));
 }
@@ -107,7 +79,7 @@ void anna::oam::Configuration::enableAlarmsSuffix(void) throw() {
 //------------------------------------------------------------------------------
 //---------------------------------------- Configuration::disableAlarmsPreffix()
 //------------------------------------------------------------------------------
-void anna::oam::Configuration::disableAlarmsPreffix(void) throw() {
+void anna::oam::Configuration::disableAlarmsPreffix(void) {
   a_alarms_preffix_enabled = false;
   LOGDEBUG(anna::Logger::debug("Alarm preffix global components HIDDEN", ANNA_FILE_LOCATION));
 }
@@ -116,7 +88,7 @@ void anna::oam::Configuration::disableAlarmsPreffix(void) throw() {
 //------------------------------------------------------------------------------
 //----------------------------------------- Configuration::disableAlarmsSuffix()
 //------------------------------------------------------------------------------
-void anna::oam::Configuration::disableAlarmsSuffix(void) throw() {
+void anna::oam::Configuration::disableAlarmsSuffix(void) {
   a_alarms_suffix_enabled = false;
   LOGDEBUG(anna::Logger::debug("Alarm suffix global components HIDDEN", ANNA_FILE_LOCATION));
 }
@@ -125,7 +97,7 @@ void anna::oam::Configuration::disableAlarmsSuffix(void) throw() {
 //------------------------------------------------------------------------------
 //------------------------------------------------------- Configuration::asXML()
 //------------------------------------------------------------------------------
-anna::xml::Node* anna::oam::Configuration::asXML(anna::xml::Node* parent) const throw() {
+anna::xml::Node* anna::oam::Configuration::asXML(anna::xml::Node* parent) const {
   anna::xml::Node* result = parent->createChild("anna.oam.Configuration");
   std::vector<std::string>::const_iterator it, it_min, it_max;
   result->createAttribute("AlarmsPreffix", a_alarms_preffix_enabled ? "Enabled" : "Disabled");