You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by sc...@apache.org on 2017/12/04 19:03:17 UTC
svn commit: r1817117 - /santuario/xml-security-cpp/trunk/xsec/transformers/
Author: scantor
Date: Mon Dec 4 19:03:16 2017
New Revision: 1817117
URL: http://svn.apache.org/viewvc?rev=1817117&view=rev
Log:
Remove uncalled methods, add missing const specifiers.
Modified:
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase64.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase64.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMC14n.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMC14n.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMConcatChains.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMConcatChains.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMDocObject.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMDocObject.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMEnvelope.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMEnvelope.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMOutputFile.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMOutputFile.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMParser.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMParser.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSB.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSB.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMURL.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMURL.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.hpp
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase.cpp Mon Dec 4 19:03:16 2017
@@ -32,6 +32,11 @@
#include <xsec/transformers/TXFMBase.hpp>
#include <xsec/framework/XSECError.hpp>
+TXFMBase::TXFMBase(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc)
+ : input(NULL), keepComments(true), mp_nse(NULL), mp_expansionDoc(doc)
+{
+}
+
// -----------------------------------------------------------------------
// Ensure name spaces are reset when this is destroyed
// -----------------------------------------------------------------------
@@ -53,7 +58,7 @@ TXFMBase::~TXFMBase() {
// For expanding name spaces when necessary
// -----------------------------------------------------------------------
-bool TXFMBase::nameSpacesExpanded(void) {
+bool TXFMBase::nameSpacesExpanded(void) const {
if (mp_nse != NULL)
return true;
@@ -107,3 +112,14 @@ void TXFMBase::activateComments(void) {
}
+XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *TXFMBase::getDocument() const {
+
+ return NULL;
+
+}
+
+XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * TXFMBase::getFragmentNode() const {
+
+ return NULL; // Return a null node
+
+}
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase.hpp Mon Dec 4 19:03:16 2017
@@ -76,8 +76,7 @@ protected:
public:
- TXFMBase(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc)
- {input = NULL; keepComments = true; mp_nse = NULL; mp_expansionDoc = doc;}
+ TXFMBase(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc);
virtual ~TXFMBase();
// For getting/setting input/output type
@@ -110,12 +109,12 @@ public:
// Methods to get tranform output type and input requirement
- virtual ioType getInputType(void) = 0;
- virtual ioType getOutputType(void) = 0;
- virtual nodeType getNodeType(void) = 0;
+ virtual ioType getInputType(void) const = 0;
+ virtual ioType getOutputType(void) const = 0;
+ virtual nodeType getNodeType(void) const = 0;
// Name space expansion handling
- virtual bool nameSpacesExpanded(void);
+ virtual bool nameSpacesExpanded(void) const;
virtual void expandNameSpaces(void);
void deleteExpandedNameSpaces(void);
@@ -123,16 +122,15 @@ public:
virtual void stripComments(void) { keepComments = false;}
virtual void activateComments(void);
- virtual bool getCommentsStatus(void) {return keepComments;}
+ virtual bool getCommentsStatus(void) const {return keepComments;}
// Methods to get output data
// BinInputStream methods:
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill) = 0;
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument() = 0;
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode() = 0;
- virtual const XMLCh * getFragmentId() = 0;
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument() const;
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode() const;
virtual XSECXPathNodeList & getXPathNodeList() {return m_XPathMap;}
// Friends and Statics
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase64.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase64.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase64.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase64.cpp Mon Dec 4 19:03:16 2017
@@ -77,19 +77,19 @@ void TXFMBase64::setInput(TXFMBase *newI
// Methods to get tranform output type and input requirement
-TXFMBase::ioType TXFMBase64::getInputType(void) {
+TXFMBase::ioType TXFMBase64::getInputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::ioType TXFMBase64::getOutputType(void) {
+TXFMBase::ioType TXFMBase64::getOutputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::nodeType TXFMBase64::getNodeType(void) {
+TXFMBase::nodeType TXFMBase64::getNodeType(void) const {
return TXFMBase::DOM_NODE_NONE;
@@ -185,21 +185,3 @@ unsigned int TXFMBase64::readBytes(XMLBy
return ret;
#endif
}
-
-DOMDocument *TXFMBase64::getDocument() {
-
- return NULL;
-
-}
-
-DOMNode * TXFMBase64::getFragmentNode() {
-
- return NULL; // Return a null node
-
-}
-
-const XMLCh * TXFMBase64::getFragmentId() {
-
- return NULL; // Empty string
-
-}
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase64.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase64.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase64.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase64.hpp Mon Dec 4 19:03:16 2017
@@ -47,9 +47,9 @@ public:
// Methods to get tranform output type and input requirement
- virtual TXFMBase::ioType getInputType(void);
- virtual TXFMBase::ioType getOutputType(void);
- virtual nodeType getNodeType(void);
+ virtual TXFMBase::ioType getInputType(void) const;
+ virtual TXFMBase::ioType getOutputType(void) const;
+ virtual nodeType getNodeType(void) const;
// Methods to set input data
@@ -58,9 +58,6 @@ public:
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
- virtual const XMLCh * getFragmentId();
private:
TXFMBase64();
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMC14n.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMC14n.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMC14n.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMC14n.cpp Mon Dec 4 19:03:16 2017
@@ -148,19 +148,19 @@ void TXFMC14n::setInclusive11() {
// Methods to get tranform output type and input requirement
-TXFMBase::ioType TXFMC14n::getInputType(void) {
+TXFMBase::ioType TXFMC14n::getInputType(void) const {
return TXFMBase::DOM_NODES;
}
-TXFMBase::ioType TXFMC14n::getOutputType(void) {
+TXFMBase::ioType TXFMC14n::getOutputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::nodeType TXFMC14n::getNodeType(void) {
+TXFMBase::nodeType TXFMC14n::getNodeType(void) const {
return TXFMBase::DOM_NODE_NONE;
@@ -177,23 +177,3 @@ unsigned int TXFMC14n::readBytes(XMLByte
return (unsigned int) mp_c14n->outputBuffer(toFill, maxToFill);
}
-
-DOMDocument * TXFMC14n::getDocument() {
-
- return NULL;
-
-}
-
-DOMNode * TXFMC14n::getFragmentNode() {
-
- return NULL;
-
-}
-
-const XMLCh * TXFMC14n::getFragmentId() {
-
- return NULL; // Empty string
-
-}
-
-
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMC14n.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMC14n.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMC14n.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMC14n.hpp Mon Dec 4 19:03:16 2017
@@ -53,9 +53,9 @@ public:
// Methods to get tranform output type and input requirement
- virtual TXFMBase::ioType getInputType(void);
- virtual TXFMBase::ioType getOutputType(void);
- virtual TXFMBase::nodeType getNodeType(void);
+ virtual TXFMBase::ioType getInputType(void) const;
+ virtual TXFMBase::ioType getOutputType(void) const;
+ virtual TXFMBase::nodeType getNodeType(void) const;
// Overrid comment acivation
virtual void activateComments(void);
@@ -70,9 +70,6 @@ public:
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
- virtual const XMLCh * getFragmentId();
private:
TXFMC14n();
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.cpp Mon Dec 4 19:03:16 2017
@@ -89,19 +89,19 @@ void TXFMCipher::setInput(TXFMBase *newI
// Methods to get tranform output type and input requirement
-TXFMBase::ioType TXFMCipher::getInputType(void) {
+TXFMBase::ioType TXFMCipher::getInputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::ioType TXFMCipher::getOutputType(void) {
+TXFMBase::ioType TXFMCipher::getOutputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::nodeType TXFMCipher::getNodeType(void) {
+TXFMBase::nodeType TXFMCipher::getNodeType(void) const {
return TXFMBase::DOM_NODE_NONE;
@@ -166,21 +166,3 @@ unsigned int TXFMCipher::readBytes(XMLBy
return ret;
}
-
-DOMDocument *TXFMCipher::getDocument() {
-
- return NULL;
-
-}
-
-DOMNode * TXFMCipher::getFragmentNode() {
-
- return NULL; // Return a null node
-
-}
-
-const XMLCh * TXFMCipher::getFragmentId() {
-
- return NULL; // Empty string
-
-}
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.hpp Mon Dec 4 19:03:16 2017
@@ -57,9 +57,9 @@ public:
// Methods to get tranform output type and input requirement
- virtual TXFMBase::ioType getInputType(void);
- virtual TXFMBase::ioType getOutputType(void);
- virtual nodeType getNodeType(void);
+ virtual TXFMBase::ioType getInputType(void) const;
+ virtual TXFMBase::ioType getOutputType(void) const;
+ virtual nodeType getNodeType(void) const;
// TXFMCipher Unique
@@ -72,9 +72,6 @@ public:
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
- virtual const XMLCh * getFragmentId();
private:
TXFMCipher();
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMConcatChains.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMConcatChains.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMConcatChains.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMConcatChains.cpp Mon Dec 4 19:03:16 2017
@@ -74,19 +74,19 @@ void TXFMConcatChains::setInput(TXFMChai
}
-TXFMBase::ioType TXFMConcatChains::getInputType(void) {
+TXFMBase::ioType TXFMConcatChains::getInputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::ioType TXFMConcatChains::getOutputType(void) {
+TXFMBase::ioType TXFMConcatChains::getOutputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::nodeType TXFMConcatChains::getNodeType(void) {
+TXFMBase::nodeType TXFMConcatChains::getNodeType(void) const {
return TXFMBase::DOM_NODE_NONE;
@@ -135,21 +135,3 @@ unsigned int TXFMConcatChains::readBytes
return bytesRead;
}
-
-DOMDocument *TXFMConcatChains::getDocument() {
-
- return NULL;
-
-}
-DOMNode *TXFMConcatChains::getFragmentNode() {
-
- return NULL;
-
-}
-
-const XMLCh * TXFMConcatChains::getFragmentId() {
-
- return NULL;
-
-}
-
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMConcatChains.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMConcatChains.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMConcatChains.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMConcatChains.hpp Mon Dec 4 19:03:16 2017
@@ -64,16 +64,13 @@ public:
// Methods to get tranform output type and input requirement
- virtual TXFMBase::ioType getInputType(void);
- virtual TXFMBase::ioType getOutputType(void);
- virtual TXFMBase::nodeType getNodeType(void);
+ virtual TXFMBase::ioType getInputType(void) const;
+ virtual TXFMBase::ioType getOutputType(void) const;
+ virtual TXFMBase::nodeType getNodeType(void) const;
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
- virtual const XMLCh * getFragmentId();
private:
TXFMConcatChains();
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMDocObject.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMDocObject.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMDocObject.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMDocObject.cpp Mon Dec 4 19:03:16 2017
@@ -37,7 +37,6 @@ XERCES_CPP_NAMESPACE_USE
TXFMDocObject::TXFMDocObject(DOMDocument *doc) : TXFMBase(doc) {
input = NULL;
- fragmentId = NULL;
type = TXFMBase::DOM_NODE_NONE; // No nodes currently held
mp_env = NULL;
@@ -45,9 +44,6 @@ TXFMDocObject::TXFMDocObject(DOMDocument
TXFMDocObject::~TXFMDocObject() {
- if (fragmentId != NULL)
- XSEC_RELEASE_XMLCH(fragmentId);
-
}
// Methods to set the inputs
@@ -136,7 +132,6 @@ void TXFMDocObject::setInput(DOMDocument
throw XSECException(XSECException::IDNotFoundInDOMDoc);
document = doc;
- fragmentId = XMLString::replicate(newFragmentId);
type = TXFMBase::DOM_NODE_DOCUMENT_FRAGMENT;
}
@@ -170,19 +165,19 @@ void TXFMDocObject::setInput(DOMDocument
// Methods to get tranform output type and input requirement
-TXFMBase::ioType TXFMDocObject::getInputType(void) {
+TXFMBase::ioType TXFMDocObject::getInputType(void) const {
return TXFMBase::NONE;
}
-TXFMBase::ioType TXFMDocObject::getOutputType(void) {
+TXFMBase::ioType TXFMDocObject::getOutputType(void) const {
return TXFMBase::DOM_NODES;
}
-TXFMBase::nodeType TXFMDocObject::getNodeType(void) {
+TXFMBase::nodeType TXFMDocObject::getNodeType(void) const {
return type;
@@ -196,20 +191,14 @@ unsigned int TXFMDocObject::readBytes(XM
}
-DOMDocument * TXFMDocObject::getDocument() {
+DOMDocument * TXFMDocObject::getDocument() const {
return document;
}
-DOMNode * TXFMDocObject::getFragmentNode() {
+DOMNode * TXFMDocObject::getFragmentNode() const {
return fragmentObject;
}
-
-const XMLCh * TXFMDocObject::getFragmentId() {
-
- return fragmentId;
-
-}
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMDocObject.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMDocObject.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMDocObject.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMDocObject.hpp Mon Dec 4 19:03:16 2017
@@ -72,20 +72,18 @@ public:
// Methods to get tranform output type and input requirement
- TXFMBase::ioType getInputType(void);
- TXFMBase::ioType getOutputType(void);
- TXFMBase::nodeType getNodeType(void);
+ TXFMBase::ioType getInputType(void) const;
+ TXFMBase::ioType getOutputType(void) const;
+ TXFMBase::nodeType getNodeType(void) const;
// Methods to get output data
unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * getDocument();
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * getFragmentNode();
- virtual const XMLCh * getFragmentId();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * getDocument() const;
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * getFragmentNode() const;
private:
- XMLCh * fragmentId; // The identifier of the object
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
* document; // The DOM document we are working with
XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMEnvelope.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMEnvelope.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMEnvelope.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMEnvelope.cpp Mon Dec 4 19:03:16 2017
@@ -97,19 +97,19 @@ void TXFMEnvelope::setInput(TXFMBase *ne
// Methods to get tranform output type and input requirement
-TXFMBase::ioType TXFMEnvelope::getInputType(void) {
+TXFMBase::ioType TXFMEnvelope::getInputType(void) const {
return TXFMBase::DOM_NODES;
}
-TXFMBase::ioType TXFMEnvelope::getOutputType(void) {
+TXFMBase::ioType TXFMEnvelope::getOutputType(void) const {
return TXFMBase::DOM_NODES;
}
-TXFMBase::nodeType TXFMEnvelope::getNodeType(void) {
+TXFMBase::nodeType TXFMEnvelope::getNodeType(void) const {
return TXFMBase::DOM_NODE_XPATH_NODESET;
@@ -235,26 +235,8 @@ unsigned int TXFMEnvelope::readBytes(XML
}
-DOMDocument *TXFMEnvelope::getDocument() {
+DOMDocument *TXFMEnvelope::getDocument() const {
return mp_document;
}
-
-DOMNode *TXFMEnvelope::getFragmentNode() {
-
- return NULL;
-
-}
-
-const XMLCh * TXFMEnvelope::getFragmentId() {
-
- return NULL; // Empty string
-
-}
-
-XSECXPathNodeList & TXFMEnvelope::getXPathNodeList() {
-
- return m_XPathMap;
-
-}
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMEnvelope.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMEnvelope.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMEnvelope.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMEnvelope.hpp Mon Dec 4 19:03:16 2017
@@ -58,9 +58,9 @@ public:
// Methods to get tranform output type and input requirement
- virtual TXFMBase::ioType getInputType(void);
- virtual TXFMBase::ioType getOutputType(void);
- virtual TXFMBase::nodeType getNodeType(void);
+ virtual TXFMBase::ioType getInputType(void) const;
+ virtual TXFMBase::ioType getOutputType(void) const;
+ virtual TXFMBase::nodeType getNodeType(void) const;
// Envelope unique
@@ -69,10 +69,7 @@ public:
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
- virtual const XMLCh * getFragmentId();
- virtual XSECXPathNodeList & getXPathNodeList();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument() const;
private:
TXFMEnvelope();
};
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.cpp Mon Dec 4 19:03:16 2017
@@ -79,19 +79,20 @@ TXFMMD5::~TXFMMD5() {
// Methods to get tranform output type and input requirement
-TXFMBase::ioType TXFMMD5::getInputType(void) {
+TXFMBase::ioType TXFMMD5::getInputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::ioType TXFMMD5::getOutputType(void) {
+
+TXFMBase::ioType TXFMMD5::getOutputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::nodeType TXFMMD5::getNodeType(void) {
+TXFMBase::nodeType TXFMMD5::getNodeType(void) const {
return TXFMBase::DOM_NODE_NONE;
@@ -148,21 +149,3 @@ unsigned int TXFMMD5::readBytes(XMLByte
return ret;
}
-
-DOMDocument * TXFMMD5::getDocument() {
-
- return NULL;
-
-}
-
-DOMNode * TXFMMD5::getFragmentNode() {
-
- return NULL; // Return a null node
-
-};
-
-const XMLCh * TXFMMD5::getFragmentId() {
-
- return NULL; // Empty string
-
-}
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.hpp Mon Dec 4 19:03:16 2017
@@ -58,9 +58,9 @@ public:
// Methods to get tranform output type and input requirement
- virtual TXFMBase::ioType getInputType(void);
- virtual TXFMBase::ioType getOutputType(void);
- virtual nodeType getNodeType(void);
+ virtual TXFMBase::ioType getInputType(void) const;
+ virtual TXFMBase::ioType getOutputType(void) const;
+ virtual nodeType getNodeType(void) const;
// Methods to set input data
@@ -69,9 +69,6 @@ public:
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
- virtual const XMLCh * getFragmentId();
private:
TXFMMD5();
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMOutputFile.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMOutputFile.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMOutputFile.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMOutputFile.cpp Mon Dec 4 19:03:16 2017
@@ -79,20 +79,20 @@ bool TXFMOutputFile::setFile(char * cons
// Methods to get tranform output type and input requirement
-TXFMBase::ioType TXFMOutputFile::getInputType(void) {
+TXFMBase::ioType TXFMOutputFile::getInputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::ioType TXFMOutputFile::getOutputType(void) {
+TXFMBase::ioType TXFMOutputFile::getOutputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::nodeType TXFMOutputFile::getNodeType(void) {
+TXFMBase::nodeType TXFMOutputFile::getNodeType(void) const {
return TXFMBase::DOM_NODE_NONE;
@@ -113,21 +113,3 @@ unsigned int TXFMOutputFile::readBytes(X
return sz;
}
-
-DOMDocument * TXFMOutputFile::getDocument() {
-
- return NULL;
-
-}
-
-DOMNode * TXFMOutputFile::getFragmentNode() {
-
- return NULL;
-
-};
-
-const XMLCh * TXFMOutputFile::getFragmentId() {
-
- return NULL; // Empty string
-
-}
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMOutputFile.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMOutputFile.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMOutputFile.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMOutputFile.hpp Mon Dec 4 19:03:16 2017
@@ -66,9 +66,9 @@ public:
// Methods to get tranform output type and input requirement
- virtual TXFMBase::ioType getInputType(void);
- virtual TXFMBase::ioType getOutputType(void);
- virtual TXFMBase::nodeType getNodeType(void);
+ virtual TXFMBase::ioType getInputType(void) const;
+ virtual TXFMBase::ioType getOutputType(void) const;
+ virtual TXFMBase::nodeType getNodeType(void) const;
// Set output file
@@ -77,9 +77,6 @@ public:
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
- virtual const XMLCh * getFragmentId();
private:
TXFMOutputFile();
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMParser.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMParser.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMParser.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMParser.cpp Mon Dec 4 19:03:16 2017
@@ -69,7 +69,7 @@ TXFMParser::~TXFMParser() {
// For expanding name spaces when necessary
// -----------------------------------------------------------------------
-bool TXFMParser::nameSpacesExpanded(void) {
+bool TXFMParser::nameSpacesExpanded(void) const {
// NOTE : Do not check inputs as this has its own document
@@ -135,19 +135,20 @@ void TXFMParser::setInput(TXFMBase *newI
// Methods to get tranform output type and input requirement
-TXFMBase::ioType TXFMParser::getInputType(void) {
+TXFMBase::ioType TXFMParser::getInputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::ioType TXFMParser::getOutputType(void) {
+
+TXFMBase::ioType TXFMParser::getOutputType(void) const {
return TXFMBase::DOM_NODES;
}
-TXFMBase::nodeType TXFMParser::getNodeType(void) {
+TXFMBase::nodeType TXFMParser::getNodeType(void) const {
return TXFMBase::DOM_NODE_DOCUMENT;
@@ -161,20 +162,8 @@ unsigned int TXFMParser::readBytes(XMLBy
}
-DOMDocument *TXFMParser::getDocument() {
+DOMDocument *TXFMParser::getDocument() const {
return mp_parsedDoc;
}
-
-DOMNode * TXFMParser::getFragmentNode() {
-
- return NULL; // Return a null node
-
-}
-
-const XMLCh * TXFMParser::getFragmentId() {
-
- return NULL; // Empty string
-
-}
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMParser.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMParser.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMParser.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMParser.hpp Mon Dec 4 19:03:16 2017
@@ -55,9 +55,9 @@ public:
// Methods to get tranform output type and input requirement
- virtual TXFMBase::ioType getInputType(void);
- virtual TXFMBase::ioType getOutputType(void);
- virtual nodeType getNodeType(void);
+ virtual TXFMBase::ioType getInputType(void) const;
+ virtual TXFMBase::ioType getOutputType(void) const;
+ virtual nodeType getNodeType(void) const;
// Methods to set input data
@@ -66,12 +66,10 @@ public:
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
- virtual const XMLCh * getFragmentId();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument() const;
// Name space management
- virtual bool nameSpacesExpanded(void);
+ virtual bool nameSpacesExpanded(void) const;
virtual void expandNameSpaces(void);
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSB.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSB.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSB.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSB.cpp Mon Dec 4 19:03:16 2017
@@ -83,20 +83,20 @@ void TXFMSB::setInput(const safeBuffer&
// Methods to get tranform output type and input requirement
-TXFMBase::ioType TXFMSB::getInputType(void) {
+TXFMBase::ioType TXFMSB::getInputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::ioType TXFMSB::getOutputType(void) {
+TXFMBase::ioType TXFMSB::getOutputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::nodeType TXFMSB::getNodeType(void) {
+TXFMBase::nodeType TXFMSB::getNodeType(void) const {
return TXFMBase::DOM_NODE_NONE;
@@ -134,21 +134,3 @@ unsigned int TXFMSB::readBytes(XMLByte *
return ret;
}
-
-DOMDocument *TXFMSB::getDocument() {
-
- return NULL;
-
-};
-
-DOMNode * TXFMSB::getFragmentNode() {
-
- return NULL;
-
-};
-
-const XMLCh * TXFMSB::getFragmentId() {
-
- return NULL; // Empty string
-
-}
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSB.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSB.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSB.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSB.hpp Mon Dec 4 19:03:16 2017
@@ -58,16 +58,13 @@ public:
// Methods to get tranform output type and input requirement
- virtual TXFMBase::ioType getInputType(void);
- virtual TXFMBase::ioType getOutputType(void);
- virtual nodeType getNodeType(void);
+ virtual TXFMBase::ioType getInputType(void) const;
+ virtual TXFMBase::ioType getOutputType(void) const;
+ virtual nodeType getNodeType(void) const;
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
- virtual const XMLCh * getFragmentId();
private:
TXFMSB();
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.cpp Mon Dec 4 19:03:16 2017
@@ -102,19 +102,19 @@ TXFMSHA1::~TXFMSHA1() {
// Methods to get tranform output type and input requirement
-TXFMBase::ioType TXFMSHA1::getInputType(void) {
+TXFMBase::ioType TXFMSHA1::getInputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::ioType TXFMSHA1::getOutputType(void) {
+TXFMBase::ioType TXFMSHA1::getOutputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::nodeType TXFMSHA1::getNodeType(void) {
+TXFMBase::nodeType TXFMSHA1::getNodeType(void) const {
return TXFMBase::DOM_NODE_NONE;
@@ -178,21 +178,3 @@ unsigned int TXFMSHA1::readBytes(XMLByte
return ret;
}
-
-DOMDocument * TXFMSHA1::getDocument() {
-
- return NULL;
-
-}
-
-DOMNode * TXFMSHA1::getFragmentNode() {
-
- return NULL; // Return a null node
-
-};
-
-const XMLCh * TXFMSHA1::getFragmentId() {
-
- return NULL; // Empty string
-
-}
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.hpp Mon Dec 4 19:03:16 2017
@@ -53,9 +53,9 @@ public:
// Methods to get tranform output type and input requirement
- virtual TXFMBase::ioType getInputType(void);
- virtual TXFMBase::ioType getOutputType(void);
- virtual nodeType getNodeType(void);
+ virtual TXFMBase::ioType getInputType(void) const;
+ virtual TXFMBase::ioType getOutputType(void) const;
+ virtual nodeType getNodeType(void) const;
// Methods to set input data
@@ -64,9 +64,6 @@ public:
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
- virtual const XMLCh * getFragmentId();
private:
TXFMSHA1();
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMURL.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMURL.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMURL.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMURL.cpp Mon Dec 4 19:03:16 2017
@@ -93,19 +93,19 @@ void TXFMURL::setInput(BinInputStream *
// Methods to get tranform output type and input requirement
-TXFMBase::ioType TXFMURL::getInputType(void) {
+TXFMBase::ioType TXFMURL::getInputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::ioType TXFMURL::getOutputType(void) {
+TXFMBase::ioType TXFMURL::getOutputType(void) const {
return TXFMBase::BYTE_STREAM;
}
-TXFMBase::nodeType TXFMURL::getNodeType(void) {
+TXFMBase::nodeType TXFMURL::getNodeType(void) const {
return TXFMBase::DOM_NODE_NONE;
@@ -141,21 +141,3 @@ unsigned int TXFMURL::readBytes(XMLByte
return ret;
}
-
-DOMDocument *TXFMURL::getDocument() {
-
- return NULL;
-
-};
-
-DOMNode *TXFMURL::getFragmentNode() {
-
- return NULL;
-
-};
-
-const XMLCh * TXFMURL::getFragmentId() {
-
- return NULL; // Empty string
-
-}
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMURL.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMURL.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMURL.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMURL.hpp Mon Dec 4 19:03:16 2017
@@ -64,16 +64,13 @@ public:
// Methods to get tranform output type and input requirement
- virtual TXFMBase::ioType getInputType(void);
- virtual TXFMBase::ioType getOutputType(void);
- virtual nodeType getNodeType(void);
+ virtual TXFMBase::ioType getInputType(void) const;
+ virtual TXFMBase::ioType getOutputType(void) const;
+ virtual nodeType getNodeType(void) const;
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
- virtual const XMLCh * getFragmentId();
private :
TXFMURL();
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.cpp Mon Dec 4 19:03:16 2017
@@ -539,18 +539,18 @@ void TXFMXPath::evaluateEnvelope(DOMNode
// Methods to get tranform output type and input requirement
-TXFMBase::ioType TXFMXPath::getInputType(void) {
+TXFMBase::ioType TXFMXPath::getInputType(void) const {
return TXFMBase::DOM_NODES;
}
-TXFMBase::ioType TXFMXPath::getOutputType(void) {
+TXFMBase::ioType TXFMXPath::getOutputType(void) const {
return TXFMBase::DOM_NODES;
}
-TXFMBase::nodeType TXFMXPath::getNodeType(void) {
+TXFMBase::nodeType TXFMXPath::getNodeType(void) const {
return TXFMBase::DOM_NODE_XPATH_NODESET;
@@ -564,28 +564,10 @@ unsigned int TXFMXPath::readBytes(XMLByt
}
-DOMDocument *TXFMXPath::getDocument() {
+DOMDocument *TXFMXPath::getDocument() const {
return document;
}
-DOMNode *TXFMXPath::getFragmentNode() {
-
- return NULL;
-
-}
-
-const XMLCh * TXFMXPath::getFragmentId() {
-
- return NULL; // Empty string
-
-}
-
-XSECXPathNodeList & TXFMXPath::getXPathNodeList() {
-
- return m_XPathMap;
-
-}
-
#endif /* XSEC_HAVE_XPATH */
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.hpp Mon Dec 4 19:03:16 2017
@@ -91,9 +91,9 @@ public:
// Methods to get tranform output type and input requirement
- virtual TXFMBase::ioType getInputType(void);
- virtual TXFMBase::ioType getOutputType(void);
- virtual TXFMBase::nodeType getNodeType(void);
+ virtual TXFMBase::ioType getInputType(void) const;
+ virtual TXFMBase::ioType getOutputType(void) const;
+ virtual TXFMBase::nodeType getNodeType(void) const;
// XPath unique
@@ -104,10 +104,7 @@ public:
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
- virtual const XMLCh * getFragmentId();
- virtual XSECXPathNodeList & getXPathNodeList();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument() const;
private:
TXFMXPath();
};
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.cpp Mon Dec 4 19:03:16 2017
@@ -695,18 +695,18 @@ void TXFMXPathFilter::evaluateExprs(DSIG
// Methods to get tranform output type and input requirement
-TXFMBase::ioType TXFMXPathFilter::getInputType(void) {
+TXFMBase::ioType TXFMXPathFilter::getInputType(void) const {
return TXFMBase::DOM_NODES;
}
-TXFMBase::ioType TXFMXPathFilter::getOutputType(void) {
+TXFMBase::ioType TXFMXPathFilter::getOutputType(void) const {
return TXFMBase::DOM_NODES;
}
-TXFMBase::nodeType TXFMXPathFilter::getNodeType(void) {
+TXFMBase::nodeType TXFMXPathFilter::getNodeType(void) const {
return TXFMBase::DOM_NODE_XPATH_NODESET;
@@ -720,24 +720,12 @@ unsigned int TXFMXPathFilter::readBytes(
}
-DOMDocument *TXFMXPathFilter::getDocument() {
+DOMDocument *TXFMXPathFilter::getDocument() const {
return document;
}
-DOMNode *TXFMXPathFilter::getFragmentNode() {
-
- return NULL;
-
-}
-
-const XMLCh * TXFMXPathFilter::getFragmentId() {
-
- return NULL; // Empty string
-
-}
-
XSECXPathNodeList & TXFMXPathFilter::getXPathNodeList() {
return m_xpathFilterMap;
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.hpp Mon Dec 4 19:03:16 2017
@@ -73,9 +73,9 @@ public:
// Methods to get tranform output type and input requirement
- virtual TXFMBase::ioType getInputType(void);
- virtual TXFMBase::ioType getOutputType(void);
- virtual TXFMBase::nodeType getNodeType(void);
+ virtual TXFMBase::ioType getInputType(void) const;
+ virtual TXFMBase::ioType getOutputType(void) const;
+ virtual TXFMBase::nodeType getNodeType(void) const;
// XPathFilter unique
@@ -85,9 +85,7 @@ public:
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
- virtual const XMLCh * getFragmentId();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument() const;
virtual XSECXPathNodeList & getXPathNodeList();
private:
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.cpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.cpp Mon Dec 4 19:03:16 2017
@@ -75,7 +75,7 @@ CallbackSizeType TransformXSLOutputFn(co
// For expanding name spaces when necessary
// -----------------------------------------------------------------------
-bool TXFMXSL::nameSpacesExpanded(void) {
+bool TXFMXSL::nameSpacesExpanded(void) const {
// NOTE : Do not check inputs as this has its own document
@@ -204,18 +204,18 @@ void TXFMXSL::evaluateStyleSheet(const s
// Methods to get tranform output type and input requirement
-TXFMBase::ioType TXFMXSL::getInputType(void) {
+TXFMBase::ioType TXFMXSL::getInputType(void) const {
return TXFMBase::DOM_NODES;
}
-TXFMBase::ioType TXFMXSL::getOutputType(void) {
+TXFMBase::ioType TXFMXSL::getOutputType(void) const {
return TXFMBase::DOM_NODES;
}
-TXFMBase::nodeType TXFMXSL::getNodeType(void) {
+TXFMBase::nodeType TXFMXSL::getNodeType(void) const {
return TXFMBase::DOM_NODE_DOCUMENT;
@@ -229,22 +229,10 @@ unsigned int TXFMXSL::readBytes(XMLByte
}
-DOMDocument * TXFMXSL::getDocument() {
+DOMDocument * TXFMXSL::getDocument() const {
return docOut;
}
-DOMNode * TXFMXSL::getFragmentNode() {
-
- return NULL;
-
-}
-
-const XMLCh * TXFMXSL::getFragmentId() {
-
- return NULL; // Empty string
-
-}
-
#endif /* XSEC_HAVE_XSLT */
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.hpp?rev=1817117&r1=1817116&r2=1817117&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.hpp Mon Dec 4 19:03:16 2017
@@ -88,13 +88,13 @@ public:
// Methods to get tranform output type and input requirement
- virtual TXFMBase::ioType getInputType(void);
- virtual TXFMBase::ioType getOutputType(void);
- virtual nodeType getNodeType(void);
+ virtual TXFMBase::ioType getInputType(void) const;
+ virtual TXFMBase::ioType getOutputType(void) const;
+ virtual nodeType getNodeType(void) const;
// We do our own name spaces - we have a new document!
- virtual bool nameSpacesExpanded(void);
+ virtual bool nameSpacesExpanded(void) const;
virtual void expandNameSpaces(void);
@@ -105,9 +105,7 @@ public:
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
- virtual const XMLCh * getFragmentId();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument() const;
private:
TXFMXSL();