get rid of broken_header.h and some unneeded tests

[lyx.git] / src / Bullet.C

diff --git a/src/Bullet.C b/src/Bullet.C
index d33b7ef662cb111896ec08a46f6907fcc5886af2..91965f9706ba176b2dcf5fceed6f2509a7aa655a 100644 (file)
--- a/src/Bullet.C
+++ b/src/Bullet.C
@@ -17,9 +17,11 @@
 #include <config.h>
 
 #include "Bullet.h"
-#include "support/LAssert.h"
 
-using namespace lyx::support;
+#include <boost/assert.hpp>
+
+using std::string;
+
 
 /** The four LaTeX itemize environment default bullets
  */
@@ -35,7 +37,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;
@@ -53,7 +55,7 @@ Bullet::Bullet(int f, int c, int s)
 
 
 Bullet::Bullet(string const & t)
-       :  font(MIN), character(MIN), size(MIN), user_text(1), text(t)
+       : font(MIN), character(MIN), size(MIN), user_text(1), text(t)
 {
        testInvariant();
 }
@@ -354,25 +356,25 @@ string const Bullet::bulletEntry(int f, int c)
 void Bullet::testInvariant() const
 {
 #ifdef ENABLE_ASSERTIONS
-       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);
+       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);
        // 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
+               BOOST_ASSERT(font == -1 && (character == -1 && size == -1));
+               //        BOOST_ASSERT(!text.empty()); // this isn't necessarily an error
        }
        //      else if (user_text == -1) {
-       //        Assert(!text.empty()); // this also isn't necessarily an error
+       //        BOOST_ASSERT(!text.empty()); // this also isn't necessarily an error
        //      }
        //      else {
        //        // user_text == 0
-       //        Assert(text.empty()); // not usually true
+       //        BOOST_ASSERT(text.empty()); // not usually true
        //      }
 #endif
 }