X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FApplication.h;h=6c11007bbb15fb23ca7cdf76cbcb315742ea8a1e;hb=9be03a87f93796665dc5d28a5d3ff7ffb80bcf1d;hp=3907669f07767475872e9f764e13e073be1987cc;hpb=d348b0183bc02752102f50387d07947e1a602986;p=lyx.git

diff --git a/src/frontends/Application.h b/src/frontends/Application.h
index 3907669f07..6c11007bbb 100644
--- a/src/frontends/Application.h
+++ b/src/frontends/Application.h
@@ -11,6 +11,8 @@
 #ifndef LYX_APPLICATION_H
 #define LYX_APPLICATION_H
 
+#include "ColorCode.h"
+
 #include <boost/function.hpp>
 
 #include <string>
@@ -18,7 +20,6 @@
 namespace lyx {
 
 class BufferView;
-class Color_color;
 struct RGBColor;
 
 namespace frontend {
@@ -187,24 +188,24 @@ public:
 	* The function returns true if successful.
 	* It returns false on failure and sets r, g, b to 0.
 	*/
-	virtual bool getRgbColor(Color_color col, RGBColor & rgbcol) = 0;
+	virtual bool getRgbColor(ColorCode col, RGBColor & rgbcol) = 0;
 
-	/** Eg, passing Color::black returns "000000",
-	*      passing Color::white returns "ffffff".
+	/** Eg, passing Color_black returns "000000",
+	*      passing Color_white returns "ffffff".
 	*/
-	virtual std::string const hexName(Color_color col) = 0;
+	virtual std::string const hexName(ColorCode col) = 0;
 
 	/**
 	* update an altered GUI color
 	*/
-	virtual void updateColor(Color_color col) = 0;
+	virtual void updateColor(ColorCode col) = 0;
 
 	/**
 	* add a callback for socket read notification
 	* @param fd socket descriptor (file/socket/etc)
 	*/
-	virtual void registerSocketCallback(
-		int fd, boost::function<void()> func) = 0;
+	typedef boost::function<void()> SocketCallback;
+	virtual void registerSocketCallback(int fd, SocketCallback func) = 0;
 
 	/**
 	* remove a I/O read callback