removed a warning from screen and added CFLAGS in lyx.spec.in.

[lyx.git] / src / Bullet.C

diff --git a/src/Bullet.C b/src/Bullet.C
index 82c49e9955bf172aaf0fe3742aa36103d6983337..d9f8e2b4b823c2845685685f134219c3964fb9b7 100644 (file)
--- a/src/Bullet.C
+++ b/src/Bullet.C
@@ -45,7 +45,7 @@ Bullet::Bullet(const int f, const int c, const int s)
 }
 
 
-LString Bullet::getText()
+string Bullet::getText()
 {
        if (user_text == 0) {
                generateText();
@@ -101,14 +101,14 @@ void Bullet::generateText()
 }
 
 
-const LString & Bullet::bulletSize(const short & s)
+const string & Bullet::bulletSize(const short & s)
 {
        // use a parameter rather than hard code `size' in here
        // in case some future function may want to retrieve
        // an arbitrary entry.
        // See additional comments in bulletEntry() below.
 
-       static LString const BulletSize[SIZEMAX] = {
+       static string const BulletSize[SIZEMAX] = {
                "\\tiny",  "\\scriptsize", "\\footnotesize", "\\small", "\\normalsize", 
                "\\large", "\\Large",      "\\LARGE",        "\\huge",  "\\Huge"
        };
@@ -117,7 +117,7 @@ const LString & Bullet::bulletSize(const short & s)
 }
 
 
-const LString & Bullet::bulletEntry(const short & f, const short & c)
+const string & Bullet::bulletEntry(const short & f, const short & c)
 {
        // Despite how this may at first appear the static local variables
        // are only initialized once..
@@ -130,8 +130,8 @@ const LString & Bullet::bulletEntry(const short & f, const short & c)
 
        // The single 2-dim array had to be changed to multiple 1-dim arrays
        // to get around a compiler bug in an earler version of gcc (< 2.7.2.1)
-       // static LString const BulletPanels[FONTMAX][CHARMAX] = {
-       static LString const BulletPanel0[CHARMAX] = {
+       // static string const BulletPanels[FONTMAX][CHARMAX] = {
+       static string const BulletPanel0[CHARMAX] = {
                /* standard */ 
                "\\normalfont\\bfseries{--}", "\\(\\vdash\\)",
                "\\(\\dashv\\)", "\\(\\flat\\)", "\\(\\natural\\)",
@@ -148,7 +148,7 @@ const LString & Bullet::bulletEntry(const short & f, const short & c)
                "\\(\\rightharpoonup\\)", "\\(\\rightharpoondown\\)", 
                "\\(\\Rightarrow\\)", "\\(\\succ\\)"
        };
-       static LString const BulletPanel1[CHARMAX] = {
+       static string const BulletPanel1[CHARMAX] = {
                /* amssymb */
                "\\(\\Rrightarrow\\)", "\\(\\rightarrowtail\\)",
                "\\(\\twoheadrightarrow\\)", "\\(\\rightsquigarrow\\)",
@@ -167,7 +167,7 @@ const LString & Bullet::bulletEntry(const short & f, const short & c)
                "\\(\\blacktriangledown\\)", "\\(\\blacklozenge\\)",
                "\\(\\blacksquare\\)"
        };
-       static LString const BulletPanel2[CHARMAX] = {
+       static string const BulletPanel2[CHARMAX] = {
                /* psnfss1 */
                "\\ding{108}", "\\ding{109}",
                "\\ding{119}", "\\Pisymbol{psy}{197}",
@@ -188,7 +188,7 @@ const LString & Bullet::bulletEntry(const short & f, const short & c)
                "\\ding{166}", "\\ding{167}",
                "\\ding{226}", "\\ding{227}"
        };
-       static LString const BulletPanel3[CHARMAX] = {
+       static string const BulletPanel3[CHARMAX] = {
                /* psnfss2 */
                "\\ding{37}", "\\ding{38}",
                "\\ding{34}", "\\ding{36}",
@@ -209,7 +209,7 @@ const LString & Bullet::bulletEntry(const short & f, const short & c)
                "\\ding{171}", "\\ding{168}",
                "\\ding{169}", "\\ding{170}"
        };
-       static LString const BulletPanel4[CHARMAX] = {
+       static string const BulletPanel4[CHARMAX] = {
                /* psnfss3 */
                "\\ding{65}", "\\ding{76}",
                "\\ding{75}", "\\ding{72}",
@@ -230,7 +230,7 @@ const LString & Bullet::bulletEntry(const short & f, const short & c)
                "\\ding{102}", "\\ding{96}",
                "\\ding{95}", "\\ding{97}"
        };
-       static LString const BulletPanel5[CHARMAX] = {
+       static string const BulletPanel5[CHARMAX] = {
                /* psnfss4 */
                "\\ding{223}", "\\ding{224}",
                "\\ding{225}", "\\ding{232}",
@@ -250,9 +250,9 @@ const LString & Bullet::bulletEntry(const short & f, const short & c)
                "\\Pisymbol{psy}{174}", "\\Pisymbol{psy}{222}",
                "\\ding{254}", "\\ding{242}",
                "\\ding{231}", "\\Pisymbol{psy}{45}"
-       };  /* LString const BulletPanels[][] */
+       };  /* string const BulletPanels[][] */
 
-       static LString const * BulletPanels[FONTMAX] = {
+       static string const * BulletPanels[FONTMAX] = {
                BulletPanel0, BulletPanel1,
                BulletPanel2, BulletPanel3,
                BulletPanel4, BulletPanel5