X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBullet.h;h=9e516e1cd4d392441cb9e2023ffaf978a29c5521;hb=98c966c64594611e469313314abd1e59524adb4a;hp=f52794f20de47d7f6b68c75c3d7fb6a18de53c8b;hpb=9ce32d63e5ff1dbf4c04e3d8263b2649ef3ac595;p=lyx.git

diff --git a/src/Bullet.h b/src/Bullet.h
index f52794f20d..9e516e1cd4 100644
--- a/src/Bullet.h
+++ b/src/Bullet.h
@@ -1,12 +1,12 @@
 // -*- C++ -*-
 /* This is the bullet class definition file.
  * This file is part of
- * ====================================================== 
+ * ======================================================
  *
  *           LyX, The Document Processor
  *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  *           This file Copyright 1997-1999
  *           Allan Rae
@@ -21,8 +21,6 @@
 
 #include "LString.h"
 
-#include "support/LAssert.h"
-
 ///
 class Bullet {
 public:
@@ -30,7 +28,7 @@ public:
 	Bullet(int f = -1, int c = -1, int s = -1);
 
 	///
-	Bullet(string const &);
+	explicit Bullet(string const &);
 
 	///
 	void setCharacter(int);
@@ -47,50 +45,22 @@ public:
 	///
 	int getSize() const;
 	///
-	string getText() const;
-	///
-	string getText();
-	///
-	char const * c_str();
+	string const & getText() 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);
-		Assert(character >= MIN);
-		Assert(character < CHARMAX);
-		Assert(size >= MIN);
-		Assert(size < SIZEMAX);
-		Assert(user_text >= -1);
-		Assert(user_text <= 1);
-		// now some relational/operational tests
-		if (user_text == 1) {
-			Assert(font == -1 && (character == -1 && size == -1));
-		       	//        Assert(!text.empty()); // this isn't necessarily an error
-		}
-		//      else if (user_text == -1) {
-		//        Assert(!text.empty()); // this also isn't necessarily an error
-		//      }
-		//      else {
-		//        // user_text == 0
-		//        Assert(text.empty()); // not usually true
-		//      }
-	}
+	///
+	void testInvariant() const;
 #endif
 private:
 	/**
 	   This enum makes adding additional panels or changing panel sizes
 	   easier. Since you only need change these values for all tests to
 	   be correct for the new values.
-	   
+
 	   Note: MAX means the size of the array so to test you need:
 	   (x < MAX)  *not* (x <= MAX)
 	*/
@@ -104,154 +74,48 @@ private:
 		///
 		SIZEMAX = 10
 	};
-	
+
 	///
-	void generateText();
+	void generateText() const;
 	///
-	static string bulletSize(short int);
+	static string const bulletSize(int);
 	///
-	static string bulletEntry(short int, short int);
-	
+	static string const bulletEntry(int, int);
+
 	///
-	short font;
+	int font;
 	///
-	short character;
+	int character;
 	///
-	short size;
-	
-	// size, character and font are array indices to access 
+	int size;
+
+	// size, character and font are array indices to access
 	// the predefined arrays of LaTeX equivalent strings.
-	
+
 	/** flag indicates if user has control of text (1)
 	    or if I can use it to generate strings (0)
 	    or have already (-1)
 	*/
-	short user_text; 
-	
+	mutable short user_text;
+
 	//NOTE: Arranging these four shorts above to be together
 	//      like this should ensure they are in a single cache line
-	
+
 	/** text may contain a user-defined LaTeX symbol command
 	    or one generated internally from the font, character
 	    and size settings.
 	*/
-	string text;
+	mutable string text;
 };
 
 
-/*----------------Inline Bullet Member Functions------------------*/
-
-inline Bullet::Bullet(string const & t) 
-	:  font(MIN), character(MIN), size(MIN), user_text(1), text(t)
-{
-#ifdef ENABLE_ASSERTIONS
-	testInvariant();
-#endif
-}
-
-
-inline void Bullet::setCharacter(int c)
-{
-	if (c < MIN || c >= CHARMAX) {
-		character = MIN;
-	} else {
-		character = c;
-	}
-	user_text = 0;
-#ifdef ENABLE_ASSERTIONS
-	testInvariant();
-#endif
-}
-
-
-inline void Bullet::setFont(int f)
-{
-	if (f < MIN || f >= FONTMAX) {
-		font = MIN;
-	} else {
-		font = f;
-	}
-	user_text = 0;
-#ifdef ENABLE_ASSERTIONS
-	testInvariant();
-#endif
-}
-
-
-inline void Bullet::setSize(int s)
-{
-	if (s < MIN || s >= SIZEMAX) {
-		size = MIN;
-	} else {
-		size = s;
-	}
-	user_text = 0;
-#ifdef ENABLE_ASSERTIONS
-	testInvariant();
-#endif
-}
-
-
-inline void Bullet::setText(string const & t)
-{
-	font = character = size = MIN;
-	user_text = 1;
-	text = t;
-#ifdef ENABLE_ASSERTIONS
-	testInvariant();
-#endif
-}
-
-
-inline int Bullet::getCharacter() const
-{
-	return character;
-}
-
-
-inline int Bullet::getFont() const
+inline
+bool operator!=(Bullet const & b1, Bullet const & b2)
 {
-	return font;
+	return !(b1 == b2);
 }
 
-
-inline int Bullet::getSize() const
-{
-	return size;
-}
-
-
-inline string Bullet::getText() const
-{
-	return text;
-}
-
-
-inline Bullet & Bullet::operator=(Bullet const & b)
-{
-#ifdef ENABLE_ASSERTIONS
-	b.testInvariant();
-#endif
-	font = b.font;
-	character = b.character;
-	size = b.size;
-	user_text = b.user_text;
-	text = b.text;
-#ifdef ENABLE_ASSERTIONS
-	this->testInvariant();
-#endif
-	return *this;
-}
-
-
-inline char const * Bullet::c_str()
-{
-	return this->getText().c_str();
-}
-
-
-/*-----------------End Bullet Member Functions-----------------*/
-
+///
 extern
 Bullet const ITEMIZE_DEFAULTS[];