fix scons again. (I begin to believe that Andre cripples scons intentionally. :-)

[features.git] / src / LColor.h

diff --git a/src/LColor.h b/src/LColor.h
index 95a4cf7cd4b5f239144bb02a1ff427e535ac4ae6..d7ca132759fc7d485e5397883d1463fcd776dc74 100644 (file)
--- a/src/LColor.h
+++ b/src/LColor.h
@@ -19,8 +19,9 @@
 #ifndef LCOLOR_H
 #define LCOLOR_H
 
+#include "support/docstring.h"
+
 #include <boost/scoped_ptr.hpp>
-#include <string>
 
 
 namespace lyx {
@@ -203,7 +204,7 @@ public:
        bool setColor(std::string const & lyxname, std::string const & x11name);
 
        /// Get the GUI name of \c color.
-       std::string const getGUIName(LColor::color c) const;
+       docstring const getGUIName(LColor::color c) const;
 
        /// Get the X11 name of \c color.
        std::string const getX11Name(LColor::color c) const;
@@ -214,8 +215,6 @@ public:
        /// Get the LyX name of \c color.
        std::string const getLyXName(LColor::color c) const;
 
-       /// \returns the LColor::color associated with the GUI name.
-       LColor::color getFromGUIName(std::string const & guiname) const;
        /// \returns the LColor::color associated with the LyX name.
        LColor::color getFromLyXName(std::string const & lyxname) const;
        /// \returns the LColor::color associated with the LaTeX name.