Simplify DocIterator

[lyx.git] / src / BranchList.cpp

diff --git a/src/BranchList.cpp b/src/BranchList.cpp
index a593c5478fc91e9b421537f6cc849b32b2590238..01135526e64b72f077949aa776e2f6261e30fc98 100644 (file)
--- a/src/BranchList.cpp
+++ b/src/BranchList.cpp
@@ -4,6 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Martin Vermeer
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,6 +16,8 @@
 
 #include "frontends/Application.h"
 
+#include "support/lstrings.h"
+
 #include <algorithm>
 
 using namespace std;
@@ -22,28 +25,14 @@ using namespace std;
 
 namespace lyx {
 
-namespace {
-
-class BranchNamesEqual : public std::unary_function<Branch, bool>
-{
-public:
-       BranchNamesEqual(docstring const & name) : name_(name) {}
-
-       bool operator()(Branch const & branch) const
-       {
-               return branch.branch() == name_;
-       }
-private:
-       docstring name_;
-};
-}
-
-
-Branch::Branch() : selected_(false)
+Branch::Branch()
+       : selected_(false), filenameSuffix_(false)
 {
        // no theApp() with command line export
        if (theApp())
                theApp()->getRgbColor(Color_background, color_);
+       else
+               frontend::Application::getRgbColorUncached(Color_background, color_);
 }
 
 
@@ -74,6 +63,18 @@ bool Branch::setSelected(bool b)
 }
 
 
+bool Branch::hasFileNameSuffix() const
+{
+       return filenameSuffix_;
+}
+
+
+void Branch::setFileNameSuffix(bool b)
+{
+       filenameSuffix_ = b;
+}
+
+
 RGBColor const & Branch::color() const
 {
        return color_;
@@ -90,25 +91,40 @@ void Branch::setColor(string const & str)
 {
        if (str.size() == 7 && str[0] == '#')
                color_ = rgbFromHexName(str);
-       else
+       else {
                // no color set or invalid color - use normal background
-               theApp()->getRgbColor(Color_background, color_);
+               // no theApp() with command line export
+               if (theApp())
+                       theApp()->getRgbColor(Color_background, color_);
+               else
+                       frontend::Application::getRgbColorUncached(Color_background, color_);
+       }
 }
 
 
+namespace {
+
+std::function<bool (Branch const &)> BranchNameIs(docstring const & d)
+{
+       return [d](Branch const & b){ return b.branch() == d; };
+}
+
+} // namespace
+
+
 Branch * BranchList::find(docstring const & name)
 {
        List::iterator it =
-               find_if(list.begin(), list.end(), BranchNamesEqual(name));
-       return it == list.end() ? 0 : &*it;
+               find_if(list_.begin(), list_.end(), BranchNameIs(name));
+       return it == list_.end() ? nullptr : &*it;
 }
 
 
 Branch const * BranchList::find(docstring const & name) const
 {
        List::const_iterator it =
-               find_if(list.begin(), list.end(), BranchNamesEqual(name));
-       return it == list.end() ? 0 : &*it;
+               find_if(list_.begin(), list_.end(), BranchNameIs(name));
+       return it == list_.end() ? nullptr : &*it;
 }
 
 
@@ -124,15 +140,14 @@ bool BranchList::add(docstring const & s)
                else
                        name = s.substr(i, j - i);
                // Is this name already in the list?
-               bool const already =
-                       find_if(list.begin(), list.end(),
-                                    BranchNamesEqual(name)) != list.end();
+               bool const already = find(name);
                if (!already) {
                        added = true;
                        Branch br;
                        br.setBranch(name);
                        br.setSelected(false);
-                       list.push_back(br);
+                       br.setFileNameSuffix(false);
+                       list_.push_back(br);
                }
                if (j == docstring::npos)
                        break;
@@ -144,10 +159,40 @@ bool BranchList::add(docstring const & s)
 
 bool BranchList::remove(docstring const & s)
 {
-       size_t const size = list.size();
-       list.remove_if(BranchNamesEqual(s));
-       return size != list.size();
+       size_t const size = list_.size();
+       list_.remove_if(BranchNameIs(s));
+       return size != list_.size();
 }
 
 
+bool BranchList::rename(docstring const & oldname,
+       docstring const & newname, bool const merge)
+{
+       if (newname.empty())
+               return false;
+       if (find(newname)) {
+               // new name already taken
+               if (merge)
+                     return remove(oldname);
+               return false;
+       }
+
+       Branch * branch = find(oldname);
+       if (!branch)
+               return false;
+       branch->setBranch(newname);
+       return true;
+}
+
+
+docstring BranchList::getFileNameSuffix() const
+{
+       docstring result;
+       for (auto const & br : list_) {
+               if (br.isSelected() && br.hasFileNameSuffix())
+                       result += "-" + br.branch();
+       }
+       return support::subst(result, from_ascii("/"), from_ascii("_"));
+}
+
 } // namespace lyx