X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fxml%2FDocumentFile.hpp;h=5655352b339a879e6b20bc0251b9956857835001;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=195f0c901e397613693668a15fe60f7c63be2fc2;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git

diff --git a/include/anna/xml/DocumentFile.hpp b/include/anna/xml/DocumentFile.hpp
index 195f0c9..5655352 100644
--- a/include/anna/xml/DocumentFile.hpp
+++ b/include/anna/xml/DocumentFile.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_xml_DocumentFile_hpp
@@ -60,20 +32,20 @@ public:
   *
   * @return XML document root node
   */
-  const Node * getRootNode() const throw() { return a_rootNode; }
+  const Node * getRootNode() const { return a_rootNode; }
 
   /**
      Devuelve el contenido asociado al documento XML.
      \return El contenido asociado al documento XML.
   */
-  const anna::DataBlock& getContent() const throw(RuntimeException);
+  const anna::DataBlock& getContent() const noexcept(false);
 
   /**
    * Parse xml document and return root node
    * \return Root node
    * \warning Need previous initialization
    */
-  const Node* parse() throw(RuntimeException) { return (a_rootNode = Document::parse()); }
+  const Node* parse() noexcept(false) { return (a_rootNode = Document::parse()); }
 
   /**
    * Parse xml document with dtd and return root node
@@ -81,14 +53,14 @@ public:
    * \return Root node
    * \warning Need previous initialization
    */
-  const Node* parse(const DTD& dtd) throw(RuntimeException) { return (a_rootNode = Document::parse(dtd)); }
+  const Node* parse(const DTD& dtd) noexcept(false) { return (a_rootNode = Document::parse(dtd)); }
 
   /**
    * XML representation from loaded document
    * \return XML string
    * \warning Need previous initialization and parsing
    */
-  std::string asXmlString() const throw() { Compiler c; return (c.apply(a_rootNode)); }
+  std::string asXmlString() const { Compiler c; return (c.apply(a_rootNode)); }
 
 
 protected:
@@ -99,8 +71,8 @@ protected:
 
 private:
   const anna::xml::Node * a_rootNode;
-  virtual _xmlDoc* do_initialize(const char* filename) throw(RuntimeException);
-  virtual _xmlDoc* do_initialize(const anna::DataBlock&) throw(RuntimeException);
+  virtual _xmlDoc* do_initialize(const char* filename) noexcept(false);
+  virtual _xmlDoc* do_initialize(const anna::DataBlock&) noexcept(false);
 };
 
 }