FindAdv: Amend ec387b6d: Handle search for '{' and '}'

[lyx.git] / src / BranchList.h

diff --git a/src/BranchList.h b/src/BranchList.h
index c96a8650e5c210ce8d422cf9a15fcd6e39e56c25..c7dd19603e791171224ca8b35e0cd03f3aee9267 100644 (file)
--- a/src/BranchList.h
+++ b/src/BranchList.h
@@ -3,11 +3,25 @@
  * \file BranchList.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
+ *
  * \author Martin Vermeer
  *
  * Full author contact details are available in file CREDITS.
- *
- *
+ */
+
+#ifndef BRANCHLIST_H
+#define BRANCHLIST_H
+
+#include "ColorCode.h"
+
+#include "support/docstring.h"
+
+#include <list>
+
+
+namespace lyx {
+
+/**
  * \class Branch
  *
  * A class describing a 'branch', i.e., a named alternative for
@@ -15,30 +29,17 @@
  * other parts.
  *
  * A branch has a name, can either be selected or not, and uses a
- * user-specifyable background colour. All these can be set and
+ * user-specifiable background colour. All these can be set and
  * queried.
  *
  * \class BranchList
  *
  * A class containing a vector of all defined branches within a
- * document. Has methods for selecting or deselecting branches by
+ * document. It has methods for selecting or deselecting branches by
  * name, for outputting a '|'-separated string of all elements or only
  * the selected ones, and for adding and removing elements.
  */
 
-
-#ifndef BRANCHLIST_H
-#define BRANCHLIST_H
-
-#include "ColorCode.h"
-
-#include "support/docstring.h"
-
-#include <list>
-
-
-namespace lyx {
-
 class Branch {
 public:
        ///
@@ -60,9 +61,7 @@ public:
        /// Select/deselect filename suffix property.
        void setFileNameSuffix(bool);
        ///
-       RGBColor const & color() const;
-       ///
-       void setColor(RGBColor const &);
+       std::string const & color() const;
        /**
         * Set color from a string "#rrggbb".
         * Use Color:background if the string is no valid color.
@@ -79,7 +78,7 @@ private:
        ///
        bool filenameSuffix_;
        ///
-       RGBColor color_;
+       std::string color_;
 };
 
 
@@ -93,12 +92,15 @@ public:
        BranchList() : separator_(from_ascii("|")) {}
 
        ///
-       bool empty() const { return list.empty(); }
+       docstring separator() const { return separator_; }
+
+       ///
+       bool empty() const { return list_.empty(); }
        ///
-       void clear() { list.clear(); }
+       void clear() { list_.clear(); }
        ///
-       const_iterator begin() const { return list.begin(); }
-       const_iterator end() const { return list.end(); }
+       const_iterator begin() const { return list_.begin(); }
+       const_iterator end() const { return list_.end(); }
 
        /** \returns the Branch with \c name. If not found, returns 0.
         */
@@ -124,7 +126,7 @@ public:
 
 private:
        ///
-       List list;
+       List list_;
        ///
        docstring separator_;
 };