From ec8154a990b618672fc383c9450f29898c4e2a81 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Fri, 12 Apr 2013 22:17:19 +0200 Subject: [PATCH] Remove __str__() extension as it is now implemented in the base class. --- inst/cta/pyext/GCTAAeff.i | 5 +---- inst/cta/pyext/GCTAAeff2D.i | 3 --- inst/cta/pyext/GCTAAeffArf.i | 3 --- inst/cta/pyext/GCTAAeffPerfTable.i | 5 +---- inst/cta/pyext/GCTADir.i | 11 ++++------- inst/cta/pyext/GCTAEdisp.i | 9 +++------ inst/cta/pyext/GCTAModelRadial.i | 11 ++++------- inst/cta/pyext/GCTAModelRadialAcceptance.i | 6 +++--- inst/cta/pyext/GCTAModelRadialGauss.i | 9 +++------ inst/cta/pyext/GCTAModelRadialPolynom.i | 9 +++------ inst/cta/pyext/GCTAModelRadialProfile.i | 7 ++----- inst/cta/pyext/GCTAModelRadialRegistry.i | 9 +++------ inst/cta/pyext/GCTAPsf.i | 3 --- inst/cta/pyext/GCTAPsf2D.i | 3 --- inst/cta/pyext/GCTAPsfPerfTable.i | 3 --- inst/cta/pyext/GCTAPsfVector.i | 3 --- inst/cta/pyext/GCTAResponseTable.i | 5 +---- inst/lat/pyext/GLATAeff.i | 7 ++----- inst/lat/pyext/GLATEdisp.i | 7 ++----- inst/lat/pyext/GLATEventAtom.i | 7 ++----- inst/lat/pyext/GLATEventList.i | 7 ++----- inst/lat/pyext/GLATLtCube.i | 11 ++++------- inst/lat/pyext/GLATMeanPsf.i | 11 ++++------- inst/lat/pyext/GLATPointing.i | 7 ++----- inst/lat/pyext/GLATPsf.i | 9 +++------ pyext/GApplication.i | 2 +- pyext/GCaldb.i | 6 +++--- pyext/GCsv.i | 7 ++----- pyext/GDerivative.i | 5 +---- pyext/GEbounds.i | 3 --- pyext/GEnergy.i | 5 +---- pyext/GEvent.i | 9 +++------ pyext/GEvents.i | 7 ++----- pyext/GFits.i | 7 ++----- pyext/GFitsAsciiTable.i | 5 +---- pyext/GFitsBinTable.i | 5 +---- pyext/GFitsHDU.i | 7 ++----- pyext/GFitsHeader.i | 11 ++++------- pyext/GFitsHeaderCard.i | 7 ++----- pyext/GFitsImage.i | 7 ++----- pyext/GFitsTable.i | 7 ++----- pyext/GFitsTableCol.i | 11 ++++------- pyext/GGti.i | 3 --- pyext/GInstDir.i | 7 ++----- pyext/GIntegral.i | 7 ++----- pyext/GLog.i | 14 +++++++------- pyext/GMatrix.i | 3 --- pyext/GMatrixSparse.i | 3 --- pyext/GMatrixSymmetric.i | 3 --- pyext/GModel.i | 3 --- pyext/GModelPar.i | 3 --- pyext/GModelRegistry.i | 3 --- pyext/GModelSpatial.i | 3 --- pyext/GModelSpatialRegistry.i | 4 ++-- pyext/GModelSpectral.i | 5 +---- pyext/GModelSpectralRegistry.i | 4 ++-- pyext/GModelTemporal.i | 5 +---- pyext/GModelTemporalRegistry.i | 5 +---- pyext/GNodeArray.i | 7 ++----- pyext/GObservation.i | 9 +++------ pyext/GObservationRegistry.i | 5 +---- pyext/GObservations.i | 3 --- pyext/GOptimizer.i | 3 --- pyext/GPar.i | 8 ++++---- pyext/GPars.i | 6 +++--- pyext/GPhoton.i | 5 +---- pyext/GPhotons.i | 3 --- pyext/GPointing.i | 7 ++----- pyext/GRan.i | 5 +---- pyext/GResponse.i | 3 --- pyext/GRoi.i | 7 ++----- pyext/GSkyDir.i | 3 --- pyext/GSkyPixel.i | 7 ++----- pyext/GSkymap.i | 7 ++----- pyext/GSource.i | 3 --- pyext/GTestCase.i | 5 +---- pyext/GTestSuites.i | 5 +---- pyext/GTime.i | 9 +++------ pyext/GTimeReference.i | 5 +---- pyext/GTimes.i | 5 +---- pyext/GUrl.i | 5 ----- pyext/GVector.i | 3 --- pyext/GWcs.i | 7 ++----- pyext/GWcsRegistry.i | 5 +---- pyext/GXml.i | 3 --- pyext/GXmlAttribute.i | 3 --- pyext/GXmlComment.i | 3 --- pyext/GXmlDocument.i | 3 --- pyext/GXmlElement.i | 3 --- pyext/GXmlNode.i | 2 +- pyext/GXmlPI.i | 3 --- pyext/GXmlText.i | 3 --- 92 files changed, 134 insertions(+), 385 deletions(-) diff --git a/inst/cta/pyext/GCTAAeff.i b/inst/cta/pyext/GCTAAeff.i index 889d1df..9ea3164 100644 --- a/inst/cta/pyext/GCTAAeff.i +++ b/inst/cta/pyext/GCTAAeff.i @@ -1,7 +1,7 @@ /*************************************************************************** * GCTAAeff.i - CTA effective area base class * * ----------------------------------------------------------------------- * - * copyright (C) 2012 by Juergen Knoedlseder * + * copyright (C) 2012-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -63,7 +63,4 @@ public: * @brief GCTAAeff class extension ***************************************************************************/ %extend GCTAAeff { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/inst/cta/pyext/GCTAAeff2D.i b/inst/cta/pyext/GCTAAeff2D.i index 63f2cdd..2a30367 100644 --- a/inst/cta/pyext/GCTAAeff2D.i +++ b/inst/cta/pyext/GCTAAeff2D.i @@ -67,9 +67,6 @@ public: * @brief GCTAAeff2D class extension ***************************************************************************/ %extend GCTAAeff2D { - char *__str__() { - return tochar(self->print()); - } GCTAAeff2D copy() { return (*self); } diff --git a/inst/cta/pyext/GCTAAeffArf.i b/inst/cta/pyext/GCTAAeffArf.i index bba6b73..015f129 100644 --- a/inst/cta/pyext/GCTAAeffArf.i +++ b/inst/cta/pyext/GCTAAeffArf.i @@ -74,9 +74,6 @@ public: * @brief GCTAAeffArf class extension ***************************************************************************/ %extend GCTAAeffArf { - char *__str__() { - return tochar(self->print()); - } GCTAAeffArf copy() { return (*self); } diff --git a/inst/cta/pyext/GCTAAeffPerfTable.i b/inst/cta/pyext/GCTAAeffPerfTable.i index 60ad398..6bad1a9 100644 --- a/inst/cta/pyext/GCTAAeffPerfTable.i +++ b/inst/cta/pyext/GCTAAeffPerfTable.i @@ -1,7 +1,7 @@ /*************************************************************************** * GCTAAeffPerfTable.i - CTA performance table effective area class * * ----------------------------------------------------------------------- * - * copyright (C) 2012 by Juergen Knoedlseder * + * copyright (C) 2012-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -69,9 +69,6 @@ public: * @brief GCTAAeffPerfTable class extension ***************************************************************************/ %extend GCTAAeffPerfTable { - char *__str__() { - return tochar(self->print()); - } GCTAAeffPerfTable copy() { return (*self); } diff --git a/inst/cta/pyext/GCTADir.i b/inst/cta/pyext/GCTADir.i index c9d44cf..e63f8d7 100644 --- a/inst/cta/pyext/GCTADir.i +++ b/inst/cta/pyext/GCTADir.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GCTADir.i - CTA direction class * + * GCTADir.i - CTA direction class * * ----------------------------------------------------------------------- * - * copyright (C) 2011 by Jurgen Knodlseder * + * copyright (C) 2011-2013 by Jurgen Knodlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -20,8 +20,8 @@ ***************************************************************************/ /** * @file GCTADir.i - * @brief CTA camera direction class Python interface definition - * @author J. Knodlseder + * @brief CTA camera direction class interface definition + * @author Juergen Knoedlseder */ %{ /* Put headers and other declarations here that are needed for compilation */ @@ -63,9 +63,6 @@ public: * @brief GCTADir class extension ***************************************************************************/ %extend GCTADir { - char *__str__() { - return tochar(self->print()); - } GCTADir copy() { return (*self); } diff --git a/inst/cta/pyext/GCTAEdisp.i b/inst/cta/pyext/GCTAEdisp.i index 48b35da..59da5b9 100644 --- a/inst/cta/pyext/GCTAEdisp.i +++ b/inst/cta/pyext/GCTAEdisp.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GCTAEdisp.i - CTA energy dispersion base class * + * GCTAEdisp.i - Energy dispersion base class * * ----------------------------------------------------------------------- * - * copyright (C) 2012 by Juergen Knoedlseder * + * copyright (C) 2012-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -20,7 +20,7 @@ ***************************************************************************/ /** * @file GCTAEdisp.i - * @brief CTA energy dispersion base class definition + * @brief Energy dispersion base class definition * @author Juergen Knoedlseder */ %{ @@ -65,7 +65,4 @@ public: * @brief GCTAEdisp class extension ***************************************************************************/ %extend GCTAEdisp { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/inst/cta/pyext/GCTAModelRadial.i b/inst/cta/pyext/GCTAModelRadial.i index 2219f23..12906f9 100644 --- a/inst/cta/pyext/GCTAModelRadial.i +++ b/inst/cta/pyext/GCTAModelRadial.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GCTAModelRadial.i - Radial model abstract base class python interface * + * GCTAModelRadial.i - Abstract radial model base class * * ----------------------------------------------------------------------- * - * copyright (C) 2011 by Jurgen Knodlseder * + * copyright (C) 2011-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -20,8 +20,8 @@ ***************************************************************************/ /** * @file GCTAModelRadial.i - * @brief Abstract radial acceptance model class Python interface. - * @author J. Knodlseder + * @brief Abstract radial model class interface definition + * @author Juergen Knoedlseder */ %{ /* Put headers and other declarations here that are needed for compilation */ @@ -63,9 +63,6 @@ public: * @brief GCTAModelRadial class extension ***************************************************************************/ %extend GCTAModelRadial { - char *__str__() { - return tochar(self->print()); - } GModelPar& __getitem__(const int& index) { if (index >= 0 && index < self->size()) return (*self)[index]; diff --git a/inst/cta/pyext/GCTAModelRadialAcceptance.i b/inst/cta/pyext/GCTAModelRadialAcceptance.i index f8d9554..4be113d 100644 --- a/inst/cta/pyext/GCTAModelRadialAcceptance.i +++ b/inst/cta/pyext/GCTAModelRadialAcceptance.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GCTAModelRadialAcceptance.i - Radial acceptance model class python I/F* + * GCTAModelRadialAcceptance.i - Radial acceptance model class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2012 by Juergen Knoedlseder * + * copyright (C) 2011-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -20,7 +20,7 @@ ***************************************************************************/ /** * @file GCTAModelRadialAcceptance.i - * @brief Radial acceptance model class Python interface definition + * @brief Radial acceptance model class interface definition * @author Juergen Knoedlseder */ %{ diff --git a/inst/cta/pyext/GCTAModelRadialGauss.i b/inst/cta/pyext/GCTAModelRadialGauss.i index fd005a6..0fb1f67 100644 --- a/inst/cta/pyext/GCTAModelRadialGauss.i +++ b/inst/cta/pyext/GCTAModelRadialGauss.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GCTAModelRadialGauss.i - Radial Gaussian model class python interface * + * GCTAModelRadialGauss.i - Radial Gaussian model class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2012 by Juergen Knoedlseder * + * copyright (C) 2011-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -20,7 +20,7 @@ ***************************************************************************/ /** * @file GCTAModelRadialGauss.i - * @brief Radial Gaussian model class Python interface definition + * @brief Radial Gaussian model class interface definition * @author Juergen Knoedlseder */ %{ @@ -65,7 +65,4 @@ public: * @brief GCTAModelRadialGauss class extension ***************************************************************************/ %extend GCTAModelRadialGauss { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/inst/cta/pyext/GCTAModelRadialPolynom.i b/inst/cta/pyext/GCTAModelRadialPolynom.i index f6abc02..94fc660 100644 --- a/inst/cta/pyext/GCTAModelRadialPolynom.i +++ b/inst/cta/pyext/GCTAModelRadialPolynom.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GCTAModelRadialPolynom.i - Radial Polynom CTA model class * + * GCTAModelRadialPolynom.i - Radial Polynom model class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2012 by Juergen Knoedlseder * + * copyright (C) 2011-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -20,7 +20,7 @@ ***************************************************************************/ /** * @file GCTAModelRadialPolynom.i - * @brief Radial Polynom model class Python interface definition + * @brief Radial Polynom model class interface definition * @author Juergen Knoedlseder */ %{ @@ -66,7 +66,4 @@ public: * @brief GCTAModelRadialPolynom class extension ***************************************************************************/ %extend GCTAModelRadialPolynom { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/inst/cta/pyext/GCTAModelRadialProfile.i b/inst/cta/pyext/GCTAModelRadialProfile.i index 288e98a..c843a22 100644 --- a/inst/cta/pyext/GCTAModelRadialProfile.i +++ b/inst/cta/pyext/GCTAModelRadialProfile.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GCTAModelRadialProfile.i - Radial Profile CTA model class * + * GCTAModelRadialProfile.i - Radial Profile model class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2012 by Juergen Knoedlseder * + * copyright (C) 2011-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -70,7 +70,4 @@ public: * @brief GCTAModelRadialProfile class extension ***************************************************************************/ %extend GCTAModelRadialProfile { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/inst/cta/pyext/GCTAModelRadialRegistry.i b/inst/cta/pyext/GCTAModelRadialRegistry.i index 26bf82f..3007a10 100644 --- a/inst/cta/pyext/GCTAModelRadialRegistry.i +++ b/inst/cta/pyext/GCTAModelRadialRegistry.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GCTAModelRadialRegistry.i - CTA Radial model registry class * + * GCTAModelRadialRegistry.i - Radial model registry class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2012 by Juergen Knoedlseder * + * copyright (C) 2011-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -20,7 +20,7 @@ ***************************************************************************/ /** * @file GCTAModelRadialRegistry.i - * @brief CTA radial model registry class definition + * @brief Radial model registry class definition * @author Juergen Knoedlseder */ %{ @@ -55,7 +55,4 @@ public: * @brief GCTAModelRadialRegistry class extension ***************************************************************************/ %extend GCTAModelRadialRegistry { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/inst/cta/pyext/GCTAPsf.i b/inst/cta/pyext/GCTAPsf.i index e6d4ab4..12014a8 100644 --- a/inst/cta/pyext/GCTAPsf.i +++ b/inst/cta/pyext/GCTAPsf.i @@ -77,7 +77,4 @@ public: * @brief GCTAPsf class extension ***************************************************************************/ %extend GCTAPsf { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/inst/cta/pyext/GCTAPsf2D.i b/inst/cta/pyext/GCTAPsf2D.i index 5f373de..c3ce303 100644 --- a/inst/cta/pyext/GCTAPsf2D.i +++ b/inst/cta/pyext/GCTAPsf2D.i @@ -78,7 +78,4 @@ public: * @brief GCTAPsf2D class extension ***************************************************************************/ %extend GCTAPsf2D { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/inst/cta/pyext/GCTAPsfPerfTable.i b/inst/cta/pyext/GCTAPsfPerfTable.i index 95f0b93..7eb98fb 100644 --- a/inst/cta/pyext/GCTAPsfPerfTable.i +++ b/inst/cta/pyext/GCTAPsfPerfTable.i @@ -78,7 +78,4 @@ public: * @brief GCTAPsfPerfTable class extension ***************************************************************************/ %extend GCTAPsfPerfTable { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/inst/cta/pyext/GCTAPsfVector.i b/inst/cta/pyext/GCTAPsfVector.i index fb30183..2857842 100644 --- a/inst/cta/pyext/GCTAPsfVector.i +++ b/inst/cta/pyext/GCTAPsfVector.i @@ -84,7 +84,4 @@ public: * @brief GCTAPsfVector class extension ***************************************************************************/ %extend GCTAPsfVector { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/inst/cta/pyext/GCTAResponseTable.i b/inst/cta/pyext/GCTAResponseTable.i index f33837b..21eaf11 100644 --- a/inst/cta/pyext/GCTAResponseTable.i +++ b/inst/cta/pyext/GCTAResponseTable.i @@ -1,7 +1,7 @@ /*************************************************************************** * GCTAResponseTable.i - CTA response table class * * ----------------------------------------------------------------------- * - * copyright (C) 2012 by Juergen Knoedlseder * + * copyright (C) 2012-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -78,9 +78,6 @@ public: * @brief GCTAResponse class extension ***************************************************************************/ %extend GCTAResponseTable { - char *__str__() { - return tochar(self->print()); - } GCTAResponseTable copy() { return (*self); } diff --git a/inst/lat/pyext/GLATAeff.i b/inst/lat/pyext/GLATAeff.i index de26a55..60327ad 100644 --- a/inst/lat/pyext/GLATAeff.i +++ b/inst/lat/pyext/GLATAeff.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GLATAeff.i - Fermi/LAT effective area * + * GLATAeff.i - Fermi/LAT effective area class * * ----------------------------------------------------------------------- * - * copyright (C) 2012 by Juergen Knoedlseder * + * copyright (C) 2012-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -74,9 +74,6 @@ public: * @brief GLATAeff class extension ***************************************************************************/ %extend GLATAeff { - char *__str__() { - return tochar(self->print()); - } GLATAeff copy() { return (*self); } diff --git a/inst/lat/pyext/GLATEdisp.i b/inst/lat/pyext/GLATEdisp.i index 57ccbf6..0f372e9 100644 --- a/inst/lat/pyext/GLATEdisp.i +++ b/inst/lat/pyext/GLATEdisp.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GLATEdisp.i - Fermi/LAT energy dispersion * + * GLATEdisp.i - Fermi/LAT energy dispersion class * * ----------------------------------------------------------------------- * - * copyright (C) 2012 by Juergen Knoedlseder * + * copyright (C) 2012-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -69,9 +69,6 @@ public: * @brief GLATEdisp class extension ***************************************************************************/ %extend GLATEdisp { - char *__str__() { - return tochar(self->print()); - } GLATEdisp copy() { return (*self); } diff --git a/inst/lat/pyext/GLATEventAtom.i b/inst/lat/pyext/GLATEventAtom.i index 03605e4..0addfba 100644 --- a/inst/lat/pyext/GLATEventAtom.i +++ b/inst/lat/pyext/GLATEventAtom.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GLATEventAtom.i - Fermi/LAT event atom class * + * GLATEventAtom.i - Fermi/LAT event atom class * * ----------------------------------------------------------------------- * - * copyright (C) 2012 by Juergen Knoedlseder * + * copyright (C) 2012-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -55,9 +55,6 @@ public: * @brief GLATEventAtom class extension ***************************************************************************/ %extend GLATEventAtom { - char *__str__() { - return tochar(self->print()); - } GLATEventAtom copy() { return (*self); } diff --git a/inst/lat/pyext/GLATEventList.i b/inst/lat/pyext/GLATEventList.i index fad751b..6094c8c 100644 --- a/inst/lat/pyext/GLATEventList.i +++ b/inst/lat/pyext/GLATEventList.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GLATEventList.i - Fermi-LAT event atom container class * + * GLATEventList.i - Fermi/LAT event atom container class * * ----------------------------------------------------------------------- * - * copyright (C) 2012 by Juergen Knoedlseder * + * copyright (C) 2012-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -60,9 +60,6 @@ public: * @brief GLATEventList class extension ***************************************************************************/ %extend GLATEventList { - char *__str__() { - return tochar(self->print()); - } GLATEventList copy() { return (*self); } diff --git a/inst/lat/pyext/GLATLtCube.i b/inst/lat/pyext/GLATLtCube.i index f6fe91b..58a5cfb 100644 --- a/inst/lat/pyext/GLATLtCube.i +++ b/inst/lat/pyext/GLATLtCube.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GLATLtCube.i - Fermi/LAT lifetime cube * + * GLATLtCube.i - Fermi/LAT lifetime cube class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2012 by Juergen Knoedlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -20,8 +20,8 @@ ***************************************************************************/ /** * @file GLATLtCube.i - * @brief Fermi/LAT lifetime cube Python interface definition - * @author J. Knoedlseder + * @brief Fermi/LAT lifetime cube interface definition + * @author Juergen Knoedlseder */ %{ /* Put headers and other declarations here that are needed for compilation */ @@ -65,9 +65,6 @@ public: * @brief GLATLtCube class extension ***************************************************************************/ %extend GLATLtCube { - char *__str__() { - return tochar(self->print()); - } GLATLtCube copy() { return (*self); } diff --git a/inst/lat/pyext/GLATMeanPsf.i b/inst/lat/pyext/GLATMeanPsf.i index 6e1392f..0fc2e3e 100644 --- a/inst/lat/pyext/GLATMeanPsf.i +++ b/inst/lat/pyext/GLATMeanPsf.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GLATMeanPsf.hpp - Fermi/LAT mean PSF * + * GLATMeanPsf.hpp - Fermi/LAT mean PSF class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2011 by Jurgen Knodlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -20,8 +20,8 @@ ***************************************************************************/ /** * @file GLATMeanPsf.hpp - * @brief Fermi LAT mean PSF Python interface definition - * @author J. Knodlseder + * @brief Fermi/LAT mean PSF interface definition + * @author Juergen Knoedlseder */ %{ /* Put headers and other declarations here that are needed for compilation */ @@ -75,9 +75,6 @@ public: * @brief GLATMeanPsf class extension ***************************************************************************/ %extend GLATMeanPsf { - char *__str__() { - return tochar(self->print()); - } GLATMeanPsf copy() { return (*self); } diff --git a/inst/lat/pyext/GLATPointing.i b/inst/lat/pyext/GLATPointing.i index 2860dba..2822572 100644 --- a/inst/lat/pyext/GLATPointing.i +++ b/inst/lat/pyext/GLATPointing.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GLATPointing.i - Fermi-LAT pointing class * + * GLATPointing.i - Fermi/LAT pointing class * * ----------------------------------------------------------------------- * - * copyright (C) 2012 by Juergen Knoedlseder * + * copyright (C) 2012-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -54,9 +54,6 @@ public: * @brief GLATPointing class extension ***************************************************************************/ %extend GLATPointing { - char *__str__() { - return tochar(self->print()); - } GLATPointing copy() { return (*self); } diff --git a/inst/lat/pyext/GLATPsf.i b/inst/lat/pyext/GLATPsf.i index ca81bef..75401e0 100644 --- a/inst/lat/pyext/GLATPsf.i +++ b/inst/lat/pyext/GLATPsf.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GLATPsf.i - Fermi/LAT point spread function * + * GLATPsf.i - Fermi/LAT point spread function class * * ----------------------------------------------------------------------- * - * copyright (C) 2012 by Juergen Knoedlseder * + * copyright (C) 2012-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file GLATPsf.i * @brief Fermi/LAT point spread function class definition - * @author J. Knoedlseder + * @author Juergen Knoedlseder */ %{ /* Put headers and other declarations here that are needed for compilation */ @@ -74,9 +74,6 @@ public: * @brief GLATPsf class extension ***************************************************************************/ %extend GLATPsf { - char *__str__() { - return tochar(self->print()); - } GLATPsf copy() { return (*self); } diff --git a/pyext/GApplication.i b/pyext/GApplication.i index e23e474..cd5d24d 100644 --- a/pyext/GApplication.i +++ b/pyext/GApplication.i @@ -80,7 +80,7 @@ public: ***************************************************************************/ %extend GApplication { char *__str__() { - return tochar(self->print()); + return gammalib::tochar(self->print()); } GPar& __getitem__(const std::string& name) { return (*self)[name]; diff --git a/pyext/GCaldb.i b/pyext/GCaldb.i index c52c233..80079ed 100644 --- a/pyext/GCaldb.i +++ b/pyext/GCaldb.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GCaldb.i - Calibration database class * + * GCaldb.i - Calibration database class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2012 by Juergen Knoedlseder * + * copyright (C) 2011-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -59,7 +59,7 @@ public: ***************************************************************************/ %extend GCaldb { char *__str__() { - return tochar(self->print()); + return gammalib::tochar(self->print()); } GCaldb copy() { return (*self); diff --git a/pyext/GCsv.i b/pyext/GCsv.i index dd1fb65..364c0ad 100644 --- a/pyext/GCsv.i +++ b/pyext/GCsv.i @@ -1,7 +1,7 @@ /*************************************************************************** * GCsv.i - Column separated values table class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2011 by Jurgen Knodlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file GCsv.hpp * @brief Column separated values table class Python bindings - * @author J. Knodlseder + * @author Juergen Knoedlseder */ %{ /* Put headers and other declarations here that are needed for compilation */ @@ -107,9 +107,6 @@ public: * @brief GCsv class extension ***************************************************************************/ %extend GCsv { - char *__str__() { - return tochar(self->print()); - } std::string __getitem__(int GCsvInx[]) { return (*self)(GCsvInx[0], GCsvInx[1]); } diff --git a/pyext/GDerivative.i b/pyext/GDerivative.i index 1a88b1c..e538b34 100644 --- a/pyext/GDerivative.i +++ b/pyext/GDerivative.i @@ -1,7 +1,7 @@ /*************************************************************************** * GDerivative.i - Derivative class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2012 by Juergen Knoedlseder * + * copyright (C) 2011-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -68,9 +68,6 @@ public: * @brief GDerivative class extension ***************************************************************************/ %extend GDerivative { - char *__str__() { - return tochar(self->print()); - } GDerivative copy() { return (*self); } diff --git a/pyext/GEbounds.i b/pyext/GEbounds.i index e015041..b79fece 100644 --- a/pyext/GEbounds.i +++ b/pyext/GEbounds.i @@ -80,9 +80,6 @@ public: * @brief GEbounds class extension ***************************************************************************/ %extend GEbounds { - char *__str__() { - return tochar(self->print()); - } int __len__() { return (self->size()); } diff --git a/pyext/GEnergy.i b/pyext/GEnergy.i index 1827019..497fce8 100644 --- a/pyext/GEnergy.i +++ b/pyext/GEnergy.i @@ -1,7 +1,7 @@ /*************************************************************************** * GEnergy.i - Energy class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2012 by Juergen Knoedlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -80,9 +80,6 @@ public: * @brief GEnergy class extension ***************************************************************************/ %extend GEnergy { - char *__str__() { - return tochar(self->print()); - } GEnergy __add__(const GEnergy& eng) const { return ((*self) + eng); } diff --git a/pyext/GEvent.i b/pyext/GEvent.i index 78f461e..8dbe8ea 100644 --- a/pyext/GEvent.i +++ b/pyext/GEvent.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GEvent.i - Abstract event class python I/F * + * GEvent.i - Abstract event class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2012 by Juergen Knoedlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -20,7 +20,7 @@ ***************************************************************************/ /** * @file GEvent.i - * @brief GEvent class python interface + * @brief Abstract event base class interface definition * @author Juergen Knoedlseder */ %{ @@ -89,7 +89,4 @@ public: * @brief GEvent class extension ***************************************************************************/ %extend GEvent { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/pyext/GEvents.i b/pyext/GEvents.i index 7fd199a..03503ab 100644 --- a/pyext/GEvents.i +++ b/pyext/GEvents.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GEvents.i - Abstract event container class * + * GEvents.i - Abstract event container class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2012 by Juergen Knoedlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -84,9 +84,6 @@ public: * @brief GEvents class extension ***************************************************************************/ %extend GEvents { - char *__str__() { - return tochar(self->print()); - } GEvent* __getitem__(int index) { if (index >= 0 && index < self->size()) { return (*self)[index]; diff --git a/pyext/GFits.i b/pyext/GFits.i index 0eaf7c4..c566c18 100644 --- a/pyext/GFits.i +++ b/pyext/GFits.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GFits.i - FITS file access class * + * GFits.i - FITS file access class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2012 by Juergen Knoedlseder * + * copyright (C) 2008-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -180,9 +180,6 @@ public: * @brief GFits class SWIG extension ***************************************************************************/ %extend GFits { - char *__str__() { - return tochar(self->print()); - } GFits copy() { return (*self); } diff --git a/pyext/GFitsAsciiTable.i b/pyext/GFitsAsciiTable.i index 1e726fe..44ad7b5 100644 --- a/pyext/GFitsAsciiTable.i +++ b/pyext/GFitsAsciiTable.i @@ -1,7 +1,7 @@ /*************************************************************************** * GFitsAsciiTable.i - FITS ASCII table class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2012 by Juergen Knoedlseder * + * copyright (C) 2008-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -54,9 +54,6 @@ public: * @brief GFitsAsciiTable class SWIG extension ***************************************************************************/ %extend GFitsAsciiTable { - char *__str__() { - return tochar(self->print()); - } GFitsAsciiTable copy() { return (*self); } diff --git a/pyext/GFitsBinTable.i b/pyext/GFitsBinTable.i index 5fadab0..b91ddcb 100644 --- a/pyext/GFitsBinTable.i +++ b/pyext/GFitsBinTable.i @@ -1,7 +1,7 @@ /*************************************************************************** * GFitsBinTable.i - FITS binary table class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2012 by Juergen Knoedlseder * + * copyright (C) 2008-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -54,9 +54,6 @@ public: * @brief GFitsBinTable class SWIG extension ***************************************************************************/ %extend GFitsBinTable { - char *__str__() { - return tochar(self->print()); - } GFitsBinTable copy() { return (*self); } diff --git a/pyext/GFitsHDU.i b/pyext/GFitsHDU.i index 4a84d5e..f23c586 100644 --- a/pyext/GFitsHDU.i +++ b/pyext/GFitsHDU.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GFitsHDU.i - FITS HDU handling class * + * GFitsHDU.i - FITS HDU handling class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2012 by Juergen Knoedlseder * + * copyright (C) 2008-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -87,7 +87,4 @@ public: * @brief GFitsHDU class SWIG extension ***************************************************************************/ %extend GFitsHDU { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/pyext/GFitsHeader.i b/pyext/GFitsHeader.i index f648834..90ba76f 100644 --- a/pyext/GFitsHeader.i +++ b/pyext/GFitsHeader.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GFitsHeader.i - FITS header handling class SWIG file * + * GFitsHeader.i - FITS header class * * ----------------------------------------------------------------------- * - * copyright : (C) 2008-2011 by Juergen Knoedlseder * + * copyright (C) 2008-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -20,8 +20,8 @@ ***************************************************************************/ /** * @file GFitsHeader.i - * @brief FITS header class Python interface definition - * @author J. Knoedlseder + * @brief FITS header class interface definition + * @author Juergen Knoedlseder */ %{ /* Put headers and other declarations here that are needed for compilation */ @@ -75,9 +75,6 @@ public: * @brief GFitsHeader class SWIG extension ***************************************************************************/ %extend GFitsHeader { - char *__str__() { - return tochar(self->print()); - } GFitsHeader copy() { return (*self); } diff --git a/pyext/GFitsHeaderCard.i b/pyext/GFitsHeaderCard.i index 103cd68..14d980a 100644 --- a/pyext/GFitsHeaderCard.i +++ b/pyext/GFitsHeaderCard.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GFitsHeaderCard.hpp - FITS header card class SWIG file * + * GFitsHeaderCard.hpp - FITS header card class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2012 by Juergen Knoedlseder * + * copyright (C) 2008-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -86,9 +86,6 @@ public: * @brief GFitsHeaderCard class SWIG extension ***************************************************************************/ %extend GFitsHeaderCard { - char *__str__() { - return tochar(self->print()); - } GFitsHeaderCard copy() { return (*self); } diff --git a/pyext/GFitsImage.i b/pyext/GFitsImage.i index 18c4273..7b77ca5 100644 --- a/pyext/GFitsImage.i +++ b/pyext/GFitsImage.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GFitsImage.i - FITS image abstract base class SWIG interface * + * GFitsImage.i - FITS abstract image base class * * ----------------------------------------------------------------------- * - * copyright : (C) 2008-2012 by Juergen Knoedlseder * + * copyright (C) 2008-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -131,7 +131,4 @@ public: * @brief GFitsImage class extension ***************************************************************************/ %extend GFitsImage { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/pyext/GFitsTable.i b/pyext/GFitsTable.i index f469d52..d2a380c 100644 --- a/pyext/GFitsTable.i +++ b/pyext/GFitsTable.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GFitsTable.i - FITS table abstract base class SWIG interface * + * GFitsTable.i - FITS abstract table base class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2012 by Juergen Knoedlseder * + * copyright (C) 2008-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -134,9 +134,6 @@ public: * @brief GFitsTable class extension ***************************************************************************/ %extend GFitsTable { - char *__str__() { - return tochar(self->print()); - } GFitsTableCol& __getitem__(const int& colnum) { return (*self)[colnum]; } diff --git a/pyext/GFitsTableCol.i b/pyext/GFitsTableCol.i index 83cbe54..5be765e 100644 --- a/pyext/GFitsTableCol.i +++ b/pyext/GFitsTableCol.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GFitsTableCol.i - FITS table column abstract base class * + * GFitsTableCol.i - FITS abstract table column base class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2011 by Jurgen Knodlseder * + * copyright (C) 2008-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -20,8 +20,8 @@ ***************************************************************************/ /** * @file GFitsTableCol.i - * @brief FITS table column abstract Python base class definition - * @author J. Knodlseder + * @brief FITS abstract table column base class definition + * @author Juergen Knoedlseder */ %{ /* Put headers and other declarations here that are needed for compilation */ @@ -104,9 +104,6 @@ public: * @todo Add range checking for type casting ***************************************************************************/ %extend GFitsTableCol { - char *__str__() { - return tochar(self->print()); - } // String setting void __setitem__(int GFitsTableColInx[], std::string value) { diff --git a/pyext/GGti.i b/pyext/GGti.i index b6c6e9d..48698eb 100644 --- a/pyext/GGti.i +++ b/pyext/GGti.i @@ -79,9 +79,6 @@ public: * @brief GGti class extension ***************************************************************************/ %extend GGti { - char *__str__() { - return tochar(self->print()); - } int __len__() { return (self->size()); } diff --git a/pyext/GInstDir.i b/pyext/GInstDir.i index cd02adc..be9d0a8 100644 --- a/pyext/GInstDir.i +++ b/pyext/GInstDir.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GInstDir.i - Instrument direction class python I/F * + * GInstDir.i - Abstract instrument direction base class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2012 by Juergen Knoedlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -60,7 +60,4 @@ public: * @brief GInstDir class extension ***************************************************************************/ %extend GInstDir { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/pyext/GIntegral.i b/pyext/GIntegral.i index 171ad26..b1621ed 100644 --- a/pyext/GIntegral.i +++ b/pyext/GIntegral.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GIntegral.hpp - Integration class * + * GIntegral.hpp - Integration class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2012 by Juergen Knoedlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -68,9 +68,6 @@ public: * @brief GIntegral class extension ***************************************************************************/ %extend GIntegral { - char *__str__() { - return tochar(self->print()); - } GIntegral copy() { return (*self); } diff --git a/pyext/GLog.i b/pyext/GLog.i index e856878..89be109 100644 --- a/pyext/GLog.i +++ b/pyext/GLog.i @@ -94,24 +94,24 @@ public: (*self) << value; } void parformat(const std::string& arg) { - (*self) << parformat(arg); + (*self) << gammalib::parformat(arg); } void toupper(const std::string& arg) { - (*self) << toupper(arg); + (*self) << gammalib::toupper(arg); } void tolower(const std::string& arg) { - (*self) << tolower(arg); + (*self) << gammalib::tolower(arg); } void fill(const std::string& arg, const int& n) { - (*self) << fill(arg, n); + (*self) << gammalib::fill(arg, n); } void left(const std::string& arg, const int& n) { - (*self) << left(arg, n); + (*self) << gammalib::left(arg, n); } void right(const std::string& arg, const int& n) { - (*self) << right(arg, n); + (*self) << gammalib::right(arg, n); } void center(const std::string& arg, const int& n) { - (*self) << center(arg, n); + (*self) << gammalib::center(arg, n); } } diff --git a/pyext/GMatrix.i b/pyext/GMatrix.i index 9456620..4163421 100755 --- a/pyext/GMatrix.i +++ b/pyext/GMatrix.i @@ -96,9 +96,6 @@ public: * @brief GMatrix class extension ***************************************************************************/ %extend GMatrix { - char *__str__() { - return tochar(self->print()); - } double __getitem__(int GTuple[2]) { return (*self)(GTuple[0], GTuple[1]); } diff --git a/pyext/GMatrixSparse.i b/pyext/GMatrixSparse.i index bf9ca6c..706827e 100644 --- a/pyext/GMatrixSparse.i +++ b/pyext/GMatrixSparse.i @@ -110,9 +110,6 @@ public: * @brief GMatrixSparse class extension ***************************************************************************/ %extend GMatrixSparse { - char *__str__() { - return tochar(self->print()); - } double __getitem__(int GTuple[2]) { return (*self)(GTuple[0], GTuple[1]); } diff --git a/pyext/GMatrixSymmetric.i b/pyext/GMatrixSymmetric.i index d5df188..b1bb368 100644 --- a/pyext/GMatrixSymmetric.i +++ b/pyext/GMatrixSymmetric.i @@ -95,9 +95,6 @@ public: * @brief GMatrixSymmetric class extension ***************************************************************************/ %extend GMatrixSymmetric { - char *__str__() { - return tochar(self->print()); - } double __getitem__(int GTuple[2]) { return (*self)(GTuple[0], GTuple[1]); } diff --git a/pyext/GModel.i b/pyext/GModel.i index 9b897a8..8851d70 100644 --- a/pyext/GModel.i +++ b/pyext/GModel.i @@ -78,9 +78,6 @@ public: * @brief GModel class extension ***************************************************************************/ %extend GModel { - char *__str__() { - return tochar(self->print()); - } GModelPar& __getitem__(const int& index) { if (index >= 0 && index < self->size()) { return (*self)[index]; diff --git a/pyext/GModelPar.i b/pyext/GModelPar.i index 489ae1c..1c9b970 100644 --- a/pyext/GModelPar.i +++ b/pyext/GModelPar.i @@ -105,9 +105,6 @@ public: * @brief GModelPar class extension ***************************************************************************/ %extend GModelPar { - char *__str__() { - return tochar(self->print()); - } GModelPar copy() { return (*self); } diff --git a/pyext/GModelRegistry.i b/pyext/GModelRegistry.i index 9d0c50e..59fc01b 100644 --- a/pyext/GModelRegistry.i +++ b/pyext/GModelRegistry.i @@ -55,7 +55,4 @@ public: * @brief GModelRegistry class extension ***************************************************************************/ %extend GModelRegistry { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/pyext/GModelSpatial.i b/pyext/GModelSpatial.i index 3b29a63..6b3bada 100644 --- a/pyext/GModelSpatial.i +++ b/pyext/GModelSpatial.i @@ -64,9 +64,6 @@ public: * @brief GModelSpatial class extension ***************************************************************************/ %extend GModelSpatial { - char *__str__() { - return tochar(self->print()); - } GModelPar& __getitem__(const int& index) { if (index >= 0 && index < self->size()) { return (*self)[index]; diff --git a/pyext/GModelSpatialRegistry.i b/pyext/GModelSpatialRegistry.i index c8b9fa7..195aa3c 100644 --- a/pyext/GModelSpatialRegistry.i +++ b/pyext/GModelSpatialRegistry.i @@ -1,7 +1,7 @@ /*************************************************************************** * GModelSpatialRegistry.i - Spatial model registry class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2012 by Juergen Knoedlseder * + * copyright (C) 2011-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -56,6 +56,6 @@ public: ***************************************************************************/ %extend GModelSpatialRegistry { char *__str__() { - return tochar(self->print()); + return gammalib::tochar(self->print()); } }; diff --git a/pyext/GModelSpectral.i b/pyext/GModelSpectral.i index 6d7df7a..eeb6afe 100644 --- a/pyext/GModelSpectral.i +++ b/pyext/GModelSpectral.i @@ -35,7 +35,7 @@ * * @brief Abstract spectral model class ***************************************************************************/ -class GModelSpectral { +class GModelSpectral : public GBase { public: // Constructors and destructors @@ -70,9 +70,6 @@ public: * @brief GModelSpectral class extension ***************************************************************************/ %extend GModelSpectral { - char *__str__() { - return tochar(self->print()); - } GModelPar& __getitem__(const int& index) { if (index >= 0 && index < self->size()) { return (*self)[index]; diff --git a/pyext/GModelSpectralRegistry.i b/pyext/GModelSpectralRegistry.i index 1dfbdd8..16f257c 100644 --- a/pyext/GModelSpectralRegistry.i +++ b/pyext/GModelSpectralRegistry.i @@ -1,7 +1,7 @@ /*************************************************************************** * GModelSpectralRegistry.i - Spectral model registry class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2012 by Juergen Knoedlseder * + * copyright (C) 2011-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -56,6 +56,6 @@ public: ***************************************************************************/ %extend GModelSpectralRegistry { char *__str__() { - return tochar(self->print()); + return gammalib::tochar(self->print()); } }; diff --git a/pyext/GModelTemporal.i b/pyext/GModelTemporal.i index c524624..a879b30 100644 --- a/pyext/GModelTemporal.i +++ b/pyext/GModelTemporal.i @@ -35,7 +35,7 @@ * * @brief Abstract temporal model base class ***************************************************************************/ -class GModelTemporal { +class GModelTemporal : public GBase { public: // Constructors and destructors @@ -64,9 +64,6 @@ public: * @brief GModelTemporal class extension ***************************************************************************/ %extend GModelTemporal { - char *__str__() { - return tochar(self->print()); - } GModelPar& __getitem__(const int& index) { if (index >= 0 && index < self->size()) { return (*self)[index]; diff --git a/pyext/GModelTemporalRegistry.i b/pyext/GModelTemporalRegistry.i index 36627d0..fd27b27 100644 --- a/pyext/GModelTemporalRegistry.i +++ b/pyext/GModelTemporalRegistry.i @@ -1,7 +1,7 @@ /*************************************************************************** * GModelTemporalRegistry.i - Temporal model registry class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2012 by Juergen Knoedlseder * + * copyright (C) 2011-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -55,7 +55,4 @@ public: * @brief GModelTemporalRegistry class extension ***************************************************************************/ %extend GModelTemporalRegistry { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/pyext/GNodeArray.i b/pyext/GNodeArray.i index 4e640f0..1aca9c6 100644 --- a/pyext/GNodeArray.i +++ b/pyext/GNodeArray.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GNodeArray.i - Array of nodes class SWIG definition * + * GNodeArray.i - Array of nodes class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2012 by Juergen Knoedlseder * + * copyright (C) 2008-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -68,9 +68,6 @@ public: * @brief GNodeArray class extension ***************************************************************************/ %extend GNodeArray { - char *__str__() { - return tochar(self->print()); - } double __getitem__(const int& index) { if (index >= 0 && index < self->size()) return (*self)[index]; diff --git a/pyext/GObservation.i b/pyext/GObservation.i index ab11409..037962d 100644 --- a/pyext/GObservation.i +++ b/pyext/GObservation.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GObservation.i - Abstract observation abstract base class * + * GObservation.i - Abstract observation base class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2012 by Juergen Knoedlseder * + * copyright (C) 2008-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -20,7 +20,7 @@ ***************************************************************************/ /** * @file GObservation.i - * @brief Abstract observation base class Python interface definition + * @brief Abstract observation base class interface definition * @author Juergen Knoedlseder */ %{ @@ -96,7 +96,4 @@ public: * @brief GObservation class extension ***************************************************************************/ %extend GObservation { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/pyext/GObservationRegistry.i b/pyext/GObservationRegistry.i index 79d3ecf..fef8461 100644 --- a/pyext/GObservationRegistry.i +++ b/pyext/GObservationRegistry.i @@ -1,7 +1,7 @@ /*************************************************************************** * GObservationRegistry.i - Observation registry class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2012 by Juergen Knoedlseder * + * copyright (C) 2011-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -55,7 +55,4 @@ public: * @brief GObservationRegistry class extension ***************************************************************************/ %extend GObservationRegistry { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/pyext/GObservations.i b/pyext/GObservations.i index 874058a..7e38ec4 100644 --- a/pyext/GObservations.i +++ b/pyext/GObservations.i @@ -75,9 +75,6 @@ public: * @brief GObservations class extension ***************************************************************************/ %extend GObservations { - char *__str__() { - return tochar(self->print()); - } GObservation* __getitem__(const int& index) { if (index >= 0 && index < self->size()) { return (*self)[index]; diff --git a/pyext/GOptimizer.i b/pyext/GOptimizer.i index 8d34bff..ff55895 100644 --- a/pyext/GOptimizer.i +++ b/pyext/GOptimizer.i @@ -57,7 +57,4 @@ public: * @brief GOptimizer class extension ***************************************************************************/ %extend GOptimizer { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/pyext/GPar.i b/pyext/GPar.i index 404cac7..3a532dd 100644 --- a/pyext/GPar.i +++ b/pyext/GPar.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GPar.i - Application parameter class SWIG file * + * GPar.i - Application parameter class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2012 by Juergen Knoedlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -20,7 +20,7 @@ ***************************************************************************/ /** * @file GPar.i - * @brief Application parameter class SWIG file. + * @brief Application parameter class definition * @author Juergen Knoedlseder */ %{ @@ -83,7 +83,7 @@ public: ***************************************************************************/ %extend GPar { char *__str__() { - return tochar(self->print()); + return gammalib::tochar(self->print()); } GPar copy() { return (*self); diff --git a/pyext/GPars.i b/pyext/GPars.i index 69b378c..a5344aa 100644 --- a/pyext/GPars.i +++ b/pyext/GPars.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GPars.i - Application parameters Python interface * + * GPars.i - Application parameter container * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2012 by Juergen Knoedlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -64,7 +64,7 @@ public: ***************************************************************************/ %extend GPars { char *__str__() { - return tochar(self->print()); + return gammalib::tochar(self->print()); } GPar& __getitem__(const int& index) { if (index >= 0 && index < self->size()) diff --git a/pyext/GPhoton.i b/pyext/GPhoton.i index 0480d2f..686c28d 100644 --- a/pyext/GPhoton.i +++ b/pyext/GPhoton.i @@ -1,7 +1,7 @@ /*************************************************************************** * GPhoton.i - Photon class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2012 by Juergen Knoedlseder * + * copyright (C) 2011-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -65,9 +65,6 @@ public: * @brief GPhoton class extension ***************************************************************************/ %extend GPhoton { - char *__str__() { - return tochar(self->print()); - } bool __eq__(const GPhoton& ph) const { return ((*self) == ph); } diff --git a/pyext/GPhotons.i b/pyext/GPhotons.i index 7674a10..dcbef5a 100644 --- a/pyext/GPhotons.i +++ b/pyext/GPhotons.i @@ -59,9 +59,6 @@ public: * @brief GPhotons class extension ***************************************************************************/ %extend GPhotons { - char *__str__() { - return tochar(self->print()); - } GPhoton& __getitem__(const int& index) { if (index >= 0 && index < self->size()) { return (*self)[index]; diff --git a/pyext/GPointing.i b/pyext/GPointing.i index bafe989..1e7a593 100644 --- a/pyext/GPointing.i +++ b/pyext/GPointing.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GPointing.i - Abstract pointing class * + * GPointing.i - Abstract pointing class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2012 by Juergen Knoedlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -54,7 +54,4 @@ public: * @brief GPointing class extension ***************************************************************************/ %extend GPointing { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/pyext/GRan.i b/pyext/GRan.i index 9c906ee..4e6a94a 100644 --- a/pyext/GRan.i +++ b/pyext/GRan.i @@ -1,7 +1,7 @@ /*************************************************************************** * GRan.i - Random number generator class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2012 by Juergen Knoedlseder * + * copyright (C) 2011-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -64,9 +64,6 @@ public: * @brief GRan class extension ***************************************************************************/ %extend GRan { - char *__str__() { - return tochar(self->print()); - } GRan copy() { return (*self); } diff --git a/pyext/GResponse.i b/pyext/GResponse.i index 2730130..9502b36 100644 --- a/pyext/GResponse.i +++ b/pyext/GResponse.i @@ -87,7 +87,4 @@ public: * @brief GResponse class extension ***************************************************************************/ %extend GResponse { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/pyext/GRoi.i b/pyext/GRoi.i index 2d97e61..3b38df9 100644 --- a/pyext/GRoi.i +++ b/pyext/GRoi.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GRoi.i - Region of interest abstract base class * + * GRoi.i - Abstract Region of interest base class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2012 by Juergen Knoedlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -58,7 +58,4 @@ public: * @brief GRoi class extension ***************************************************************************/ %extend GRoi { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/pyext/GSkyDir.i b/pyext/GSkyDir.i index 3ba1bf4..0f80844 100644 --- a/pyext/GSkyDir.i +++ b/pyext/GSkyDir.i @@ -72,9 +72,6 @@ public: * @brief GSkyDir class extension ***************************************************************************/ %extend GSkyDir { - char *__str__() { - return tochar(self->print()); - } bool __eq__(const GSkyDir& dir) const { return ((*self) == dir); } diff --git a/pyext/GSkyPixel.i b/pyext/GSkyPixel.i index 5ef11e9..3b93196 100644 --- a/pyext/GSkyPixel.i +++ b/pyext/GSkyPixel.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GSkyPixel.i - 2D sky pixel index class SWIG definition * + * GSkyPixel.i - 2D sky pixel index class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2012 by Juergen Knoedlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -58,9 +58,6 @@ public: * @brief GSkyPixel class extension ***************************************************************************/ %extend GSkyPixel { - char *__str__() { - return tochar(self->print()); - } GSkyPixel copy() { return (*self); } diff --git a/pyext/GSkymap.i b/pyext/GSkymap.i index a4a59bb..f686fee 100644 --- a/pyext/GSkymap.i +++ b/pyext/GSkymap.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GSkymap.i - Sky map class SWIG definition * + * GSkymap.i - Sky map class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2012 by Juergen Knoedlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -154,9 +154,6 @@ public: * GSkyDir ***************************************************************************/ %extend GSkymap { - char *__str__() { - return tochar(self->print()); - } double __getitem__(int GSkymapInx[]) { if (GSkymapInx[0] == 1) { return (*self)(GSkymapInx[1]); diff --git a/pyext/GSource.i b/pyext/GSource.i index e531b92..61f920c 100644 --- a/pyext/GSource.i +++ b/pyext/GSource.i @@ -64,9 +64,6 @@ public: * @brief GSource class extension ***************************************************************************/ %extend GSource { - char *__str__() { - return tochar(self->print()); - } GSource copy() { return (*self); } diff --git a/pyext/GTestCase.i b/pyext/GTestCase.i index 4dbcea8..98870bb 100644 --- a/pyext/GTestCase.i +++ b/pyext/GTestCase.i @@ -1,7 +1,7 @@ /*************************************************************************** * GTestCase.i - Test case class Python interface * * ----------------------------------------------------------------------- * - * copyright (C) 2012 Jean-Baptiste Cayrou * + * copyright (C) 2012-2013 Jean-Baptiste Cayrou * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -72,9 +72,6 @@ public: * @brief GTestCase class extension ***************************************************************************/ %extend GTestCase { - char *__str__() { - return tochar(self->print()); - } GTestCase copy() { return (*self); } diff --git a/pyext/GTestSuites.i b/pyext/GTestSuites.i index 4f8b001..7928477 100644 --- a/pyext/GTestSuites.i +++ b/pyext/GTestSuites.i @@ -1,7 +1,7 @@ /*************************************************************************** * GTestSuites.i - Test suites class Python interface * * ----------------------------------------------------------------------- * - * copyright (C) 2012 Jean-Baptiste Cayrou * + * copyright (C) 2012-2013 Jean-Baptiste Cayrou * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -66,9 +66,6 @@ public: * @brief GTestSuites class extension ***************************************************************************/ %extend GTestSuites { - char *__str__() { - return tochar(self->print()); - } GTestSuite& __getitem__(const int& index) { if (index >= 0 && index < self->size()) { return (*self)[index]; diff --git a/pyext/GTime.i b/pyext/GTime.i index 5779086..866b87d 100644 --- a/pyext/GTime.i +++ b/pyext/GTime.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GTime.i - Time class * + * GTime.i - Time class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2012 by Juergen Knoedlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -20,7 +20,7 @@ ***************************************************************************/ /** * @file GTime.i - * @brief Time class python interface definition + * @brief Time class interface definition * @author Juergen Knoedlseder */ %{ @@ -69,9 +69,6 @@ public: * @brief GTime class extension ***************************************************************************/ %extend GTime { - char *__str__() { - return tochar(self->print()); - } GTime __add__(const GTime& time) const { return ((*self) + time); } diff --git a/pyext/GTimeReference.i b/pyext/GTimeReference.i index 7d60847..43eb9ca 100644 --- a/pyext/GTimeReference.i +++ b/pyext/GTimeReference.i @@ -1,7 +1,7 @@ /*************************************************************************** * GTimeReference.i - Time reference class * * ----------------------------------------------------------------------- * - * copyright (C) 2012 by Juergen Knoedlseder * + * copyright (C) 2012-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -80,9 +80,6 @@ public: * @brief GTimeReference class extension ***************************************************************************/ %extend GTimeReference { - char *__str__() { - return tochar(self->print()); - } GTimeReference copy() { return (*self); } diff --git a/pyext/GTimes.i b/pyext/GTimes.i index 8728721..a3883a0 100644 --- a/pyext/GTimes.i +++ b/pyext/GTimes.i @@ -1,7 +1,7 @@ /*************************************************************************** * GTimes.i - Time container class * * ----------------------------------------------------------------------- * - * copyright (C) 2012 by Juergen Knoedlseder * + * copyright (C) 2012-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -61,9 +61,6 @@ public: * @brief GTimes class extension ***************************************************************************/ %extend GTimes { - char *__str__() { - return tochar(self->print()); - } GTime& __getitem__(const int& index) { if (index >= 0 && index < self->size()) { return (*self)[index]; diff --git a/pyext/GUrl.i b/pyext/GUrl.i index 2bb66d7..0ce8b81 100644 --- a/pyext/GUrl.i +++ b/pyext/GUrl.i @@ -49,8 +49,6 @@ public: virtual void close(void) = 0; virtual int getchar(void) = 0; virtual void putchar(const int& character) = 0; - //virtual void scanf(const char* format, ...) = 0; - //virtual void printf(const char* format, ...) = 0; }; @@ -58,9 +56,6 @@ public: * @brief GUrl class extension ***************************************************************************/ %extend GUrl { - char *__str__() { - return tochar(self->print()); - } char* read(const int& nbyte) { char* buffer = new char[nbyte+1]; int nread = self->read(buffer, nbyte); diff --git a/pyext/GVector.i b/pyext/GVector.i index 4c22c4e..60f4836 100755 --- a/pyext/GVector.i +++ b/pyext/GVector.i @@ -71,9 +71,6 @@ public: * @brief GVector class extension ***************************************************************************/ %extend GVector { - char *__str__() { - return tochar(self->print()); - } double __getitem__(const int& index) { if (index >= 0 && index < self->size()) { return (*self)[index]; diff --git a/pyext/GWcs.i b/pyext/GWcs.i index 3889517..b403857 100644 --- a/pyext/GWcs.i +++ b/pyext/GWcs.i @@ -1,7 +1,7 @@ /*************************************************************************** - * GWcs.i - World Coordinate System virtual base class * + * GWcs.i - World Coordinate System virtual base class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2012 by Juergen Knoedlseder * + * copyright (C) 2010-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -69,9 +69,6 @@ public: * @brief GWcs class extension ***************************************************************************/ %extend GWcs { - char *__str__() { - return tochar(self->print()); - } bool __is__(const GWcs &a) { return (*self) == a; } diff --git a/pyext/GWcsRegistry.i b/pyext/GWcsRegistry.i index 348f7d6..c6d23e5 100644 --- a/pyext/GWcsRegistry.i +++ b/pyext/GWcsRegistry.i @@ -1,7 +1,7 @@ /*************************************************************************** * GWcsRegistry.i - World Coordinate Projection registry class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2012 by Juergen Knoedlseder * + * copyright (C) 2011-2013 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -57,7 +57,4 @@ public: * @brief GWcsRegistry class extension ***************************************************************************/ %extend GWcsRegistry { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/pyext/GXml.i b/pyext/GXml.i index e2b91da..c1bd009 100644 --- a/pyext/GXml.i +++ b/pyext/GXml.i @@ -92,9 +92,6 @@ public: * @brief GXml class extension ***************************************************************************/ %extend GXml { - char *__str__() { - return tochar(self->print(NORMAL, 0)); - } GXmlNode* __getitem__(const int& index) { if (index >= 0 && index < self->size()) { return (*self)[index]; diff --git a/pyext/GXmlAttribute.i b/pyext/GXmlAttribute.i index 17fab9a..d733c4f 100644 --- a/pyext/GXmlAttribute.i +++ b/pyext/GXmlAttribute.i @@ -58,7 +58,4 @@ public: * @brief GXmlAttribute class extension ***************************************************************************/ %extend GXmlAttribute { - char *__str__() { - return tochar(self->print()); - } }; diff --git a/pyext/GXmlComment.i b/pyext/GXmlComment.i index 047ce85..803f22d 100644 --- a/pyext/GXmlComment.i +++ b/pyext/GXmlComment.i @@ -59,9 +59,6 @@ public: * @brief GXmlComment class extension ***************************************************************************/ %extend GXmlComment { - char *__str__() { - return tochar(self->print()); - } GXmlComment copy() { return (*self); } diff --git a/pyext/GXmlDocument.i b/pyext/GXmlDocument.i index 6f19786..9dcfe1e 100644 --- a/pyext/GXmlDocument.i +++ b/pyext/GXmlDocument.i @@ -62,9 +62,6 @@ public: * @brief GXmlDocument class extension ***************************************************************************/ %extend GXmlDocument { - char *__str__() { - return tochar(self->print()); - } GXmlDocument copy() { return (*self); } diff --git a/pyext/GXmlElement.i b/pyext/GXmlElement.i index 2aa64b9..fe69f81 100644 --- a/pyext/GXmlElement.i +++ b/pyext/GXmlElement.i @@ -62,9 +62,6 @@ public: * @brief GXmlElement class extension ***************************************************************************/ %extend GXmlElement { - char *__str__() { - return tochar(self->print()); - } GXmlElement copy() { return (*self); } diff --git a/pyext/GXmlNode.i b/pyext/GXmlNode.i index 467fc06..2297b19 100644 --- a/pyext/GXmlNode.i +++ b/pyext/GXmlNode.i @@ -107,7 +107,7 @@ public: ***************************************************************************/ %extend GXmlNode { char *__str__() { - return tochar(self->print(NORMAL, 0)); + return gammalib::tochar(self->print(NORMAL, 0)); } GXmlNode* __getitem__(const int& index) { if (index >= 0 && index < self->size()) { diff --git a/pyext/GXmlPI.i b/pyext/GXmlPI.i index 0168982..a6efb9d 100644 --- a/pyext/GXmlPI.i +++ b/pyext/GXmlPI.i @@ -59,9 +59,6 @@ public: * @brief GXmlPI class extension ***************************************************************************/ %extend GXmlPI { - char *__str__() { - return tochar(self->print()); - } GXmlPI copy() { return (*self); } diff --git a/pyext/GXmlText.i b/pyext/GXmlText.i index e7f115c..aff3b8e 100644 --- a/pyext/GXmlText.i +++ b/pyext/GXmlText.i @@ -59,9 +59,6 @@ public: * @brief GXmlText class extension ***************************************************************************/ %extend GXmlText { - char *__str__() { - return tochar(self->print()); - } GXmlText copy() { return (*self); } -- libgit2 0.21.4