fix typo that put too many include paths for most people

[lyx.git] / src / LColor.C

diff --git a/src/LColor.C b/src/LColor.C
index 8f884adb05a53b6df87e2c8c5da38bda829e566d..d445f313b257639c36119a7046538d99eb14a8de 100644 (file)
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -1,8 +1,8 @@
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- *      
+ *
  *         Copyright 1998-2001 The LyX Team
  *
  *======================================================*/
@@ -62,9 +62,8 @@ LColor::LColor()
        { foreground, N_("text"), "foreground", "black", "foreground" },
        { selection, N_("selection"), "selection", "LightBlue", "selection" },
        { latex, N_("latex text"), "latex", "DarkRed", "latex" },
-       { note, N_("note"), "note", "black", "note" },
+       { note, N_("note"), "note", "yellow", "note" },
        { notebg, N_("note background"), "notebg", "yellow", "notebg" },
-       { noteframe, N_("note frame"), "noteframe", "black", "noteframe" },
        { depthbar, N_("depth bar"), "depthbar", "IndianRed", "depthbar" },
        { language, N_("language"), "language", "Blue", "language" },
        { command, N_("command inset"), "command", "black", "command" },
@@ -73,6 +72,7 @@ LColor::LColor()
        { special, N_("special character"), "special", "RoyalBlue", "special" },
        { math, N_("math"), "math", "DarkBlue", "math" },
        { mathbg, N_("math background"), "mathbg", "linen", "mathbg" },
+       { graphicsbg, N_("graphics background"), "graphicsbg", "linen", "graphicsbg" },
        { mathmacrobg, N_("Math macro background"), "mathmacrobg", "linen", "mathmacrobg" },
        { mathframe, N_("math frame"), "mathframe", "Magenta", "mathframe" },
        { mathcursor, N_("math cursor"), "mathcursor", "black", "mathcursor" },
@@ -85,7 +85,7 @@ LColor::LColor()
        { error, N_("LaTeX error"), "error", "Red", "error" },
        { eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" },
        { appendixline, N_("appendix line"), "appendixline", "Brown", "appendixline" },
-       { vfillline, N_("vfill line"), "vfillline", "Brown", "vfillline" },
+       { added_space, N_("added space markers"), "added_space", "Brown", "added_space" },
        { topline, N_("top/bottom line"), "topline", "Brown", "topline" },
        { tabularline, N_("tabular line"), "tabularline", "black",
             "tabularline" },
@@ -116,7 +116,7 @@ string const LColor::getGUIName(LColor::color c) const
 {
        InfoTab::const_iterator ici = infotab.find(c);
        if (ici != infotab.end())
-               return _((*ici).second.guiname);
+               return _(ici->second.guiname);
 
        return "none";
 }
@@ -125,8 +125,8 @@ string const LColor::getGUIName(LColor::color c) const
 string const LColor::getX11Name(LColor::color c) const
 {
        InfoTab::const_iterator ici = infotab.find(c);
-       if (ici != infotab.end()) 
-               return (*ici).second.x11name;
+       if (ici != infotab.end())
+               return ici->second.x11name;
 
        lyxerr << "LyX internal error: Missing color"
                " entry in LColor.C for " << int(c) << '\n';
@@ -139,7 +139,7 @@ string const LColor::getLaTeXName(LColor::color c) const
 {
        InfoTab::const_iterator ici = infotab.find(c);
        if (ici != infotab.end())
-               return (*ici).second.latexname;
+               return ici->second.latexname;
        return "black";
 }
 
@@ -148,7 +148,7 @@ string const LColor::getLyXName(LColor::color c) const
 {
        InfoTab::const_iterator ici = infotab.find(c);
        if (ici != infotab.end())
-               return (*ici).second.lyxname;
+               return ici->second.lyxname;
        return "black";
 }
 
@@ -157,7 +157,7 @@ void LColor::setColor(LColor::color col, string const & x11name)
 {
        InfoTab::iterator iti = infotab.find(col);
        if (iti != infotab.end()) {
-               (*iti).second.x11name = x11name;
+               iti->second.x11name = x11name;
                return;
        }
        lyxerr << "LyX internal error: color and such.\n";
@@ -186,8 +186,8 @@ LColor::color LColor::getFromGUIName(string const & guiname) const
        InfoTab::const_iterator ici = infotab.begin();
        InfoTab::const_iterator end = infotab.end();
        for (; ici != end; ++ici) {
-               if (!compare_no_case(_((*ici).second.guiname), guiname))
-                       return (*ici).first;
+               if (!compare_no_case(_(ici->second.guiname), guiname))
+                       return ici->first;
        }
        return LColor::inherit;
 }
@@ -195,12 +195,12 @@ LColor::color LColor::getFromGUIName(string const & guiname) const
 
 LColor::color LColor::getFromLyXName(string const & lyxname) const
 {
-       
+
        InfoTab::const_iterator ici = infotab.begin();
        InfoTab::const_iterator end = infotab.end();
        for (; ici != end; ++ici) {
-               if (!compare_no_case((*ici).second.lyxname, lyxname))
-                       return (*ici).first;
+               if (!compare_no_case(ici->second.lyxname, lyxname))
+                       return ici->first;
        }
        return LColor::inherit;
 }