X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Futil%2FConfiguration.cpp;h=0cdb8fcd32f9faf3a82b1694e31865fcdf2d67d7;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=10d5087374aacee28138fb9018e67ecb292efb2f;hpb=bebea4009ed5a273fbf9ed3644a2140a8f477f99;p=anna.git

diff --git a/source/core/util/Configuration.cpp b/source/core/util/Configuration.cpp
index 10d5087..0cdb8fc 100644
--- a/source/core/util/Configuration.cpp
+++ b/source/core/util/Configuration.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 //
 
 
 #include <stdio.h>
@@ -51,7 +23,7 @@ using namespace anna;
 const char* Configuration::defaultSection = "@global@";
 
 void Configuration::load(const char* configFile)
-throw(RuntimeException) {
+noexcept(false) {
   LOGMETHOD(TraceMethod tm("Configuration", "load", ANNA_FILE_LOCATION));
   char buffer [2048];
   FILE* file;
@@ -88,13 +60,13 @@ throw(RuntimeException) {
 }
 
 bool Configuration::exists(const char* sectionName, const char* variableName) const
-throw() {
+{
   const VariableEx* var = find(string(sectionName), variableName);
   return (var == NULL) ? false : !var->isNull();
 }
 
 void Configuration::setDefaultValue(const char* sectionName, const char* variableName, const char* defaultValue)
-throw(RuntimeException) {
+noexcept(false) {
   string section(sectionName);
   VariableEx* var = find(section, variableName);
 
@@ -114,7 +86,7 @@ throw(RuntimeException) {
 }
 
 const char* Configuration::getValue(const char* sectionName, const char* variableName, const bool strict) const
-throw(RuntimeException) {
+noexcept(false) {
   const VariableEx* variable = find(string(sectionName), variableName);
   const char* result(NULL);
 
@@ -136,7 +108,7 @@ throw(RuntimeException) {
 }
 
 int Configuration::getIntegerValue(const char* sectionName, const char* variableName, const bool strict) const
-throw(RuntimeException) {
+noexcept(false) {
   return atoi(getValue(sectionName, variableName, strict));
 }
 
@@ -179,7 +151,7 @@ bool Configuration::processSection(const int nline, char* buffer, string& curren
 }
 
 void Configuration::processVariable(const int nline, char* buffer, const string& currentSection)
-throw(RuntimeException) {
+noexcept(false) {
   char* variableName;
   char* value;
   char* aux;
@@ -225,7 +197,7 @@ throw(RuntimeException) {
 }
 
 Configuration::VariableEx* Configuration::createVariable(const string& section, const char* variableName)
-throw() {
+{
   map <string, VariableEx::Vector*>::iterator isection(a_sections.find(section));
   VariableEx* result;
   VariableEx::Vector* variables;
@@ -242,7 +214,7 @@ throw() {
 }
 
 Configuration::VariableEx* Configuration::find(const string& section, const char* variableName)
-throw() {
+{
   VariableEx* result(NULL);
   map <string, VariableEx::Vector*>::iterator isection(a_sections.find(section));
 
@@ -262,7 +234,7 @@ throw() {
 }
 
 void Configuration::removeAll()
-throw() {
+{
   map <string, VariableEx::Vector*>::iterator ii(a_sections.begin());
   map <string, VariableEx::Vector*>::iterator end(a_sections.end());
   VariableEx::Vector::iterator vv, maxvv;