X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBullet.h;h=6a4f997acbc5c2523e0331b622a107839fda864f;hb=a86de5d3c06b44feb56d697877d96be114e11f09;hp=a0ac36c773caa8c77053847e1ad8c36cc3cf675c;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/Bullet.h b/src/Bullet.h
index a0ac36c773..6a4f997acb 100644
--- a/src/Bullet.h
+++ b/src/Bullet.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Allan Rae
  *
  * Full author contact details are available in file CREDITS.
@@ -13,7 +13,10 @@
 #ifndef BULLET_H
 #define BULLET_H
 
-#include "LString.h"
+#include "support/docstring.h"
+
+
+namespace lyx {
 
 ///
 class Bullet {
@@ -22,7 +25,7 @@ public:
 	Bullet(int f = -1, int c = -1, int s = -1);
 
 	///
-	explicit Bullet(string const &);
+	explicit Bullet(docstring const &);
 
 	///
 	void setCharacter(int);
@@ -31,7 +34,7 @@ public:
 	///
 	void setSize(int);
 	///
-	void setText(string const &);
+	void setText(docstring const &);
 	///
 	int getCharacter() const;
 	///
@@ -39,16 +42,14 @@ public:
 	///
 	int getSize() const;
 	///
-	string const & getText() const;
+	docstring const & getText() const;
 	///
 	Bullet & operator=(Bullet const &);
 	///
 	friend bool operator==(Bullet const &, Bullet const &);
 protected:
-#ifdef ENABLE_ASSERTIONS
 	///
 	void testInvariant() const;
-#endif
 private:
 	/**
 	   This enum makes adding additional panels or changing panel sizes
@@ -72,9 +73,9 @@ private:
 	///
 	void generateText() const;
 	///
-	static string const bulletSize(int);
+	static docstring const bulletSize(int);
 	///
-	static string const bulletEntry(int, int);
+	static docstring const bulletEntry(int, int);
 
 	///
 	int font;
@@ -99,7 +100,7 @@ private:
 	    or one generated internally from the font, character
 	    and size settings.
 	*/
-	mutable string text;
+	mutable docstring text;
 };
 
 
@@ -113,4 +114,7 @@ bool operator!=(Bullet const & b1, Bullet const & b2)
 extern
 Bullet const ITEMIZE_DEFAULTS[];
 
+
+} // namespace lyx
+
 #endif /* BULLET_H_ */