diff --git a/pyext/GXmlComment.i b/pyext/GXmlComment.i index 24a6aec..e6d699f 100644 --- a/pyext/GXmlComment.i +++ b/pyext/GXmlComment.i @@ -1,7 +1,7 @@ /*************************************************************************** * GXmlComment.i - XML comment node class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2011 by Jurgen Knodlseder * + * copyright (C) 2010-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,15 +21,17 @@ /** * @file GXmlComment.i * @brief XML comment class Python interface definition - * @author J. Knodlseder + * @author Juergen Knoedlseder */ %{ /* Put headers and other declarations here that are needed for compilation */ #include "GXmlComment.hpp" #include "GTools.hpp" -#include "GException.hpp" %} +/* __ Includes ___________________________________________________________ */ +%include "GTypemaps.i" + /***********************************************************************//** * @class GXmlComment @@ -68,17 +70,3 @@ public: return tochar(self->print()); } }; - - -/***********************************************************************//** - * @brief GXmlComment type casts - ***************************************************************************/ -%inline %{ - GXmlComment* cast_GXmlComment(GXmlNode* node) { - if (node->type() != GXmlNode::NT_COMMENT) - throw GException::xml_bad_node_type("cast_GXmlComment(GXmlNode*)", - "", - "Expecting GXmlComment node."); - return dynamic_cast(node); - } -%}; diff --git a/pyext/GXmlDocument.i b/pyext/GXmlDocument.i index 4a3bd76..aeeaad7 100644 --- a/pyext/GXmlDocument.i +++ b/pyext/GXmlDocument.i @@ -1,7 +1,7 @@ /*************************************************************************** * GXmlDocument.i - XML document node class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2011 by Jurgen Knodlseder * + * copyright (C) 2010-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,15 +21,17 @@ /** * @file GXmlDocument.i * @brief XML document class Python interface definition - * @author J. Knodlseder + * @author Juergen Knoedlseder */ %{ /* Put headers and other declarations here that are needed for compilation */ #include "GXmlDocument.hpp" #include "GTools.hpp" -#include "GException.hpp" %} +/* __ Includes ___________________________________________________________ */ +%include "GTypemaps.i" + /***********************************************************************//** * @class GXmlDocument @@ -71,17 +73,3 @@ public: return tochar(self->print()); } }; - - -/***********************************************************************//** - * @brief GXmlDocument type casts - ***************************************************************************/ -%inline %{ - GXmlDocument* cast_GXmlDocument(GXmlNode* node) { - if (node->type() != GXmlNode::NT_DOCUMENT) - throw GException::xml_bad_node_type("cast_GXmlDocument(GXmlNode*)", - "", - "Expecting GXmlDocument node."); - return dynamic_cast(node); - } -%}; diff --git a/pyext/GXmlElement.i b/pyext/GXmlElement.i index 83e9cd9..da1cfde 100644 --- a/pyext/GXmlElement.i +++ b/pyext/GXmlElement.i @@ -1,7 +1,7 @@ /*************************************************************************** * GXmlElement.i - XML element node class definition * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2011 by Jurgen Knodlseder * + * copyright (C) 2010-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,15 +21,17 @@ /** * @file GXmlElement.i * @brief XML element node class Python interface definition - * @author J. Knodlseder + * @author Juergen Knoedlseder */ %{ /* Put headers and other declarations here that are needed for compilation */ #include "GXmlElement.hpp" #include "GTools.hpp" -#include "GException.hpp" %} +/* __ Includes ___________________________________________________________ */ +%include "GTypemaps.i" + /***********************************************************************//** * @class GXmlElement @@ -71,17 +73,3 @@ public: return tochar(self->print()); } }; - - -/***********************************************************************//** - * @brief GXmlElement type casts - ***************************************************************************/ -%inline %{ - GXmlElement* cast_GXmlElement(GXmlNode* node) { - if (node->type() != GXmlNode::NT_ELEMENT) - throw GException::xml_bad_node_type("cast_GXmlElement(GXmlNode*)", - "", - "Expecting GXmlElement node."); - return dynamic_cast(node); - } -%}; diff --git a/pyext/GXmlNode.i b/pyext/GXmlNode.i index 8cf9ed4..da0b08d 100644 --- a/pyext/GXmlNode.i +++ b/pyext/GXmlNode.i @@ -29,6 +29,9 @@ #include "GTools.hpp" %} +/* __ Includes ___________________________________________________________ */ +%include "GTypemaps.i" + /***********************************************************************//** * @class GXmlNode diff --git a/pyext/GXmlPI.i b/pyext/GXmlPI.i index f95a0b7..8ccbaa7 100644 --- a/pyext/GXmlPI.i +++ b/pyext/GXmlPI.i @@ -1,7 +1,7 @@ /*************************************************************************** * GXmlPI.i - XML PI node class definition * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2011 by Jurgen Knodlseder * + * copyright (C) 2010-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,15 +21,17 @@ /** * @file GXmlPI.i * @brief XML PI node class Python interface definition - * @author J. Knodlseder + * @author Juergen Knoedlseder */ %{ /* Put headers and other declarations here that are needed for compilation */ #include "GXmlPI.hpp" #include "GTools.hpp" -#include "GException.hpp" %} +/* __ Includes ___________________________________________________________ */ +%include "GTypemaps.i" + /***********************************************************************//** * @class GXmlPI @@ -63,17 +65,3 @@ public: return tochar(self->print()); } }; - - -/***********************************************************************//** - * @brief GXmlPI type casts - ***************************************************************************/ -%inline %{ - GXmlPI* cast_GXmlPI(GXmlNode* node) { - if (node->type() != GXmlNode::NT_PI) - throw GException::xml_bad_node_type("cast_GXmlPI(GXmlNode*)", - "", - "Expecting GXmlPI node."); - return dynamic_cast(node); - } -%}; diff --git a/pyext/GXmlText.i b/pyext/GXmlText.i index 9098a78..21de998 100644 --- a/pyext/GXmlText.i +++ b/pyext/GXmlText.i @@ -1,7 +1,7 @@ /*************************************************************************** * GXmlText.i - XML text node class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2011 by Jurgen Knodlseder * + * copyright (C) 2010-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,15 +21,17 @@ /** * @file GXmlText.i * @brief XML text node class Python interface definition - * @author J. Knodlseder + * @author Juergen Knoedlseder */ %{ /* Put headers and other declarations here that are needed for compilation */ #include "GXmlText.hpp" #include "GTools.hpp" -#include "GException.hpp" %} +/* __ Includes ___________________________________________________________ */ +%include "GTypemaps.i" + /***********************************************************************//** * @class GXmlText @@ -63,17 +65,3 @@ public: return tochar(self->print()); } }; - - -/***********************************************************************//** - * @brief GXmlText type casts - ***************************************************************************/ -%inline %{ - GXmlText* cast_GXmlText(GXmlNode* node) { - if (node->type() != GXmlNode::NT_TEXT) - throw GException::xml_bad_node_type("cast_GXmlText(GXmlNode*)", - "", - "Expecting GXmlText node."); - return dynamic_cast(node); - } -%};