X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBullet.C;h=4104ee60f49fd8cfddf21c8d854ed2a7c3933b3f;hb=056550b31135c3812825c86719c4ceb7054910b5;hp=91965f9706ba176b2dcf5fceed6f2509a7aa655a;hpb=e978fa42e38be22e9312be963ba6512fcd4b45ef;p=lyx.git

diff --git a/src/Bullet.C b/src/Bullet.C
index 91965f9706..4104ee60f4 100644
--- a/src/Bullet.C
+++ b/src/Bullet.C
@@ -20,6 +20,8 @@
 
 #include <boost/assert.hpp>
 
+namespace lyx {
+
 using std::string;
 
 
@@ -54,7 +56,7 @@ Bullet::Bullet(int f, int c, int s)
 
 
 
-Bullet::Bullet(string const & t)
+Bullet::Bullet(docstring const & t)
 	: font(MIN), character(MIN), size(MIN), user_text(1), text(t)
 {
 	testInvariant();
@@ -97,7 +99,7 @@ void Bullet::setSize(int s)
 }
 
 
-void Bullet::setText(string const & t)
+void Bullet::setText(docstring const & t)
 {
 	font = character = size = MIN;
 	user_text = 1;
@@ -137,7 +139,7 @@ Bullet & Bullet::operator=(Bullet const & b)
 }
 
 
-string const & Bullet::getText() const
+docstring const & Bullet::getText() const
 {
 	if (user_text == 0) {
 		generateText();
@@ -193,7 +195,7 @@ void Bullet::generateText() const
 }
 
 
-string const Bullet::bulletSize(int s)
+docstring const Bullet::bulletSize(int s)
 {
 	// use a parameter rather than hard code `size' in here
 	// in case some future function may want to retrieve
@@ -205,11 +207,11 @@ string const Bullet::bulletSize(int s)
 		"\\large", "\\Large",      "\\LARGE",        "\\huge",  "\\Huge"
 	};
 
-	return BulletSize[s];
+	return from_ascii(BulletSize[s]);
 }
 
 
-string const Bullet::bulletEntry(int f, int c)
+docstring const Bullet::bulletEntry(int f, int c)
 {
 	// Despite how this may at first appear the static local variables
 	// are only initialized once..
@@ -350,7 +352,7 @@ string const Bullet::bulletEntry(int f, int c)
 		BulletPanel4, BulletPanel5
 	};
 
-	return BulletPanels[f][c];
+	return from_ascii(BulletPanels[f][c]);
 }
 
 void Bullet::testInvariant() const
@@ -378,3 +380,6 @@ void Bullet::testInvariant() const
 	//      }
 #endif
 }
+
+
+} // namespace lyx