gcc const fix, converted linefeeds

[shibboleth/cpp-xmltooling.git] / xmltooling / XMLObjectBuilder.cpp

diff --git a/xmltooling/XMLObjectBuilder.cpp b/xmltooling/XMLObjectBuilder.cpp
index 33c4225..38d739b 100644 (file)
--- a/xmltooling/XMLObjectBuilder.cpp
+++ b/xmltooling/XMLObjectBuilder.cpp
@@ -1,73 +1,73 @@
-/*\r
- *  Copyright 2001-2006 Internet2\r
- * \r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-/**\r
- * XMLObjectBuilder.cpp\r
- * \r
- * Factory interface for XMLObjects \r
- */\r
-\r
-#include "internal.h"\r
-#include "XMLObjectBuilder.h"\r
-#include "util/NDC.h"\r
-#include "util/XMLHelper.h"\r
-\r
-#include <log4cpp/Category.hh>\r
-\r
-using namespace xmltooling;\r
-using namespace log4cpp;\r
-using namespace std;\r
-\r
-map<QName,XMLObjectBuilder*> XMLObjectBuilder::m_map;\r
-XMLObjectBuilder* XMLObjectBuilder::m_default=NULL;\r
-\r
-const XMLObjectBuilder* XMLObjectBuilder::getBuilder(const DOMElement* domElement)\r
-{\r
-#ifdef _DEBUG\r
-    xmltooling::NDC ndc("getBuilder");\r
-#endif\r
-    Category& log=Category::getInstance(XMLTOOLING_LOGCAT".XMLObjectBuilder");\r
- \r
-    auto_ptr<QName> schemaType(XMLHelper::getXSIType(domElement));\r
-    const XMLObjectBuilder* xmlObjectBuilder = schemaType.get() ? getBuilder(*(schemaType.get())) : NULL;\r
-    if (xmlObjectBuilder) {\r
-        if (log.isDebugEnabled()) {\r
-            log.debug("located XMLObjectBuilder for schema type: %s", schemaType->toString().c_str());\r
-        }\r
-        return xmlObjectBuilder;\r
-    }\r
-    \r
-    auto_ptr<QName> elementName(XMLHelper::getNodeQName(domElement));\r
-    xmlObjectBuilder = getBuilder(*(elementName.get()));\r
-    if (xmlObjectBuilder) {\r
-        if (log.isDebugEnabled()) {\r
-            log.debug("located XMLObjectBuilder for element name: %s", elementName->toString().c_str());\r
-        }\r
-        return xmlObjectBuilder;\r
-    }\r
-\r
-    if (log.isDebugEnabled()) {\r
-        log.debug("no XMLObjectBuilder registered for element (%s), returning default", elementName->toString().c_str());\r
-    }\r
-    return m_default;\r
-}\r
-\r
-void XMLObjectBuilder::destroyBuilders()\r
-{\r
-    for_each(m_map.begin(),m_map.end(),cleanup_pair<QName,XMLObjectBuilder>());\r
-    m_map.clear();\r
-    deregisterDefaultBuilder();\r
-}\r
+/*
+ *  Copyright 2001-2006 Internet2
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * XMLObjectBuilder.cpp
+ * 
+ * Factory interface for XMLObjects 
+ */
+
+#include "internal.h"
+#include "XMLObjectBuilder.h"
+#include "util/NDC.h"
+#include "util/XMLHelper.h"
+
+#include <log4cpp/Category.hh>
+
+using namespace xmltooling;
+using namespace log4cpp;
+using namespace std;
+
+map<QName,XMLObjectBuilder*> XMLObjectBuilder::m_map;
+XMLObjectBuilder* XMLObjectBuilder::m_default=NULL;
+
+const XMLObjectBuilder* XMLObjectBuilder::getBuilder(const DOMElement* domElement)
+{
+#ifdef _DEBUG
+    xmltooling::NDC ndc("getBuilder");
+#endif
+    Category& log=Category::getInstance(XMLTOOLING_LOGCAT".XMLObjectBuilder");
+ 
+    auto_ptr<QName> schemaType(XMLHelper::getXSIType(domElement));
+    const XMLObjectBuilder* xmlObjectBuilder = schemaType.get() ? getBuilder(*(schemaType.get())) : NULL;
+    if (xmlObjectBuilder) {
+        if (log.isDebugEnabled()) {
+            log.debug("located XMLObjectBuilder for schema type: %s", schemaType->toString().c_str());
+        }
+        return xmlObjectBuilder;
+    }
+    
+    auto_ptr<QName> elementName(XMLHelper::getNodeQName(domElement));
+    xmlObjectBuilder = getBuilder(*(elementName.get()));
+    if (xmlObjectBuilder) {
+        if (log.isDebugEnabled()) {
+            log.debug("located XMLObjectBuilder for element name: %s", elementName->toString().c_str());
+        }
+        return xmlObjectBuilder;
+    }
+
+    if (log.isDebugEnabled()) {
+        log.debug("no XMLObjectBuilder registered for element (%s), returning default", elementName->toString().c_str());
+    }
+    return m_default;
+}
+
+void XMLObjectBuilder::destroyBuilders()
+{
+    for_each(m_map.begin(),m_map.end(),cleanup_pair<QName,XMLObjectBuilder>());
+    m_map.clear();
+    deregisterDefaultBuilder();
+}