Header cleanup.

git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-cpp/trunk@1833341 13f79535-47bb-0310-9956-ffa450edef68
apache · Jun 11, 2018 · 875eee5 · 875eee5
1 parent 67318f1
commit 875eee5
Show file tree

Hide file tree

Showing 61 changed files with 179 additions and 155 deletions.
diff --git a/xsec/canon/XSECC14n20010315.cpp b/xsec/canon/XSECC14n20010315.cpp
@@ -33,9 +33,10 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/canon/XSECC14n20010315.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/utils/XSECSafeBufferFormatter.hpp>
 
+#include "../utils/XSECDOMUtils.hpp"
+
 // Xerces includes
 #include <xercesc/dom/DOMElement.hpp>
 #include <xercesc/dom/DOMNamedNodeMap.hpp>

diff --git a/xsec/canon/XSECCanon.cpp b/xsec/canon/XSECCanon.cpp
@@ -31,7 +31,8 @@
  */
 
 #include <xsec/canon/XSECCanon.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
 
 #include <memory.h>
 

diff --git a/xsec/canon/XSECXMLNSStack.cpp b/xsec/canon/XSECXMLNSStack.cpp
@@ -30,9 +30,10 @@
 // XSEC
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/canon/XSECXMLNSStack.hpp>
 
+#include "../utils/XSECDOMUtils.hpp"
+
 // Xerces
 
 XERCES_CPP_NAMESPACE_USE

diff --git a/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp b/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp
@@ -29,17 +29,17 @@
 
 // XSEC Includes
 
-#include <xsec/framework/XSECDefs.hpp>
 
 #include <xsec/dsig/DSIGAlgorithmHandlerDefault.hpp>
 #include <xsec/enc/XSECCryptoKey.hpp>
+#include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/transformers/TXFMChain.hpp>
 #include <xsec/transformers/TXFMBase64.hpp>
 #include <xsec/transformers/TXFMHash.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
 
 #include "../utils/XSECAlgorithmSupport.hpp"
+#include "../utils/XSECDOMUtils.hpp"
 
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/util/Janitor.hpp>

diff --git a/xsec/dsig/DSIGConstants.cpp b/xsec/dsig/DSIGConstants.cpp
@@ -29,7 +29,8 @@
  */
 
 #include <xsec/dsig/DSIGConstants.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
 
 #include <xercesc/util/XMLUniDefs.hpp>
 

diff --git a/xsec/dsig/DSIGKeyInfoDEREncoded.cpp b/xsec/dsig/DSIGKeyInfoDEREncoded.cpp
@@ -30,10 +30,11 @@
 
 #include <xsec/dsig/DSIGKeyInfoDEREncoded.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/dsig/DSIGSignature.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 
+#include "../utils/XSECDOMUtils.hpp"
+
 #include <xercesc/util/Janitor.hpp>
 
 XERCES_CPP_NAMESPACE_USE

diff --git a/xsec/dsig/DSIGKeyInfoList.cpp b/xsec/dsig/DSIGKeyInfoList.cpp
@@ -39,14 +39,14 @@
 #include <xsec/dsig/DSIGKeyInfoMgmtData.hpp>
 #include <xsec/dsig/DSIGKeyInfoExt.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/dsig/DSIGSignature.hpp>
 #include <xsec/dsig/DSIGReference.hpp>
 #include <xsec/dsig/DSIGTransformList.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/transformers/TXFMChain.hpp>
 #include <xsec/transformers/TXFMBase.hpp>
 
+#include "../utils/XSECDOMUtils.hpp"
 #include "../xenc/impl/XENCEncryptedKeyImpl.hpp"
 
 #include <xercesc/util/Janitor.hpp>

diff --git a/xsec/dsig/DSIGKeyInfoMgmtData.cpp b/xsec/dsig/DSIGKeyInfoMgmtData.cpp
@@ -30,10 +30,11 @@
 
 #include <xsec/dsig/DSIGKeyInfoMgmtData.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/dsig/DSIGSignature.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 
+#include "../utils/XSECDOMUtils.hpp"
+
 #include <xercesc/util/Janitor.hpp>
 
 XERCES_CPP_NAMESPACE_USE

diff --git a/xsec/dsig/DSIGKeyInfoName.cpp b/xsec/dsig/DSIGKeyInfoName.cpp
@@ -29,11 +29,12 @@
  */
 
 #include <xsec/dsig/DSIGKeyInfoName.hpp>
-#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/dsig/DSIGSignature.hpp>
 #include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
+#include <xsec/utils/XSECPlatformUtils.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
 
 XERCES_CPP_NAMESPACE_USE
 

diff --git a/xsec/dsig/DSIGKeyInfoPGPData.cpp b/xsec/dsig/DSIGKeyInfoPGPData.cpp
@@ -31,11 +31,10 @@
 #include <xsec/dsig/DSIGKeyInfoPGPData.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/dsig/DSIGSignature.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 
-#include <xercesc/util/Janitor.hpp>
+#include "../utils/XSECDOMUtils.hpp"
 
 XERCES_CPP_NAMESPACE_USE
 

diff --git a/xsec/dsig/DSIGKeyInfoValue.cpp b/xsec/dsig/DSIGKeyInfoValue.cpp
@@ -27,11 +27,12 @@
  */
 
 #include <xsec/dsig/DSIGKeyInfoValue.hpp>
-#include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/framework/XSECException.hpp>
 #include <xsec/dsig/DSIGSignature.hpp>
+#include <xsec/framework/XSECException.hpp>
 #include <xsec/framework/XSECEnv.hpp>
+#include <xsec/utils/XSECPlatformUtils.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
 
 XERCES_CPP_NAMESPACE_USE
 

diff --git a/xsec/dsig/DSIGKeyInfoX509.cpp b/xsec/dsig/DSIGKeyInfoX509.cpp
@@ -28,13 +28,13 @@
  */
 
 #include <xsec/dsig/DSIGKeyInfoX509.hpp>
-#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/dsig/DSIGSignature.hpp>
 #include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
+#include <xsec/utils/XSECPlatformUtils.hpp>
 
 #include "../utils/XSECAutoPtr.hpp"
+#include "../utils/XSECDOMUtils.hpp"
 
 XERCES_CPP_NAMESPACE_USE
 

diff --git a/xsec/dsig/DSIGObject.cpp b/xsec/dsig/DSIGObject.cpp
@@ -29,12 +29,13 @@
 
 // XSEC Includes
 
+#include <xsec/dsig/DSIGConstants.hpp>
+#include <xsec/dsig/DSIGObject.hpp>
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/dsig/DSIGConstants.hpp>
-#include <xsec/dsig/DSIGObject.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
 
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>

diff --git a/xsec/dsig/DSIGObject.hpp b/xsec/dsig/DSIGObject.hpp
@@ -34,6 +34,7 @@
 
 #include <xsec/framework/XSECDefs.hpp>
 
+XSEC_DECLARE_XERCES_CLASS(DOMElement);
 XSEC_DECLARE_XERCES_CLASS(DOMNode);
 
 class XSECEnv;

diff --git a/xsec/dsig/DSIGReference.cpp b/xsec/dsig/DSIGReference.cpp
@@ -55,9 +55,10 @@
 #include <xsec/framework/XSECAlgorithmHandler.hpp>
 #include <xsec/framework/XSECAlgorithmMapper.hpp>
 #include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/utils/XSECBinTXFMInputStream.hpp>
 
+#include "../utils/XSECDOMUtils.hpp"
+
 // Xerces
 
 #include <xercesc/util/XMLNetAccessor.hpp>

diff --git a/xsec/dsig/DSIGReferenceList.hpp b/xsec/dsig/DSIGReferenceList.hpp
@@ -32,7 +32,6 @@
 
 // XSEC Includes
 #include <xsec/framework/XSECDefs.hpp>
-//#include <dsig/DSIGReference.hpp>
 
 // General includes
 #include <vector>

diff --git a/xsec/dsig/DSIGSignature.cpp b/xsec/dsig/DSIGSignature.cpp
@@ -56,10 +56,10 @@
 #include <xsec/transformers/TXFMC14n.hpp>
 #include <xsec/transformers/TXFMChain.hpp>
 #include <xsec/utils/XSECBinTXFMInputStream.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/utils/XSECPlatformUtils.hpp>
 
 #include "../utils/XSECAlgorithmSupport.hpp"
+#include "../utils/XSECDOMUtils.hpp"
 
 // Xerces includes
 

diff --git a/xsec/dsig/DSIGSignedInfo.cpp b/xsec/dsig/DSIGSignedInfo.cpp
@@ -27,12 +27,13 @@
  */
 
 // XSEC Includes
-#include <xsec/dsig/DSIGSignedInfo.hpp>
 #include <xsec/dsig/DSIGReference.hpp>
-#include <xsec/framework/XSECError.hpp>
-#include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+#include <xsec/dsig/DSIGSignedInfo.hpp>
 #include <xsec/dsig/DSIGSignature.hpp>
+#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
 
 #include <xercesc/util/Janitor.hpp>
 

diff --git a/xsec/dsig/DSIGTransformBase64.cpp b/xsec/dsig/DSIGTransformBase64.cpp
@@ -30,14 +30,15 @@
 
 #include <xsec/dsig/DSIGTransformBase64.hpp>
 #include <xsec/dsig/DSIGSignature.hpp>
+#include <xsec/framework/XSECException.hpp>
+#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
 #include <xsec/transformers/TXFMBase64.hpp>
 #include <xsec/transformers/TXFMC14n.hpp>
 #include <xsec/transformers/TXFMChain.hpp>
 #include <xsec/transformers/TXFMXPath.hpp>
-#include <xsec/framework/XSECException.hpp>
-#include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/framework/XSECError.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
 
 XERCES_CPP_NAMESPACE_USE
 

diff --git a/xsec/dsig/DSIGTransformC14n.cpp b/xsec/dsig/DSIGTransformC14n.cpp
@@ -26,15 +26,13 @@
  *
  */
 
+#include <xsec/dsig/DSIGSignature.hpp>
 #include <xsec/dsig/DSIGTransformC14n.hpp>
+#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECException.hpp>
 #include <xsec/transformers/TXFMC14n.hpp>
 #include <xsec/transformers/TXFMChain.hpp>
-#include <xsec/framework/XSECError.hpp>
-#include <xsec/framework/XSECEnv.hpp>
-#include <xsec/dsig/DSIGSignature.hpp>
-
-#include <xercesc/util/Janitor.hpp>
 
 #include "../utils/XSECAlgorithmSupport.hpp"
 #include "../utils/XSECDOMUtils.hpp"

diff --git a/xsec/dsig/DSIGTransformEnvelope.cpp b/xsec/dsig/DSIGTransformEnvelope.cpp
@@ -30,14 +30,15 @@
 
 #include <xsec/dsig/DSIGTransformEnvelope.hpp>
 #include <xsec/dsig/DSIGSignature.hpp>
+#include <xsec/framework/XSECException.hpp>
+#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
 #include <xsec/transformers/TXFMEnvelope.hpp>
 #include <xsec/transformers/TXFMC14n.hpp>
 #include <xsec/transformers/TXFMChain.hpp>
 #include <xsec/transformers/TXFMXPath.hpp>
-#include <xsec/framework/XSECException.hpp>
-#include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/framework/XSECError.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
 
 XERCES_CPP_NAMESPACE_USE
 

diff --git a/xsec/dsig/DSIGTransformXPath.cpp b/xsec/dsig/DSIGTransformXPath.cpp
@@ -26,20 +26,18 @@
  *
  */
 
-
+#include <xsec/dsig/DSIGSignature.hpp>
 #include <xsec/dsig/DSIGTransformXPath.hpp>
 #include <xsec/transformers/TXFMXPath.hpp>
+#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECException.hpp>
 #include <xsec/transformers/TXFMC14n.hpp>
 #include <xsec/transformers/TXFMChain.hpp>
-#include <xsec/framework/XSECError.hpp>
-#include <xsec/framework/XSECEnv.hpp>
-#include <xsec/dsig/DSIGSignature.hpp>
-
-#include <xercesc/util/Janitor.hpp>
 
 #include "../utils/XSECDOMUtils.hpp"
 
+
 XERCES_CPP_NAMESPACE_USE
 
 // --------------------------------------------------------------------------------

diff --git a/xsec/dsig/DSIGTransformXPathFilter.cpp b/xsec/dsig/DSIGTransformXPathFilter.cpp
@@ -29,18 +29,18 @@
  *
  */
 
+#include <xsec/dsig/DSIGSignature.hpp>
 #include <xsec/dsig/DSIGTransformXPathFilter.hpp>
 #include <xsec/dsig/DSIGXPathFilterExpr.hpp>
-#include <xsec/dsig/DSIGSignature.hpp>
-#include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
 #include <xsec/transformers/TXFMXPathFilter.hpp>
 #include <xsec/transformers/TXFMChain.hpp>
 
-#include <xercesc/dom/DOMNode.hpp>
-
 #include "../utils/XSECDOMUtils.hpp"
 
+#include <xercesc/dom/DOMNode.hpp>
+
 XERCES_CPP_NAMESPACE_USE
 
 // --------------------------------------------------------------------------------

diff --git a/xsec/dsig/DSIGTransformXSL.cpp b/xsec/dsig/DSIGTransformXSL.cpp
@@ -28,15 +28,16 @@
 
 // XSEC
 
-#include <xsec/dsig/DSIGTransformXSL.hpp>
 #include <xsec/dsig/DSIGSignature.hpp>
+#include <xsec/dsig/DSIGTransformXSL.hpp>
+#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
+#include <xsec/framework/XSECException.hpp>
 #include <xsec/transformers/TXFMXSL.hpp>
 #include <xsec/transformers/TXFMC14n.hpp>
 #include <xsec/transformers/TXFMChain.hpp>
-#include <xsec/framework/XSECException.hpp>
-#include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/framework/XSECError.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
 
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/framework/MemBufFormatTarget.hpp>

diff --git a/xsec/dsig/DSIGXPathFilterExpr.cpp b/xsec/dsig/DSIGXPathFilterExpr.cpp
@@ -28,18 +28,18 @@
  *
  */
 
-#include <xsec/framework/XSECDefs.hpp>
-#include <xsec/dsig/DSIGXPathFilterExpr.hpp>
 #include <xsec/dsig/DSIGSignature.hpp>
+#include <xsec/dsig/DSIGXPathFilterExpr.hpp>
+#include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECException.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 
+#include "../utils/XSECDOMUtils.hpp"
+
 #include <xercesc/dom/DOMNode.hpp>
 #include <xercesc/dom/DOMNamedNodeMap.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
 
-#include "../utils/XSECDOMUtils.hpp"
-
 XERCES_CPP_NAMESPACE_USE
 
 XMLCh filterStr[] = {