X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBullet.cpp;h=c3093abc753b535286f2fb472c51b75e1e3d270a;hb=c999e35e54eca6e0b736a034d415b6a90a866bc0;hp=4ae4df2ca391b174ca300b794147dccf3d02cf7c;hpb=ada0bd00f07c85235c6653a0f7ecb04a8c28b54d;p=lyx.git

diff --git a/src/Bullet.cpp b/src/Bullet.cpp
index 4ae4df2ca3..c3093abc75 100644
--- a/src/Bullet.cpp
+++ b/src/Bullet.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Allan Rae
  *
  * Full author contact details are available in file CREDITS.
@@ -18,9 +18,9 @@
 
 #include "Bullet.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 
-using std::string;
+using namespace std;
 
 namespace lyx {
 
@@ -41,15 +41,12 @@ 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)
 {
-	if (f < MIN || f >= FONTMAX) {
+	if (f < MIN || f >= FONTMAX)
 		font = MIN;
-	}
-	if (c < MIN || c >= CHARMAX) {
+	if (c < MIN || c >= CHARMAX)
 		character = MIN;
-	}
-	if (s < MIN || s >= SIZEMAX) {
+	if (s < MIN || s >= SIZEMAX)
 		size = MIN;
-	}
 	generateText();
 	testInvariant();
 }
@@ -65,11 +62,10 @@ Bullet::Bullet(docstring const & t)
 
 void Bullet::setCharacter(int c)
 {
-	if (c < MIN || c >= CHARMAX) {
+	if (c < MIN || c >= CHARMAX)
 		character = MIN;
-	} else {
+	else
 		character = c;
-	}
 	user_text = 0;
 	testInvariant();
 }
@@ -77,11 +73,10 @@ void Bullet::setCharacter(int c)
 
 void Bullet::setFont(int f)
 {
-	if (f < MIN || f >= FONTMAX) {
+	if (f < MIN || f >= FONTMAX)
 		font = MIN;
-	} else {
+	else
 		font = f;
-	}
 	user_text = 0;
 	testInvariant();
 }
@@ -89,11 +84,10 @@ void Bullet::setFont(int f)
 
 void Bullet::setSize(int s)
 {
-	if (s < MIN || s >= SIZEMAX) {
+	if (s < MIN || s >= SIZEMAX)
 		size = MIN;
-	} else {
+	else
 		size = s;
-	}
 	user_text = 0;
 	testInvariant();
 }
@@ -141,9 +135,8 @@ Bullet & Bullet::operator=(Bullet const & b)
 
 docstring const & Bullet::getText() const
 {
-	if (user_text == 0) {
+	if (user_text == 0)
 		generateText();
-	}
 	return text;
 }
 
@@ -154,12 +147,10 @@ bool operator==(const Bullet & b1, const Bullet & b2)
 
 	if (b1.user_text && b2.user_text) {
 		/* both have valid text */
-		if (b1.text == b2.text) {
+		if (b1.text == b2.text)
 			result = true;
-		}
-	} else if (((b1.character == b2.character) &&
-			  (b1.font == b2.font)) &&
-			 (b1.size == b2.size)) {
+	} else if (b1.character == b2.character && b1.font == b2.font &&
+			 b1.size == b2.size) {
 		result = true;
 	}
 	return result;
@@ -185,9 +176,8 @@ void Bullet::generateText() const
 
 	if ((font >= 0) && (character >= 0)) {
 		text = bulletEntry(font, character);
-		if (size >= 0) {
+		if (size >= 0)
 			text = bulletSize(size) + text;
-		}
 		user_text = -1;
 		// text is now defined and doesn't need to be recalculated
 		// unless font/character or text is modified
@@ -358,25 +348,25 @@ docstring const Bullet::bulletEntry(int f, int c)
 void Bullet::testInvariant() const
 {
 #ifdef ENABLE_ASSERTIONS
-	BOOST_ASSERT(font >= MIN);
-	BOOST_ASSERT(font < FONTMAX);
-	BOOST_ASSERT(character >= MIN);
-	BOOST_ASSERT(character < CHARMAX);
-	BOOST_ASSERT(size >= MIN);
-	BOOST_ASSERT(size < SIZEMAX);
-	BOOST_ASSERT(user_text >= -1);
-	BOOST_ASSERT(user_text <= 1);
+	LASSERT(font >= MIN, /**/);
+	LASSERT(font < FONTMAX, /**/);
+	LASSERT(character >= MIN, /**/);
+	LASSERT(character < CHARMAX, /**/);
+	LASSERT(size >= MIN, /**/);
+	LASSERT(size < SIZEMAX, /**/);
+	LASSERT(user_text >= -1, /**/);
+	LASSERT(user_text <= 1, /**/);
 	// now some relational/operational tests
 	if (user_text == 1) {
-		BOOST_ASSERT(font == -1 && (character == -1 && size == -1));
-		//        BOOST_ASSERT(!text.empty()); // this isn't necessarily an error
+		LASSERT(font == -1 && (character == -1 && size == -1), /**/);
+		//        LASSERT(!text.empty(), /**/); // this isn't necessarily an error
 	}
 	//      else if (user_text == -1) {
-	//        BOOST_ASSERT(!text.empty()); // this also isn't necessarily an error
+	//        LASSERT(!text.empty(), /**/); // this also isn't necessarily an error
 	//      }
 	//      else {
 	//        // user_text == 0
-	//        BOOST_ASSERT(text.empty()); // not usually true
+	//        LASSERT(text.empty(), /**/); // not usually true
 	//      }
 #endif
 }