add GuiView parent to QToc for proper memory management.

[lyx.git] / src / LColor.C

diff --git a/src/LColor.C b/src/LColor.C
index 2f2a9ff06f57b6ed41e0947f28d83f4be9198a11..f99c3e06c59711e73e8312806ecb60f93e8e2ae9 100644 (file)
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -174,12 +174,12 @@ LColor & LColor::operator=(LColor tmp)
 }
 
 
-string const LColor::getGUIName(LColor::color c) const
+docstring const LColor::getGUIName(LColor::color c) const
 {
        Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c);
        if (it != pimpl_->infotab.end())
-               return to_utf8(_(it->second.guiname));
-       return "none";
+               return _(it->second.guiname);
+       return from_ascii("none");
 }
 
 
@@ -240,7 +240,7 @@ bool LColor::setColor(string const & lyxname, string const &x11name)
 {
        string const lcname = ascii_lowercase(lyxname);
        if (pimpl_->lyxcolors.find(lcname) == pimpl_->lyxcolors.end()) {
-               lyxerr[Debug::GUI]
+               LYXERR(Debug::GUI)
                        << "LColor::setColor: Unknown color \""
                       << lyxname << '"' << endl;
                addColor(static_cast<color>(pimpl_->infotab.size()), lcname);
@@ -250,18 +250,6 @@ bool LColor::setColor(string const & lyxname, string const &x11name)
 }
 
 
-LColor::color LColor::getFromGUIName(string const & guiname) const
-{
-       Pimpl::InfoTab::const_iterator it = pimpl_->infotab.begin();
-       Pimpl::InfoTab::const_iterator end = pimpl_->infotab.end();
-       for (; it != end; ++it) {
-               if (!compare_ascii_no_case(to_utf8(_(it->second.guiname)), guiname))
-                       return it->first;
-       }
-       return LColor::inherit;
-}
-
-
 void LColor::addColor(LColor::color c, string const & lyxname) const
 {
        ColorEntry ce = { c, "", "", "", lyxname.c_str() };