Joao latest bits

[lyx.git] / src / frontends / lyx_gui.h

diff --git a/src/frontends/lyx_gui.h b/src/frontends/lyx_gui.h
index e42bb9fe6ae418d58220fdf7d01261cb1c788a81..1ef368778b61201739b969e6e70cbefd16960e4a 100644 (file)
--- a/src/frontends/lyx_gui.h
+++ b/src/frontends/lyx_gui.h
@@ -6,21 +6,24 @@
  *
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef LYX_GUI_H
 #define LYX_GUI_H
 
-#include "LColor.h"
-#include "LString.h"
+
 #include "FuncStatus.h"
 
+#include <string>
 #include <vector>
 
 class Dialogs;
+class LColor_color;
 class LyXFont;
 class LyXComm;
+class LyXDataSocket;
+class LyXServerSocket;
 class FuncRequest;
 
 /// GUI interaction
@@ -30,13 +33,13 @@ namespace lyx_gui {
 extern bool use_gui;
 
 /// return a suitable serif font name (called from non-gui context too !)
-string const roman_font_name();
+std::string const roman_font_name();
 
 /// return a suitable sans serif font name (called from non-gui context too !)
-string const sans_font_name();
+std::string const sans_font_name();
 
 /// return a suitable monospaced font name (called from non-gui context too !)
-string const typewriter_font_name();
+std::string const typewriter_font_name();
 
 /// parse command line and do basic initialisation
 void parse_init(int & argc, char * argv[]);
@@ -51,7 +54,12 @@ void parse_lyxrc();
  * Start the main event loop, after executing the given
  * batch commands, and loading the given documents
  */
-void start(string const & batch, std::vector<string> const & files);
+void start(std::string const & batch, std::vector<std::string> const & files);
+
+/**
+ * Synchronise all pending events.
+ */
+void sync_events();
 
 /**
  * quit running LyX
@@ -67,12 +75,12 @@ FuncStatus getStatus(FuncRequest const & ev);
 /** Eg, passing LColor::black returns "000000",
  *      passing LColor::white returns "ffffff".
  */
-string const hexname(LColor::color col);
+std::string const hexname(LColor_color col);
 
 /**
  * update an altered GUI color
  */
-void update_color(LColor::color col);
+void update_color(LColor_color col);
 
 /**
  * update the font cache
@@ -88,12 +96,16 @@ bool font_available(LyXFont const & font);
  * add a callback for I/O read notification
  */
 void set_read_callback(int fd, LyXComm * comm);
+void set_datasocket_callback(LyXDataSocket *);
+void set_serversocket_callback(LyXServerSocket *);
 
 /**
  * remove a I/O read callback
  * @param fd file descriptor
  */
 void remove_read_callback(int fd);
+void remove_datasocket_callback(LyXDataSocket *);
+void remove_serversocket_callback(LyXServerSocket *);
 
 } // namespace lyx_gui