Some more cleanup of LyXView:

[lyx.git] / src / LyXFunc.h

diff --git a/src/LyXFunc.h b/src/LyXFunc.h
index 84dc9c58fd337f99663e6a9ca9df3320278c9826..bb5cab78ace1df3dd49e80856ad8cf98617400de 100644 (file)
--- a/src/LyXFunc.h
+++ b/src/LyXFunc.h
@@ -21,8 +21,6 @@
 
 #include "support/docstring.h"
 
-#include <boost/signals/trackable.hpp>
-
 namespace lyx {
 
 class Buffer;
@@ -32,6 +30,10 @@ class FuncStatus;
 class KeySymbol;
 class Text;
 
+namespace support {
+class FileName;
+}
+
 namespace frontend {
 class LyXView;
 }
@@ -42,7 +44,8 @@ class LyXView;
     keyboard or from the GUI. All GUI objects, including buttons and
     menus should use this class and never call kernel functions directly.
 */
-class LyXFunc : public boost::signals::trackable {
+class LyXFunc
+{
 public:
        ///
        explicit LyXFunc();
@@ -60,7 +63,7 @@ public:
        docstring const viewStatusMessage();
 
        ///
-       void processKeySym(KeySymbol const & key, key_modifier::state state);
+       void processKeySym(KeySymbol const & key, KeyModifier state);
 
        ///
        FuncStatus getStatus(FuncRequest const & action) const;
@@ -84,6 +87,10 @@ public:
        ///             not the current buffer
        void gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer);
 
+       /// load a buffer into the current workarea.
+       Buffer * loadAndViewFile(support::FileName const &  name, ///< File to load.
+               bool tolastfiles = true);  ///< append to the "Open recent" menu?
+
 private:
        ///
        BufferView * view() const;
@@ -99,7 +106,7 @@ private:
        ///
        KeySequence cancel_meta_seq;
        ///
-       key_modifier::state meta_fake_bit;
+       KeyModifier meta_fake_bit;
 
        /// Error status, only Dispatch can change this flag
        mutable bool errorstat;