Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index 9c791e88946b4e9f16cb4e09cf960b298b8ad116..56cafa50c62cc0ced9f1d71d74fd92e0a7e64d0e 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -17,7 +17,9 @@
 #endif
 
 #include FORMS_H_LOCATION
+#include "LString.h"
 #include "undo.h"
+#include "commandtags.h"
 #include <boost/utility.hpp>
 
 class LyXView;
@@ -29,7 +31,7 @@ class WorkArea;
 class Language;
 
 ///
-class BufferView : public noncopyable {
+class BufferView : public boost::noncopyable {
 public:
        ///
        enum UpdateCodes {
@@ -68,7 +70,7 @@ public:
        ///
        void update();
        //
-       void update(UpdateCodes uc);
+       void update(LyXText *, UpdateCodes uc);
        ///
        void updateScrollbar();
        ///
@@ -92,13 +94,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)
        */
@@ -154,7 +156,7 @@ public:
        ///
        void hfill();
        ///
-       void protectedBlank();
+       void protectedBlank(LyXText *);
        ///
        void newline();
        ///
@@ -238,32 +240,19 @@ public:
 
        ///
        void pushIntoUpdateList(Inset * i);
-#if 0
        ///
-       void workAreaExpose();
-       ///
-       void workAreaButtonPress(int x, int y, unsigned int button);
-       ///
-       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 ChangeRefs(string const & from, string const & to);
+       bool ChangeInsets(Inset::Code code, string const & from, 
+                         string const & to);
        ///
        bool ChangeRefsIfUnique(string const & from, string const & to);
        ///
+       bool ChangeCitationsIfUnique(string const & from, string const & to);
+       ///
        void pasteClipboard(bool asPara);
        ///
        void stuffClipboard(string const &) const;
+       ///
+       bool Dispatch(kb_action action, string const & argument);
 private:
        struct Pimpl;
        ///