Replace LString.h with support/std_string.h,

[features.git] / src / insets / insettabular.h

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index af0c4d58879d23486866a11d653bd16f919bba2d..372c42efb176a9f2aee0709241dce824bfdd53e0 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -6,7 +6,7 @@
  *
  * \author Jürgen Vigna
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 // This is the rewrite of the tabular (table) support.
 
@@ -47,10 +47,10 @@
 
 #include "inset.h"
 #include "tabular.h"
-#include "LString.h"
-#include "FuncStatus.h"
+#include "support/std_string.h"
 #include "frontends/mouse_state.h"
 
+class FuncStatus;
 class LyXLex;
 class Painter;
 class BufferView;
@@ -60,14 +60,6 @@ class Paragraph;
 
 class InsetTabular : public UpdatableInset {
 public:
-       ///
-       enum UpdateCodes {
-               NONE = 0,
-               CURSOR = 1,
-               CELL = 2,
-               FULL = 4,
-               INIT = 5
-       };
        ///
        InsetTabular(Buffer const &, int rows = 1, int columns = 1);
        ///
@@ -77,9 +69,9 @@ public:
        ///
        virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       void read(Buffer const *, LyXLex &);
+       void read(Buffer const &, LyXLex &);
        ///
-       void write(Buffer const *, std::ostream &) const;
+       void write(Buffer const &, std::ostream &) const;
        ///
        void metrics(MetricsInfo &, Dimension &) const;
        ///
@@ -89,15 +81,13 @@ public:
        //
        void insetUnlock(BufferView *);
        ///
-       void updateLocal(BufferView *, UpdateCodes) const;
+       void updateLocal(BufferView *) const;
        ///
        bool lockInsetInInset(BufferView *, UpdatableInset *);
        ///
        bool unlockInsetInInset(BufferView *, UpdatableInset *,
                                bool lr = false);
        ///
-       bool updateInsetInInset(BufferView *, InsetOld *);
-       ///
        int insetInInsetY() const;
        ///
        UpdatableInset * getLockingInset() const;
@@ -118,14 +108,14 @@ public:
        ///
        RESULT localDispatch(FuncRequest const &);
        ///
-       int latex(Buffer const *, std::ostream &,
+       int latex(Buffer const &, std::ostream &,
                  LatexRunParams const &) const;
        ///
-       int ascii(Buffer const *, std::ostream &, int linelen) const;
+       int ascii(Buffer const &, std::ostream &, int linelen) const;
        ///
-       int linuxdoc(Buffer const *, std::ostream &) const;
+       int linuxdoc(Buffer const &, std::ostream &) const;
        ///
-       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
+       int docbook(Buffer const &, std::ostream &, bool mixcont) const;
        ///
        void validate(LaTeXFeatures & features) const;
        ///
@@ -150,8 +140,6 @@ public:
        ///
        void deleteLyXText(BufferView *, bool recursive = true) const;
        ///
-       void resizeLyXText(BufferView *, bool force = false) const;
-       ///
        void openLayoutDialog(BufferView *) const;
        ///
        bool showInsetDialog(BufferView *) const;
@@ -160,11 +148,6 @@ public:
        ///
        void getLabelList(std::vector<string> &) const;
        ///
-       void nodraw(bool b) const {
-               UpdatableInset::nodraw(b);
-       }
-       bool nodraw() const;
-       ///
        int scroll(bool recursive=true) const;
        ///
        void scroll(BufferView *bv, float sx) const {
@@ -187,8 +170,6 @@ public:
        selectNextWordToSpellcheck(BufferView *, float & value) const;
        ///
        void selectSelectedWord(BufferView *);
-       ///
-       void toggleSelection(BufferView *, bool kill_selection);
 
        void markErased();
 
@@ -220,7 +201,7 @@ public:
        ///
        virtual BufferView * view() const;
        ///
-       Buffer const * buffer() const;
+       Buffer const & buffer() const;
 
        /// set the owning buffer
        void buffer(Buffer * b);
@@ -340,8 +321,6 @@ private:
        ///
        mutable bool locked;
        ///
-       mutable UpdateCodes need_update;
-       ///
        mutable int in_reset_pos;
 };