X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.h;h=6942650e1906291412a33bab54609e0619353d68;hb=cb52251ccff29d6cbfa13ab90a96be566e3f41ac;hp=68ee86ff53232594a3fb91dcdae58a4bcb82dbda;hpb=d1182f17daa1a164d9527ccbe6500840d7ac6bc8;p=lyx.git

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index 68ee86ff53..6942650e19 100644
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -2,19 +2,20 @@
 #ifndef LYXFUNC_H
 #define LYXFUNC_H
 
-#include <sigc++/signal_system.h>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
 
-#include FORMS_H_LOCATION
-#include "commandtags.h"
+#include <X11/Xlib.h>
+#include <sigc++/signal_system.h>
+
+#include "commandtags.h" // for kb_action enum
+#include "func_status.h"
 #include "kbsequence.h"
-#include "insets/inset.h"
 #include "LString.h"
 
 class LyXView;
+class LyXText;
 
 
 /** This class encapsulates all the LyX command operations. 
@@ -25,28 +26,15 @@ class LyXView;
 */
 class LyXFunc : public SigC::Object {
 public:
-	/// The status of a function.
-	enum func_status {
-		/// No problem
-		OK = 0,
-		///
-		Unknown = 1,
-		/// Command cannot be executed
-		Disabled = 2,
-		///
-		ToggleOn = 4,
-		///
-		ToggleOff = 8
-	};
 	///
 	explicit
 	LyXFunc(LyXView *);
     
 	/// LyX dispatcher, executes lyx actions.
-	string const Dispatch(int action, string const & arg = string());
+	string const dispatch(int action, string const & arg = string());
 			 
 	/// The same but uses the name of a lyx command.
-	string const Dispatch(string const & cmd);
+	string const dispatch(string const & cmd);
 
 	///
 	void miniDispatch(string const & cmd);
@@ -59,9 +47,10 @@ public:
 
 	/// we need one internall which is called from inside LyXAction and
 	/// can contain the string argument.
-	func_status getStatus(int ac) const;
+	func_status::value_type getStatus(int ac) const;
 	///
-	func_status getStatus(int ac, string const & not_to_use_arg) const;
+	func_status::value_type getStatus(int ac, 
+					  string const & not_to_use_arg) const;
 	
 	/// The last key was meta
 	bool wasMetaKey() const;
@@ -121,16 +110,16 @@ private:
 	// I think the following should be moved to BufferView. (Asger)
 
 	///
-	void MenuNew(bool fromTemplate);
+	void menuNew(bool fromTemplate);
 
 	///
-	void Open(string const &);
+	void open(string const &);
 
 	///
 	void doImport(string const &);
 
 	///
-	void CloseBuffer();
+	void closeBuffer();
 	///
 	void reloadBuffer();
 	///
@@ -185,11 +174,4 @@ void LyXFunc::setHintMessage(bool hm)
 	show_sc = hm;
 }
 
-///
-inline
-void operator|=(LyXFunc::func_status & fs, LyXFunc::func_status f)
-{
-	fs = static_cast<LyXFunc::func_status>(fs | f);
-}
-
 #endif