fix typo that put too many include paths for most people

[lyx.git] / src / Bullet.C

diff --git a/src/Bullet.C b/src/Bullet.C
index 9e4c5389c0189f4d606a6796e8566f82baae23f7..8bc3d874ebb95627423e9d1424f337b7e802b9e9 100644 (file)
--- a/src/Bullet.C
+++ b/src/Bullet.C
@@ -3,7 +3,7 @@
  * generate the bullets in the bullet-panel's.
  *
  * This file is part of
- * ====================================================== 
+ * ======================================================
  *
  *           LyX, The Document Processor
  *
@@ -24,10 +24,10 @@
 /** The four LaTeX itemize environment default bullets
  */
 extern
-Bullet const ITEMIZE_DEFAULTS[4] = { Bullet( 0, 8 ),//"\\(\\bullet\\)"
-                                    Bullet( 0, 0 ),//"\\normalfont\\bfseries{--}"
-                                    Bullet( 0, 6 ),//"\\(\\ast\\)"
-                                    Bullet( 0, 10 ) };//"\\(\\cdot\\)"
+Bullet const ITEMIZE_DEFAULTS[4] = { Bullet(0, 8),//"\\(\\bullet\\)"
+                                    Bullet(0, 0),//"\\normalfont\\bfseries{--}"
+                                    Bullet(0, 6),//"\\(\\ast\\)"
+                                    Bullet(0, 10) };//"\\(\\cdot\\)"
 
 // will need these later if still using full text as below
 // \usepackage{latexsym,pifont,amssymb}
@@ -54,7 +54,7 @@ Bullet::Bullet(int f, int c, int s)
 
 
 
-Bullet::Bullet(string const & t) 
+Bullet::Bullet(string const & t)
        :  font(MIN), character(MIN), size(MIN), user_text(1), text(t)
 {
 #ifdef ENABLE_ASSERTIONS
@@ -207,7 +207,7 @@ void Bullet::generateText() const
 }
 
 
-string const Bullet::bulletSize(short int s)
+string const Bullet::bulletSize(int s)
 {
        // use a parameter rather than hard code `size' in here
        // in case some future function may want to retrieve
@@ -215,7 +215,7 @@ string const Bullet::bulletSize(short int s)
        // See additional comments in bulletEntry() below.
 
        static char const * BulletSize[SIZEMAX] = {
-               "\\tiny",  "\\scriptsize", "\\footnotesize", "\\small", "\\normalsize", 
+               "\\tiny",  "\\scriptsize", "\\footnotesize", "\\small", "\\normalsize",
                "\\large", "\\Large",      "\\LARGE",        "\\huge",  "\\Huge"
        };
 
@@ -223,7 +223,7 @@ string const Bullet::bulletSize(short int s)
 }
 
 
-string const Bullet::bulletEntry(short int f, short int c)
+string const Bullet::bulletEntry(int f, int c)
 {
        // Despite how this may at first appear the static local variables
        // are only initialized once..
@@ -238,10 +238,10 @@ string const Bullet::bulletEntry(short int f, short int c)
        // to get around a compiler bug in an earler version of gcc (< 2.7.2.1)
        // static string const BulletPanels[FONTMAX][CHARMAX] = {
        static char const * BulletPanel0[CHARMAX] = {
-               /* standard */ 
+               /* standard */
                "\\normalfont\\bfseries{--}", "\\(\\vdash\\)",
                "\\(\\dashv\\)", "\\(\\flat\\)", "\\(\\natural\\)",
-               "\\(\\sharp\\)", "\\(\\ast\\)", "\\(\\star\\)", 
+               "\\(\\sharp\\)", "\\(\\ast\\)", "\\(\\star\\)",
                "\\(\\bullet\\)", "\\(\\circ\\)", "\\(\\cdot\\)",
                "\\(\\dagger\\)", "\\(\\bigtriangleup\\)",
                "\\(\\bigtriangledown\\)", "\\(\\triangleleft\\)",
@@ -249,9 +249,9 @@ string const Bullet::bulletEntry(short int f, short int c)
                "\\(\\oplus\\)", "\\(\\ominus\\)", "\\(\\otimes\\)",
                "\\(\\oslash\\)", "\\(\\odot\\)", "\\(\\spadesuit\\)",
                "\\(\\diamond\\)", "\\(\\Diamond\\)", "\\(\\Box\\)",
-               "\\(\\diamondsuit\\)", "\\(\\heartsuit\\)", 
+               "\\(\\diamondsuit\\)", "\\(\\heartsuit\\)",
                "\\(\\clubsuit\\)", "\\(\\rightarrow\\)", "\\(\\leadsto\\)",
-               "\\(\\rightharpoonup\\)", "\\(\\rightharpoondown\\)", 
+               "\\(\\rightharpoonup\\)", "\\(\\rightharpoondown\\)",
                "\\(\\Rightarrow\\)", "\\(\\succ\\)"
        };
        static char const * BulletPanel1[CHARMAX] = {