zlib stuff

[lyx.git] / src / Bullet.C

diff --git a/src/Bullet.C b/src/Bullet.C
index 8bc3d874ebb95627423e9d1424f337b7e802b9e9..8493c0bd34ed7195409c07eedc7c98e420a94283 100644 (file)
--- a/src/Bullet.C
+++ b/src/Bullet.C
@@ -14,13 +14,11 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "Bullet.h"
 #include "support/LAssert.h"
 
+using namespace lyx::support;
+
 /** The four LaTeX itemize environment default bullets
  */
 extern
@@ -369,17 +367,17 @@ string const Bullet::bulletEntry(int f, int c)
 
 #ifdef ENABLE_ASSERTIONS
 void Bullet::testInvariant() const {
-       lyx::Assert(font >= MIN);
-       lyx::Assert(font < FONTMAX);
-       lyx::Assert(character >= MIN);
-       lyx::Assert(character < CHARMAX);
-       lyx::Assert(size >= MIN);
-       lyx::Assert(size < SIZEMAX);
-       lyx::Assert(user_text >= -1);
-       lyx::Assert(user_text <= 1);
+       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) {
-               lyx::Assert(font == -1 && (character == -1 && size == -1));
+               Assert(font == -1 && (character == -1 && size == -1));
                //        Assert(!text.empty()); // this isn't necessarily an error
        }
        //      else if (user_text == -1) {