Changeset 1154

Timestamp:

Aug 7, 2010, 10:11:04 PM (13 years ago)

Author:

Peter Johansson

Message:

fixes #393

Location:

trunk/lib

Files:

• Configuration.cc (modified) (4 diffs)
• Configuration.h (modified) (2 diffs)
• File.cc (modified) (1 diff)
• LineTypeParser.cc (modified) (1 diff)

trunk/lib/Configuration.cc

@@ -101 +101 @@
   }
 
+
+  const std::string&  Configuration::copyright_string(void) const
+  {
+    return copyright_string_;
+  }
 
   const std::pair<std::string,std::string>* 
@@ -223 +228 @@
             throw Config_error(line, "");
           }
+        }
+        else if (lhs=="copyright-string") {
+          copyright_string_ = rhs;
         }
       }
@@ -471 +479 @@
   {
     copyright_alias_.clear();
+    copyright_string_="Copyright (C)";
     missing_copyright_warning_=false;
     trac_root_ = "";
@@ -602 +611 @@
     else
       os << "no\n";
+    os << "copyright-string = " << conf.copyright_string_ << "\n"; 
 
     os << "\n"

trunk/lib/Configuration.h

@@ -71 +71 @@
     ///
     const std::map<std::string, Alias>& copyright_alias(void) const;
+
+    /**
+       @return copyright string e.g. 'Copyright (C)' (default)
+    */
+    const std::string& copyright_string(void) const;
 
     /**
@@ -190 +195 @@
     std::map<std::string, std::string> author_color_;
     std::map<std::string, Alias> copyright_alias_;
+    std::string copyright_string_;
 
     bool missing_copyright_warning_;

trunk/lib/File.cc

@@ -128 +128 @@
     for (map<int, set<Alias> >::const_iterator i(year_authors.begin());
          i!=year_authors.end();) {
-      ss << prefix << "Copyright (C) "
-          << 1900+i->first;
+      ss << prefix << Configuration::instance().copyright_string() << " "
+         << 1900+i->first;
       map<int, set<Alias> >::const_iterator j = i;
       assert(i!=year_authors.end());

trunk/lib/LineTypeParser.cc

@@ -63 +63 @@
       else {
         // check whether copyright starts on this line
-        std::string::iterator i=search(line.begin(),line.end(),"Copyright (C)");
+        std::string::iterator i =
+          search(line.begin(), line.end(),
+                 Configuration::instance().copyright_string());
         if (i!=line.end()) {
           start_line_ = type_.size()+1;