lyxstring compile fixes ; small stuff

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index 56cafa50c62cc0ced9f1d71d74fd92e0a7e64d0e..6a783e7c231b8f3d73e7bbc86c1ba1de9c2bf4f3 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -16,10 +16,10 @@
 #pragma interface
 #endif
 
-#include FORMS_H_LOCATION
 #include "LString.h"
 #include "undo.h"
 #include "commandtags.h"
+#include "insets/inset.h"
 #include <boost/utility.hpp>
 
 class LyXView;
@@ -29,9 +29,11 @@ class Buffer;
 class LyXScreen;
 class WorkArea;
 class Language;
+class Painter;
+class UpdatableInset;
 
 ///
-class BufferView : public boost::noncopyable {
+class BufferView : boost::noncopyable {
 public:
        ///
        enum UpdateCodes {
@@ -56,8 +58,6 @@ public:
        ///
        LyXScreen * screen() const;
        ///
-       WorkArea * workarea() const;
-       ///
        void buffer(Buffer * b);
        ///
        void resize(int, int, int, int);
@@ -81,11 +81,6 @@ public:
        ///
        int resizeCurrentBuffer();
        ///
-       void gotoInset(std::vector<Inset::Code> const & codes,
-                      bool same_content);
-       ///
-       void gotoInset(Inset::Code codes, bool same_content);
-       ///
        void cursorPrevious(LyXText *);
        ///
        void cursorNext(LyXText *);
@@ -120,8 +115,6 @@ public:
        ///
        void updateInset(Inset * inset, bool mark_dirty);
        ///
-       bool inset_slept;
-       ///
        int slx;
        ///
        int sly;
@@ -154,35 +147,9 @@ public:
        ///
        void copyEnvironment();
        ///
-       void hfill();
-       ///
-       void protectedBlank(LyXText *);
-       ///
-       void newline();
-       ///
-       void menuSeparator();
-       ///
-       void endOfSentenceDot();
-       ///
-       void ldots();
-       ///
-       void hyphenationPoint();
-       ///
        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();
        ///
@@ -193,10 +160,9 @@ public:
            Placie it in a layout of lout,
            if no_table make sure that it doesn't end up in a table.
        */
-       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);
+       //bool insertInset(Inset * inset, string const & lout = string(),
+       //               bool no_table = false);
+       bool insertInset(Inset * inset, string const & lout = string());
        /** Inserts a lyx file at cursor position.
            @return #false# if it fails.
        */
@@ -248,6 +214,8 @@ public:
        ///
        bool ChangeCitationsIfUnique(string const & from, string const & to);
        ///
+       string const getClipboard() const;
+       ///
        void pasteClipboard(bool asPara);
        ///
        void stuffClipboard(string const &) const;