fix typo that put too many include paths for most people

[lyx.git] / src / Bullet.h

diff --git a/src/Bullet.h b/src/Bullet.h
index 455809973ef57fafc97d440ea60c00ee7a8d6dc3..9e516e1cd4d392441cb9e2023ffaf978a29c5521 100644 (file)
--- a/src/Bullet.h
+++ b/src/Bullet.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 /* This is the bullet class definition file.
  * This file is part of
- * ====================================================== 
+ * ======================================================
  *
  *           LyX, The Document Processor
  *
@@ -21,8 +21,6 @@
 
 #include "LString.h"
 
-#include "support/LAssert.h"
-
 ///
 class Bullet {
 public:
@@ -55,35 +53,14 @@ public:
 protected:
 #ifdef ENABLE_ASSERTIONS
        ///
-       void 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);
-               // now some relational/operational tests
-               if (user_text == 1) {
-                       lyx::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)
        */
@@ -97,33 +74,33 @@ private:
                ///
                SIZEMAX = 10
        };
-       
+
        ///
        void generateText() const;
        ///
-       static string const bulletSize(short int);
+       static string const bulletSize(int);
        ///
-       static string const bulletEntry(short int, short int);
-       
+       static string const bulletEntry(int, int);
+
        ///
        int font;
        ///
        int character;
        ///
        int size;
-       
-       // size, character and font are array indices to access 
+
+       // 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)
        */
-       mutable 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.
@@ -132,115 +109,6 @@ private:
 };
 
 
-/*----------------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
-{
-       return font;
-}
-
-
-inline
-int Bullet::getSize() const
-{
-       return size;
-}
-
-
-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;
-}
-
-/*-----------------End Bullet Member Functions-----------------*/
-
 inline
 bool operator!=(Bullet const & b1, Bullet const & b2)
 {