X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBullet.C;h=4104ee60f49fd8cfddf21c8d854ed2a7c3933b3f;hb=0da3d53269a49c66b24615d24e20e441dcf7c07e;hp=d362d815786d61f0d90d36b3b7fbddc9fee41489;hpb=92a24f6f9966dba3a09b625d4d3d81fb2dd888ba;p=lyx.git

diff --git a/src/Bullet.C b/src/Bullet.C
index d362d81578..4104ee60f4 100644
--- a/src/Bullet.C
+++ b/src/Bullet.C
@@ -20,6 +20,10 @@
 
 #include <boost/assert.hpp>
 
+namespace lyx {
+
+using std::string;
+
 
 /** The four LaTeX itemize environment default bullets
  */
@@ -35,7 +39,7 @@ Bullet const ITEMIZE_DEFAULTS[4] = { Bullet(0, 8),//"\\(\\bullet\\)"
 
 
 Bullet::Bullet(int f, int c, int s)
-  : font(f), character(c), size(s), user_text(0)
+	: font(f), character(c), size(s), user_text(0)
 {
 	if (f < MIN || f >= FONTMAX) {
 		font = MIN;
@@ -52,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();
@@ -95,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;
@@ -135,7 +139,7 @@ Bullet & Bullet::operator=(Bullet const & b)
 }
 
 
-string const & Bullet::getText() const
+docstring const & Bullet::getText() const
 {
 	if (user_text == 0) {
 		generateText();
@@ -191,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
@@ -203,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..
@@ -348,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
@@ -376,3 +380,6 @@ void Bullet::testInvariant() const
 	//      }
 #endif
 }
+
+
+} // namespace lyx