X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBullet.h;h=38fc29e4cbc85308cf248fe9da80ea0400066ff2;hb=068e2cfb25bfbab62f80bc0c776ca169032c2219;hp=446f18b1e5ad5283d0af882e0e7274c800e340d5;hpb=b16c7bca00a5e829b4bb80d0781da84ea5c9f1fb;p=lyx.git

diff --git a/src/Bullet.h b/src/Bullet.h
index 446f18b1e5..38fc29e4cb 100644
--- a/src/Bullet.h
+++ b/src/Bullet.h
@@ -49,17 +49,12 @@ public:
 	///
 	string const & getText() const;
 	///
-	char const * c_str() const;
-	///
-	Bullet & operator = (Bullet const &);
+	Bullet & operator=(Bullet const &);
 	///
 	friend bool operator==(Bullet const &, Bullet const &);
-	///
-	friend bool operator!=(Bullet const & b1, Bullet const & b2) {
-		return !(b1 == b2);
-	}
 protected:
 #ifdef ENABLE_ASSERTIONS
+	///
 	void testInvariant() const {
 		Assert(font >= MIN);
 		Assert(font < FONTMAX);
@@ -106,16 +101,16 @@ private:
 	///
 	void generateText() const;
 	///
-	static string bulletSize(short int);
+	static string const bulletSize(short int);
 	///
-	static string bulletEntry(short int, short int);
+	static string const bulletEntry(short int, short int);
 	
 	///
-	short font;
+	int font;
 	///
-	short character;
+	int character;
 	///
-	short size;
+	int size;
 	
 	// size, character and font are array indices to access 
 	// the predefined arrays of LaTeX equivalent strings.
@@ -244,16 +239,15 @@ Bullet & Bullet::operator=(Bullet const & b)
 	return *this;
 }
 
+/*-----------------End Bullet Member Functions-----------------*/
 
 inline
-char const * Bullet::c_str() const
+bool operator!=(Bullet const & b1, Bullet const & b2)
 {
-	return getText().c_str();
+	return !(b1 == b2);
 }
 
-
-/*-----------------End Bullet Member Functions-----------------*/
-
+///
 extern
 Bullet const ITEMIZE_DEFAULTS[];