infrastructure for 'graceful asserts'

[lyx.git] / src / Bullet.h

diff --git a/src/Bullet.h b/src/Bullet.h
index 5e4e72684b90c0aef286fcf013597f2cd27bb036..bc9f837343f0e455994efd902b12b3d9afc70563 100644 (file)
--- a/src/Bullet.h
+++ b/src/Bullet.h
@@ -13,7 +13,10 @@
 #ifndef BULLET_H
 #define BULLET_H
 
-#include "support/std_string.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,7 +42,7 @@ public:
        ///
        int getSize() const;
        ///
-       string const & getText() const;
+       docstring const & getText() const;
        ///
        Bullet & operator=(Bullet const &);
        ///
@@ -70,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;
@@ -97,7 +100,7 @@ private:
            or one generated internally from the font, character
            and size settings.
        */
-       mutable string text;
+       mutable docstring text;
 };
 
 
@@ -111,4 +114,7 @@ bool operator!=(Bullet const & b1, Bullet const & b2)
 extern
 Bullet const ITEMIZE_DEFAULTS[];
 
+
+} // namespace lyx
+
 #endif /* BULLET_H_ */