Remove the inset and view member functions from PreviewedInset.

[lyx.git] / src / BranchList.h

diff --git a/src/BranchList.h b/src/BranchList.h
index 152ac58f78ebf1af28804d3e9e083a53d4867776..aaa5f15ecd548c5a8cc3bc2276a728d2b1b5cc6c 100644 (file)
--- a/src/BranchList.h
+++ b/src/BranchList.h
@@ -1,11 +1,11 @@
-// -*- C++ -*- 
+// -*- C++ -*-
 /**
- * \file BranchList.h 
+ * \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
+ *
+ * Full author contact details are available in file CREDITS.
  *
  *
  * \class Branch
@@ -17,7 +17,7 @@
  * A branch has a name, can either be selected or not, and uses a
  * user-specifyable background colour. All these can be set and
  * queried.
- * 
+ *
  * \class BranchList
  *
  * A class containing a vector of all defined branches within a
@@ -30,32 +30,33 @@
 #ifndef BRANCHES_H
 #define BRANCHES_H
 
-#include "LString.h"
+#include <string>
 #include <list>
 
+
 class Branch {
 public:
        ///
-       string const getBranch() const;
+       std::string const getBranch() const;
        ///
-       void setBranch(string const &);
+       void setBranch(std::string const &);
        ///
        bool getSelected() const;
        ///
        void setSelected(bool);
-       /// 
-       string const getColor() const;
        ///
-       void setColor(string const &);
+       std::string const getColor() const;
+       ///
+       void setColor(std::string const &);
 
 
 private:
        ///
-       string branch_;
+       std::string branch_;
        ///
        bool selected_;
        ///
-       string color_;
+       std::string color_;
 };
 
 
@@ -63,7 +64,7 @@ class BranchList {
 public:
        ///
        BranchList() : separator_("|") {}
-       
+
        ///
        typedef std::list<Branch> List;
 
@@ -78,29 +79,29 @@ public:
        ///
        List::const_iterator end() const { return list.end(); }
        ///
-       string getColor(string const &) const;
-       ///     
-       void setColor(string const &, string const &);
+       std::string getColor(std::string const &) const;
+       ///
+       void setColor(std::string const &, std::string const &);
        /// Select/deselect multiple branches given in '|'-separated string
-       void setSelected(string const &, bool);
+       void setSelected(std::string const &, bool);
        /// Add multiple branches to list
-       void add(string const &);
+       void add(std::string const &);
        /// remove a branch from list by name
-       void remove(string const &);
+       void remove(std::string const &);
        /// return whether this branch is selected
-       bool selected(string const &) const;
+       bool selected(std::string const &) const;
        /// return, as a '|'-separated string, all branch names
-       string allBranches() const;
-       /// 
-       string allSelected() const;
+       std::string allBranches() const;
        ///
-       string const separator() const;
-       
+       std::string allSelected() const;
+       ///
+       std::string const separator() const;
+
 private:
        ///
        List list;
        ///
-       string separator_;
+       std::string separator_;
 };
 
 #endif