ws changes only

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

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index cffb89354a2ec868cec2f52ed06ec56e0e8c63f8..7878be10d1e5bc149b5a60b0d7f3e81198250fce 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,9 @@
 
 #include "inset.h"
 #include "tabular.h"
-#include "LString.h"
-#include "FuncStatus.h"
 #include "frontends/mouse_state.h"
 
+class FuncStatus;
 class LyXLex;
 class Painter;
 class BufferView;
@@ -69,15 +68,15 @@ 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;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
-       string const editMessage() const;
+       std::string const editMessage() const;
        //
        void insetUnlock(BufferView *);
        ///
@@ -106,16 +105,16 @@ public:
        ///
        bool display() const { return tabular.isLongTabular(); }
        ///
-       RESULT localDispatch(FuncRequest const &);
+       dispatch_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;
        ///
@@ -125,10 +124,10 @@ public:
        /// Get the absolute document x,y of the cursor
        virtual void getCursor(BufferView &, int &, int &) const;
        ///
-       bool tabularFeatures(BufferView * bv, string const & what);
+       bool tabularFeatures(BufferView * bv, std::string const & what);
        ///
        void tabularFeatures(BufferView * bv, LyXTabular::Feature feature,
-                            string const & val = string());
+                            std::string const & val = std::string());
        ///
        int getActCell() const { return actcell; }
        ///
@@ -140,15 +139,13 @@ public:
        ///
        void deleteLyXText(BufferView *, bool recursive = true) const;
        ///
-       void resizeLyXText(BufferView *, bool force = false) const;
-       ///
        void openLayoutDialog(BufferView *) const;
        ///
        bool showInsetDialog(BufferView *) const;
        ///
-       FuncStatus getStatus(string const & argument) const;
-       ///
-       void getLabelList(std::vector<string> &) const;
+       FuncStatus getStatus(std::string const & argument) const;
+       /// Appends \c list with all labels found within this inset.
+       void getLabelList(Buffer const &, std::vector<std::string> & list) const;
        ///
        int scroll(bool recursive=true) const;
        ///
@@ -178,9 +175,9 @@ public:
        /// find next change
        bool nextChange(BufferView *, lyx::pos_type & length);
        ///
-       bool searchForward(BufferView *, string const &,
+       bool searchForward(BufferView *, std::string const &,
                           bool = true, bool = false);
-       bool searchBackward(BufferView *, string const &,
+       bool searchBackward(BufferView *, std::string const &,
                            bool = true, bool = false);
 
        // this should return true if we have a "normal" cell, otherwise true.
@@ -203,7 +200,7 @@ public:
        ///
        virtual BufferView * view() const;
        ///
-       Buffer const * buffer() const;
+       Buffer const & buffer() const;
 
        /// set the owning buffer
        void buffer(Buffer * b);
@@ -232,13 +229,13 @@ private:
        ///
        void setPos(BufferView *, int x, int y) const;
        ///
-       RESULT moveRight(BufferView *, bool lock = true);
+       dispatch_result moveRight(BufferView *, bool lock = true);
        ///
-       RESULT moveLeft(BufferView *, bool lock = true);
+       dispatch_result moveLeft(BufferView *, bool lock = true);
        ///
-       RESULT moveUp(BufferView *, bool lock = true);
+       dispatch_result moveUp(BufferView *, bool lock = true);
        ///
-       RESULT moveDown(BufferView *, bool lock = true);
+       dispatch_result moveDown(BufferView *, bool lock = true);
        ///
        bool moveNextCell(BufferView *, bool lock = false);
        ///
@@ -284,7 +281,7 @@ private:
        ///
        WordLangTuple selectNextWordInt(BufferView *, float & value) const;
        ///
-       bool insertAsciiString(BufferView *, string const & buf, bool usePaste);
+       bool insertAsciiString(BufferView *, std::string const & buf, bool usePaste);
 
        //
        // Private structures and variables
@@ -337,20 +334,20 @@ public:
        ///
        virtual InsetBase & inset() const { return inset_; }
        ///
-       virtual string const & name() const { return name_; }
+       virtual std::string const & name() const { return name_; }
        ///
-       virtual string const inset2string(Buffer const &) const;
+       virtual std::string const inset2string(Buffer const &) const;
        /// Returns the active cell if successful, else -1.
-       static int string2params(string const &, InsetTabular &);
+       static int string2params(std::string const &, InsetTabular &);
        ///
-       static string const params2string(InsetTabular const &);
+       static std::string const params2string(InsetTabular const &);
 private:
        ///
-       static string const name_;
+       static std::string const name_;
        ///
        InsetTabular & inset_;
 };
 
-string const featureAsString(LyXTabular::Feature feature);
+std::string const featureAsString(LyXTabular::Feature feature);
 
 #endif