fix "make dist" target

[lyx.git] / src / Bullet.h

diff --git a/src/Bullet.h b/src/Bullet.h
index b1eb94d5163b9cdb17db104343d56ddd67109f0c..0e188c383bae6242e4b4791c8bb12dfce307e6b1 100644 (file)
--- a/src/Bullet.h
+++ b/src/Bullet.h
@@ -56,17 +56,17 @@ 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);
+               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);
                // now some relational/operational tests
                if (user_text == 1) {
-                       Assert(font == -1 && (character == -1 && size == -1));
+                       lyx::Assert(font == -1 && (character == -1 && size == -1));
                        //        Assert(!text.empty()); // this isn't necessarily an error
                }
                //      else if (user_text == -1) {
@@ -106,11 +106,11 @@ private:
        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.