More boostisms

[shibboleth/cpp-xmltooling.git] / xmltooling / util / TemplateEngine.h

diff --git a/xmltooling/util/TemplateEngine.h b/xmltooling/util/TemplateEngine.h
index a501f62..4a86c86 100644 (file)
--- a/xmltooling/util/TemplateEngine.h
+++ b/xmltooling/util/TemplateEngine.h
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2009 Internet2
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  *
- * 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
+ * UCAID licenses this file to you 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
+ * 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.
+ * 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.
  */
 
 /**
@@ -58,11 +62,9 @@ namespace xmltooling {
     MAKE_NONCOPYABLE(TemplateEngine);
     public:
         /** Default constructor. */
-        TemplateEngine() {
-            setTagPrefix("mlp");
-        }
+        TemplateEngine();
 
-        virtual ~TemplateEngine() {}
+        virtual ~TemplateEngine();
 
         /**
          * Sets the tag name to use when locating template replacement tags.
@@ -77,8 +79,8 @@ namespace xmltooling {
          */
         class XMLTOOL_API TemplateParameters {
         public:
-            TemplateParameters() : m_request(NULL) {}
-            virtual ~TemplateParameters() {}
+            TemplateParameters();
+            virtual ~TemplateParameters();
 
             /** Map of known parameters to supply to template. */
             std::map<std::string,std::string> m_map;
@@ -93,7 +95,7 @@ namespace xmltooling {
              * Returns the value of a parameter to plug into the template.
              *
              * @param name  name of parameter
-             * @return value of parameter, or NULL
+             * @return value of parameter, or nullptr
              */
             virtual const char* getParameter(const char* name) const;
 
@@ -101,7 +103,7 @@ namespace xmltooling {
              * Returns a named collection of sub-parameters to pass into a loop.
              *
              * @param name  name of sub-collection
-             * @return pointer to a multimap of sub-parameters, or NULL
+             * @return pointer to a multimap of sub-parameters, or nullptr
              */
             virtual const std::multimap<std::string,std::string>* getLoopCollection(const char* name) const;
         };
@@ -119,7 +121,7 @@ namespace xmltooling {
             std::istream& is,
             std::ostream& os,
             const TemplateParameters& parameters,
-            const XMLToolingException* e=NULL
+            const XMLToolingException* e=nullptr
             ) const;
 
         /**
@@ -129,7 +131,6 @@ namespace xmltooling {
         static std::string unsafe_chars;
 
     private:
-        void trimspace(std::string& s) const;
         void html_encode(std::ostream& os, const char* start) const;
         void process(
             bool visible,