fix "make dist" target

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index b9ca44b8b5d9d5119429c932e7d09c85f8837948..2215b08f7aee37df0ebd53dde13580eaafaefe41 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -16,8 +16,9 @@
 #pragma interface
 #endif
 
-#include FORMS_H_LOCATION
+#include "LString.h"
 #include "undo.h"
+#include "commandtags.h"
 #include <boost/utility.hpp>
 
 class LyXView;
@@ -29,7 +30,7 @@ class WorkArea;
 class Language;
 
 ///
-class BufferView : public noncopyable {
+class BufferView : boost::noncopyable {
 public:
        ///
        enum UpdateCodes {
@@ -54,8 +55,6 @@ public:
        ///
        LyXScreen * screen() const;
        ///
-       WorkArea * workarea() const;
-       ///
        void buffer(Buffer * b);
        ///
        void resize(int, int, int, int);
@@ -68,7 +67,7 @@ public:
        ///
        void update();
        //
-       void update(UpdateCodes uc);
+       void update(LyXText *, UpdateCodes uc);
        ///
        void updateScrollbar();
        ///
@@ -79,7 +78,10 @@ public:
        ///
        int resizeCurrentBuffer();
        ///
-       void gotoError();
+       void gotoInset(std::vector<Inset::Code> const & codes,
+                      bool same_content);
+       ///
+       void gotoInset(Inset::Code codes, bool same_content);
        ///
        void cursorPrevious(LyXText *);
        ///
@@ -89,13 +91,13 @@ public:
        ///
        LyXView * owner() const;
        ///
-       void beforeChange();
+       void beforeChange(LyXText *);
         ///
-        void savePosition();
+        void savePosition(unsigned int i);
         ///
-        void restorePosition();
+        void restorePosition(unsigned int i);
        ///
-       bool NoSavedPositions();
+       bool isSavedPosition(unsigned int i);
        /** This holds the mapping between buffer paragraphs and screen rows.
            This should be private...but not yet. (Lgb)
        */
@@ -137,8 +139,6 @@ public:
        ///
        void insertCorrectQuote();
        ///
-       void gotoNote();
-       ///
        bool gotoLabel(string const & label);
        ///
        void paste();
@@ -153,7 +153,7 @@ public:
        ///
        void hfill();
        ///
-       void protectedBlank();
+       void protectedBlank(LyXText *);
        ///
        void newline();
        ///
@@ -168,18 +168,6 @@ public:
        void menuUndo();
        ///
        void menuRedo();
-#ifndef NEW_INSETS
-       ///
-       void toggleFloat();
-       ///
-       void openStuff();
-#endif
-       ///
-       void insertNote();
-#ifndef NEW_INSETS
-       ///
-       void allFloats(char flag, char figmar);
-#endif
        /// removes all autodeletable insets
        bool removeAutoInsets();
        ///
@@ -192,8 +180,6 @@ public:
        */
        bool insertInset(Inset * inset, string const & lout = string(),
                         bool no_table = false);
-       /// open and lock an updatable inset
-       bool open_new_inset(UpdatableInset * new_inset, bool behind = false);
        /** Inserts a lyx file at cursor position.
            @return #false# if it fails.
        */
@@ -237,32 +223,21 @@ public:
 
        ///
        void pushIntoUpdateList(Inset * i);
-#if 0
-       ///
-       void workAreaExpose();
        ///
-       void workAreaButtonPress(int x, int y, unsigned int button);
+       bool ChangeInsets(Inset::Code code, string const & from, 
+                         string const & to);
        ///
-       void workAreaButtonRelease(int x, int y, unsigned int button);
-       ///
-       void workAreaMotionNotify(int x, int y, unsigned int state);
-       ///
-       void doubleClick(int x, int y, unsigned int button);
-       ///
-       void tripleClick(int x, int y, unsigned int button);
-       ///
-       void enterView();
-       ///
-       void leaveView();
-#endif
+       bool ChangeRefsIfUnique(string const & from, string const & to);
        ///
-       bool ChangeRefs(string const & from, string const & to);
+       bool ChangeCitationsIfUnique(string const & from, string const & to);
        ///
-       bool ChangeRefsIfUnique(string const & from, string const & to);
+       string const getClipboard() const;
        ///
        void pasteClipboard(bool asPara);
        ///
        void stuffClipboard(string const &) const;
+       ///
+       bool Dispatch(kb_action action, string const & argument);
 private:
        struct Pimpl;
        ///