Changeset 1154


Ignore:
Timestamp:
Aug 7, 2010, 10:11:04 PM (9 years ago)
Author:
Peter Johansson
Message:

fixes #393

Location:
trunk/lib
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/Configuration.cc

    r1152 r1154  
    101101  }
    102102
     103
     104  const std::string&  Configuration::copyright_string(void) const
     105  {
     106    return copyright_string_;
     107  }
    103108
    104109  const std::pair<std::string,std::string>*
     
    223228            throw Config_error(line, "");
    224229          }
     230        }
     231        else if (lhs=="copyright-string") {
     232          copyright_string_ = rhs;
    225233        }
    226234      }
     
    471479  {
    472480    copyright_alias_.clear();
     481    copyright_string_="Copyright (C)";
    473482    missing_copyright_warning_=false;
    474483    trac_root_ = "";
     
    602611    else
    603612      os << "no\n";
     613    os << "copyright-string = " << conf.copyright_string_ << "\n";
    604614
    605615    os << "\n"
  • trunk/lib/Configuration.h

    r1152 r1154  
    7171    ///
    7272    const std::map<std::string, Alias>& copyright_alias(void) const;
     73
     74    /**
     75       @return copyright string e.g. 'Copyright (C)' (default)
     76    */
     77    const std::string& copyright_string(void) const;
    7378
    7479    /**
     
    190195    std::map<std::string, std::string> author_color_;
    191196    std::map<std::string, Alias> copyright_alias_;
     197    std::string copyright_string_;
    192198
    193199    bool missing_copyright_warning_;
  • trunk/lib/File.cc

    r1137 r1154  
    128128    for (map<int, set<Alias> >::const_iterator i(year_authors.begin());
    129129         i!=year_authors.end();) {
    130       ss << prefix << "Copyright (C) "
    131           << 1900+i->first;
     130      ss << prefix << Configuration::instance().copyright_string() << " "
     131         << 1900+i->first;
    132132      map<int, set<Alias> >::const_iterator j = i;
    133133      assert(i!=year_authors.end());
  • trunk/lib/LineTypeParser.cc

    r978 r1154  
    6363      else {
    6464        // check whether copyright starts on this line
    65         std::string::iterator i=search(line.begin(),line.end(),"Copyright (C)");
     65        std::string::iterator i =
     66          search(line.begin(), line.end(),
     67                 Configuration::instance().copyright_string());
    6668        if (i!=line.end()) {
    6769          start_line_ = type_.size()+1;
Note: See TracChangeset for help on using the changeset viewer.