X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fxml%2FDocument.cpp;h=27695f6b13efef48e159b3d5e55fea6c5d1cc91e;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=19743ca7386df7e43a5f41a82bb99e2f142438e1;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git diff --git a/source/xml/Document.cpp b/source/xml/Document.cpp index 19743ca..27695f6 100644 --- a/source/xml/Document.cpp +++ b/source/xml/Document.cpp @@ -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 // #include @@ -69,7 +41,7 @@ Document::~Document() { } void Document::initialize(const char* content) -throw(RuntimeException) { +noexcept(false) { LOGMETHOD(TraceMethod tf("anna::xml::Document", "initialize (char*)", ANNA_FILE_LOCATION)); clear(); a_handle = do_initialize(content); @@ -78,7 +50,7 @@ throw(RuntimeException) { } void Document::initialize(const DataBlock& content) -throw(RuntimeException) { +noexcept(false) { LOGMETHOD(TraceMethod tf("anna::xml::Document", "initialize (DataBlock)", ANNA_FILE_LOCATION)); clear(); a_handle = do_initialize(content); @@ -87,7 +59,7 @@ throw(RuntimeException) { } const xml::Node* Document::parse() -throw(RuntimeException) { +noexcept(false) { if(a_parser == NULL) a_parser = new Parser; @@ -95,7 +67,7 @@ throw(RuntimeException) { } const xml::Node* Document::parse(const xml::DTD& dtd) -throw(RuntimeException) { +noexcept(false) { if(a_parser == NULL) a_parser = new Parser; @@ -103,7 +75,7 @@ throw(RuntimeException) { } void Document::clear() -throw() { +{ if(a_handle != NULL) { xmlFreeDoc(a_handle); a_handle = NULL; @@ -120,17 +92,17 @@ throw() { } const char* Document::getEncoding() const -throw() { +{ return (a_encoding == NULL) ? NULL : ((a_encoding->empty() == true) ? NULL : a_encoding->c_str()); } const char* Document::getVersion() const -throw() { +{ return (a_version == NULL) ? NULL : ((a_version->empty() == true) ? NULL : a_version->c_str()); } const char* Document::getContentAsCString() const -throw(RuntimeException) { +noexcept(false) { const char* result = NULL; if(a_contentIsCString == false) { @@ -149,7 +121,7 @@ throw(RuntimeException) { } void Document::setEncoding(const char* encoding) -throw() { +{ if(a_encoding == NULL) { if(encoding != NULL) a_encoding = new string(encoding); @@ -162,7 +134,7 @@ throw() { } void Document::setVersion(const char* version) -throw() { +{ if(a_version == NULL) { if(version != NULL) a_version = new string(version);