Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / frontends / qt4 / ColorCache.h

diff --git a/src/frontends/qt4/ColorCache.h b/src/frontends/qt4/ColorCache.h
index df1c595382118b886ec8d71039b88546ef022a8b..4ac490501160c2f244a2a67167ee2235245d2593 100644 (file)
--- a/src/frontends/qt4/ColorCache.h
+++ b/src/frontends/qt4/ColorCache.h
@@ -12,41 +12,41 @@
 #ifndef COLORCACHE_H
 #define COLORCACHE_H
 
-#include "LColor.h"
+#include "ColorCode.h"
 
 #include <QColor>
 
 #include <map>
 
 namespace lyx {
+
 struct RGBColor;
-}
 
 
 // FIXME: use a fixed-size array not a map ?
 
 /**
- * Cache from LColor to QColor.
+ * Cache from Color to QColor.
  */
 class ColorCache {
 public:
-       ColorCache();
+       ColorCache() {}
 
        /// get the given color
-       QColor const & get(LColor_color color) const;
+       QColor const & get(ColorCode color) const;
 
        /// clear all colors
        void clear();
 
 private:
-       typedef std::map<LColor_color, QColor> lcolor_map;
+       typedef std::map<ColorCode, QColor> lcolor_map;
 
        mutable lcolor_map colormap;
 };
 
-/// singleton instance
-extern ColorCache lcolorcache;
-
 ///
-QColor const rgb2qcolor(lyx::RGBColor const &);
+QColor const rgb2qcolor(RGBColor const &);
+
+} // namespace lyx
+
 #endif // COLORCACHE_H