installer: further preparation

[lyx.git] / src / MetricsInfo.h

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index d717a54282b612147c4c903df076a98dbcaf6ed2..05acbbbb045b9f73cbd1608b66686e23498e9a7c 100644 (file)
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -14,11 +14,10 @@
 #define METRICSINFO_H
 
 #include "Changes.h"
-#include "Color.h"
+#include "ColorCode.h"
 #include "FontInfo.h"
 
 #include "support/strfwd.h"
-#include "support/types.h"
 
 #include <string>
 
@@ -104,7 +103,7 @@ public:
        ColorCode backgroundColor(Inset const * inset, bool sel = true) const;
 
        /// Determines the text color based on the intended color, the
-       /// change tracking state and the selectio state. 
+       /// change tracking state and the selection state. 
        /// \param color what the color should be by default
        Color textColor(Color const & color) const;
 
@@ -230,7 +229,7 @@ public:
 class ColorChanger : public Changer<FontInfo, ColorCode> {
 public:
        ///
-       ColorChanger(FontInfo & font, docstring const & color,
+       ColorChanger(FontInfo & font, ColorCode color,
                     bool really_change_color = true);
        ///
        ~ColorChanger();