Evolving macros, reduce casting in accessors, add const collection access.

[shibboleth/cpp-xmltooling.git] / xmltooling / signature / Signature.h

diff --git a/xmltooling/signature/Signature.h b/xmltooling/signature/Signature.h
index bf886fc..707ad2c 100644 (file)
--- a/xmltooling/signature/Signature.h
+++ b/xmltooling/signature/Signature.h
@@ -39,9 +39,6 @@ namespace xmltooling {
     public:\r
         virtual ~Signature() {}\r
 \r
-        /** Element prefix */\r
-        static const XMLCh PREFIX[];\r
-\r
         /** Element local name */\r
         static const XMLCh LOCAL_NAME[];\r
 \r
@@ -79,28 +76,24 @@ namespace xmltooling {
         Signature() {}\r
     };\r
 \r
-#ifdef XMLTOOLING_DEFINE_CONSTANTS\r
-    const XMLCh Signature::LOCAL_NAME[] = {\r
-        chLatin_S, chLatin_i, chLatin_g, chLatin_n, chLatin_a, chLatin_t, chLatin_u, chLatin_r, chLatin_e, chNull\r
-    }; \r
-    const XMLCh Signature::PREFIX[] = {\r
-        chLatin_d, chLatin_s, chNull\r
-    };\r
-#endif\r
-\r
     /**\r
      * Builder for Signature objects.\r
      */\r
     class XMLTOOL_API SignatureBuilder : public XMLObjectBuilder\r
     {\r
     public:\r
-        virtual ~SignatureBuilder() {}\r
-\r
+        virtual Signature* buildObject(\r
+            const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL, const QName* schemaType=NULL\r
+            ) const;\r
+            \r
         /**\r
-         * Default builder.\r
+         * Default builder\r
+         * \r
+         * @return empty Signature object\r
          */\r
-        virtual Signature* buildObject() const=0;\r
+        virtual Signature* buildObject() const;\r
     };\r
+\r
 };\r
 \r
 #endif /* __xmltooling_sig_h__ */\r