From f09c2e4a111492f730b104f567ce22c9246c0121 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Sat, 16 Mar 2013 01:11:25 +0100 Subject: [PATCH] Chiefly review interface (some const references added) --- include/GXmlAttribute.hpp | 20 ++++++++++---------- include/GXmlComment.hpp | 2 +- include/GXmlDocument.hpp | 14 +++++++------- include/GXmlElement.hpp | 2 +- include/GXmlPI.hpp | 6 +++--- include/GXmlText.hpp | 4 ++-- pyext/GXmlAttribute.i | 14 +++++++------- pyext/GXmlComment.i | 2 +- pyext/GXmlDocument.i | 14 +++++++------- pyext/GXmlElement.i | 16 +++++++--------- pyext/GXmlPI.i | 14 +++++++++----- pyext/GXmlText.i | 6 +++--- 12 files changed, 58 insertions(+), 56 deletions(-) diff --git a/include/GXmlAttribute.hpp b/include/GXmlAttribute.hpp index 9163759..33a631e 100644 --- a/include/GXmlAttribute.hpp +++ b/include/GXmlAttribute.hpp @@ -55,14 +55,14 @@ public: GXmlAttribute& operator=(const GXmlAttribute& attr); // Methods - void clear(void); - GXmlAttribute* clone(void) const; - void write(GUrl& url) const; - std::string name(void) const { return m_name; } - std::string value(void) const; - void name(const std::string& name) { m_name=name; } - void value(std::string value); - std::string print(void) const; + void clear(void); + GXmlAttribute* clone(void) const; + void write(GUrl& url) const; + const std::string& name(void) const { return m_name; } + std::string value(void) const; + void name(const std::string& name) { m_name=name; } + void value(std::string value); + std::string print(void) const; protected: // Protected methods @@ -71,8 +71,8 @@ protected: void free_members(void); // Protected data members - std::string m_name; //!< Attribute name - std::string m_value; //!< Attribute value + std::string m_name; //!< Attribute name + std::string m_value; //!< Attribute value }; #endif /* GXMLATTRIBUTE_HPP */ diff --git a/include/GXmlComment.hpp b/include/GXmlComment.hpp index f9d0b93..fce7945 100644 --- a/include/GXmlComment.hpp +++ b/include/GXmlComment.hpp @@ -53,7 +53,7 @@ public: // Operators GXmlComment& operator=(const GXmlComment& node); - // Implemented virtual methods + // Implemented pure virtual base class methods virtual void clear(void); virtual GXmlComment* clone(void) const; virtual void write(GUrl& url, const int& indent = 0) const; diff --git a/include/GXmlDocument.hpp b/include/GXmlDocument.hpp index 17348fa..9575680 100644 --- a/include/GXmlDocument.hpp +++ b/include/GXmlDocument.hpp @@ -53,7 +53,7 @@ public: // Operators GXmlDocument& operator= (const GXmlDocument& node); - // Implemented virtual methods + // Implemented pure virtual base class methods void clear(void); GXmlDocument* clone(void) const; void write(GUrl& url, const int& indent = 0) const; @@ -61,12 +61,12 @@ public: std::string print(const int& indent = 0) const; // Methods - std::string version(void) const { return m_version.value(); } - std::string encoding(void) const { return m_encoding.value(); } - std::string standalone(void) const { return m_standalone.value(); } - void version(const std::string& version) { m_version.value(version); } - void encoding(const std::string& encoding) { m_encoding.value(encoding); } - void standalone(const std::string& standalone) { m_standalone.value(standalone); } + std::string version(void) const { return m_version.value(); } + std::string encoding(void) const { return m_encoding.value(); } + std::string standalone(void) const { return m_standalone.value(); } + void version(const std::string& version) { m_version.value(version); } + void encoding(const std::string& encoding) { m_encoding.value(encoding); } + void standalone(const std::string& standalone) { m_standalone.value(standalone); } protected: // Protected methods diff --git a/include/GXmlElement.hpp b/include/GXmlElement.hpp index 3da1c39..6be4c69 100644 --- a/include/GXmlElement.hpp +++ b/include/GXmlElement.hpp @@ -60,7 +60,7 @@ public: // Methods virtual void clear(void); virtual GXmlElement* clone(void) const; - std::string name(void) const { return m_name; } + const std::string& name(void) const { return m_name; } void name(const std::string& name) { m_name=name; } std::string attribute(const std::string& name) const; void attribute(const std::string& name, const std::string& value); diff --git a/include/GXmlPI.hpp b/include/GXmlPI.hpp index f607738..c588e9c 100644 --- a/include/GXmlPI.hpp +++ b/include/GXmlPI.hpp @@ -52,7 +52,7 @@ public: // Operators GXmlPI& operator=(const GXmlPI& node); - // Implemented virtual methods + // Implemented pure virtual base class methods virtual void clear(void); virtual GXmlPI* clone(void) const; virtual void write(GUrl& url, const int& indent = 0) const; @@ -60,8 +60,8 @@ public: virtual std::string print(const int& indent = 0) const; // Other methods - const std::string& pi(void) const { return m_pi; } - void pi(const std::string& pi) { m_pi=pi; } + const std::string& pi(void) const { return m_pi; } + void pi(const std::string& pi) { m_pi=pi; } protected: // Protected methods diff --git a/include/GXmlText.hpp b/include/GXmlText.hpp index 63840eb..36055f7 100644 --- a/include/GXmlText.hpp +++ b/include/GXmlText.hpp @@ -60,8 +60,8 @@ public: virtual std::string print(const int& indent = 0) const; // Other methods - const std::string& text(void) const { return m_text; } - void text(const std::string& text) { m_text=text; } + const std::string& text(void) const { return m_text; } + void text(const std::string& text) { m_text=text; } protected: // Protected methods diff --git a/pyext/GXmlAttribute.i b/pyext/GXmlAttribute.i index ecfac36..17fab9a 100644 --- a/pyext/GXmlAttribute.i +++ b/pyext/GXmlAttribute.i @@ -44,13 +44,13 @@ public: virtual ~GXmlAttribute(void); // Methods - void clear(void); - GXmlAttribute* clone(void) const; - void write(GUrl& url) const; - std::string name(void) const; - std::string value(void) const; - void name(const std::string& name); - void value(std::string value); + void clear(void); + GXmlAttribute* clone(void) const; + void write(GUrl& url) const; + const std::string& name(void) const; + std::string value(void) const; + void name(const std::string& name); + void value(std::string value); }; diff --git a/pyext/GXmlComment.i b/pyext/GXmlComment.i index 62d6abb..047ce85 100644 --- a/pyext/GXmlComment.i +++ b/pyext/GXmlComment.i @@ -43,7 +43,7 @@ public: explicit GXmlComment(const std::string& segment); virtual ~GXmlComment(void); - // Implemented virtual methods + // Implemented pure virtual base class methods virtual void clear(void); virtual GXmlComment* clone(void) const; virtual void write(GUrl& url, const int& indent = 0) const; diff --git a/pyext/GXmlDocument.i b/pyext/GXmlDocument.i index 2f23f28..6f19786 100644 --- a/pyext/GXmlDocument.i +++ b/pyext/GXmlDocument.i @@ -42,19 +42,19 @@ public: GXmlDocument(const GXmlDocument& node); virtual ~GXmlDocument(void); - // Implemented virtual methods + // Implemented pure virtual base class methods void clear(void); GXmlDocument* clone(void) const; void write(GUrl& url, const int& indent = 0) const; NodeType type(void) const; // Methods - std::string version(void) const; - std::string encoding(void) const; - std::string standalone(void) const; - void version(const std::string& version); - void encoding(const std::string& encoding); - void standalone(const std::string& standalone); + std::string version(void) const; + std::string encoding(void) const; + std::string standalone(void) const; + void version(const std::string& version); + void encoding(const std::string& encoding); + void standalone(const std::string& standalone); }; diff --git a/pyext/GXmlElement.i b/pyext/GXmlElement.i index 29da788..be55277 100644 --- a/pyext/GXmlElement.i +++ b/pyext/GXmlElement.i @@ -43,19 +43,17 @@ public: explicit GXmlElement(const std::string& segment); virtual ~GXmlElement(void); - // Implemented virtual methods + // Methods virtual void clear(void); virtual GXmlElement* clone(void) const; + const std::string& name(void) const; + void name(const std::string& name); + std::string attribute(const std::string& name) const; + void attribute(const std::string& name, const std::string& value); + GXmlNode* parent(void) const; + void parent(GXmlNode* node); virtual void write(GUrl& url, const int& indent = 0) const; virtual NodeType type(void) const; - - // Methods - std::string name(void) const; - std::string attribute(const std::string& name) const; - GXmlNode* parent(void) const; - void name(const std::string& name); - void parent(GXmlNode* node); - void attribute(const std::string& name, const std::string& value); }; diff --git a/pyext/GXmlPI.i b/pyext/GXmlPI.i index 7315012..0168982 100644 --- a/pyext/GXmlPI.i +++ b/pyext/GXmlPI.i @@ -43,11 +43,15 @@ public: explicit GXmlPI(const std::string& segment); virtual ~GXmlPI(void); - // Implemented virtual methods - virtual void clear(void); - virtual GXmlPI* clone(void) const; - virtual void write(GUrl& url, const int& indent = 0) const; - virtual NodeType type(void) const; + // Implemented pure virtual base class methods + virtual void clear(void); + virtual GXmlPI* clone(void) const; + virtual void write(GUrl& url, const int& indent = 0) const; + virtual NodeType type(void) const; + + // Other methods + const std::string& pi(void) const; + void pi(const std::string& pi); }; diff --git a/pyext/GXmlText.i b/pyext/GXmlText.i index 2970789..e7f115c 100644 --- a/pyext/GXmlText.i +++ b/pyext/GXmlText.i @@ -43,15 +43,15 @@ public: explicit GXmlText(const std::string& text); virtual ~GXmlText(void); - // Implemented virtual methods + // Implemented pure virtual base class methods virtual void clear(void); virtual GXmlText* clone(void) const; virtual void write(GUrl& url, const int& indent = 0) const; virtual NodeType type(void) const; // Other methods - const std::string& text(void) const; - void text(const std::string& text); + const std::string& text(void) const; + void text(const std::string& text); }; -- libgit2 0.21.4