Removed unnecessary class from string literals.

[shibboleth/xmltooling.git] / xmltooling / soap / impl / SOAPSchemaValidators.cpp

diff --git a/xmltooling/soap/impl/SOAPSchemaValidators.cpp b/xmltooling/soap/impl/SOAPSchemaValidators.cpp
index bd4f71e..cb6492e 100644 (file)
--- a/xmltooling/soap/impl/SOAPSchemaValidators.cpp
+++ b/xmltooling/soap/impl/SOAPSchemaValidators.cpp
@@ -23,10 +23,12 @@
 #include "internal.h"
 #include "exceptions.h"
 #include "soap/SOAP.h"
+#include "validation/ValidatorSuite.h"
 
 using namespace soap11;
 using namespace xmltooling;
 using namespace std;
+using xmlconstants::SOAP11ENV_NS;
 
 namespace {
 
@@ -51,12 +53,12 @@ namespace {
 #define REGISTER_ELEMENT(namespaceURI,cname) \
     q=QName(namespaceURI,cname::LOCAL_NAME); \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
-    SOAPSchemaValidators.registerValidator(q,new cname##SchemaValidator())
+    SchemaValidators.registerValidator(q,new cname##SchemaValidator())
     
 #define REGISTER_TYPE(namespaceURI,cname) \
     q=QName(namespaceURI,cname::TYPE_NAME); \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
-    SOAPSchemaValidators.registerValidator(q,new cname##SchemaValidator())
+    SchemaValidators.registerValidator(q,new cname##SchemaValidator())
 
 #define REGISTER_ELEMENT_NOVAL(namespaceURI,cname) \
     q=QName(namespaceURI,cname::LOCAL_NAME); \
@@ -66,22 +68,20 @@ namespace {
     q=QName(namespaceURI,cname::TYPE_NAME); \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
 
-ValidatorSuite soap11::SOAPSchemaValidators("SOAPSchemaValidators");
-
 void soap11::registerSOAPClasses()
 {
     QName q;
-    REGISTER_ELEMENT_NOVAL(XMLConstants::SOAP11ENV_NS,Body);
-    REGISTER_ELEMENT_NOVAL(XMLConstants::SOAP11ENV_NS,Detail);
-    REGISTER_ELEMENT(XMLConstants::SOAP11ENV_NS,Envelope);
-    REGISTER_ELEMENT(XMLConstants::SOAP11ENV_NS,Fault);
-    REGISTER_ELEMENT(XMLConstants::SOAP11ENV_NS,Faultactor);
-    REGISTER_ELEMENT(XMLConstants::SOAP11ENV_NS,Faultcode);
-    REGISTER_ELEMENT(XMLConstants::SOAP11ENV_NS,Faultstring);
-    REGISTER_ELEMENT_NOVAL(XMLConstants::SOAP11ENV_NS,Header);
-    REGISTER_TYPE_NOVAL(XMLConstants::SOAP11ENV_NS,Body);
-    REGISTER_TYPE_NOVAL(XMLConstants::SOAP11ENV_NS,Detail);
-    REGISTER_TYPE(XMLConstants::SOAP11ENV_NS,Envelope);
-    REGISTER_TYPE(XMLConstants::SOAP11ENV_NS,Fault);
-    REGISTER_TYPE_NOVAL(XMLConstants::SOAP11ENV_NS,Header);
+    REGISTER_ELEMENT_NOVAL(SOAP11ENV_NS,Body);
+    REGISTER_ELEMENT_NOVAL(SOAP11ENV_NS,Detail);
+    REGISTER_ELEMENT(SOAP11ENV_NS,Envelope);
+    REGISTER_ELEMENT(SOAP11ENV_NS,Fault);
+    REGISTER_ELEMENT(SOAP11ENV_NS,Faultactor);
+    REGISTER_ELEMENT(SOAP11ENV_NS,Faultcode);
+    REGISTER_ELEMENT(SOAP11ENV_NS,Faultstring);
+    REGISTER_ELEMENT_NOVAL(SOAP11ENV_NS,Header);
+    REGISTER_TYPE_NOVAL(SOAP11ENV_NS,Body);
+    REGISTER_TYPE_NOVAL(SOAP11ENV_NS,Detail);
+    REGISTER_TYPE(SOAP11ENV_NS,Envelope);
+    REGISTER_TYPE(SOAP11ENV_NS,Fault);
+    REGISTER_TYPE_NOVAL(SOAP11ENV_NS,Header);
 }