X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBranchList.h;h=e3e18e1c71f49ba2ae9f305a43633052545318cd;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=21f8d05303d6b4fd86791bbdbe4ea58c14d2613e;hpb=e6f922009f6311b561a1a3fa830f9eb3024d7902;p=lyx.git

diff --git a/src/BranchList.h b/src/BranchList.h
index 21f8d05303..e3e18e1c71 100644
--- 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:
 	///
@@ -56,9 +57,9 @@ public:
 	/** If true, the branch name will be appended
 	 *  to the output file name.
 	 */
-	bool hasFilenameSuffix() const;
+	bool hasFileNameSuffix() const;
 	/// Select/deselect filename suffix property.
-	void setFilenameSuffix(bool);
+	void setFileNameSuffix(bool);
 	///
 	RGBColor const & color() const;
 	///
@@ -92,6 +93,9 @@ public:
 	///
 	BranchList() : separator_(from_ascii("|")) {}
 
+	///
+	docstring separator() const { return separator_; }
+
 	///
 	bool empty() const { return list.empty(); }
 	///
@@ -120,7 +124,7 @@ public:
 	 */
 	bool rename(docstring const &, docstring const &, bool const merge = false);
 	/// get the complete filename suffix
-	docstring getFilenameSuffix() const;
+	docstring getFileNameSuffix() const;
 
 private:
 	///