the spellcheck cleanup

[lyx.git] / src / BufferView_pimpl.h

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 6599d6c6e7bcbb837b566f035bccdda3ed7508f8..58704e2d704817caaab6877184bebeba1c599232 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -18,22 +18,23 @@
 #ifndef BUFFERVIEW_PIMPL_H
 #define BUFFERVIEW_PIMPL_H
 
-#include "errorlist.h"
 #include "BufferView.h"
+#include "errorlist.h"
 
 #include "insets/inset.h"
 
 #include "frontends/key_state.h"
-#include "frontends/LyXKeySym.h"
 #include "frontends/Timeout.h"
 
 #include "support/types.h"
 
 #include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 #include <boost/signals/trackable.hpp>
 
 
 class Change;
+class LyXKeySym;
 class LyXView;
 class WorkArea;
 class LyXScreen;
@@ -63,9 +64,9 @@ struct BufferView::Pimpl : public boost::signals::trackable {
         * change but don't need the full update() logic
         */
        ///
-       bool newFile(string const &, string const &, bool);
+       bool newFile(std::string const &, std::string const &, bool);
        ///
-       bool loadLyXFile(string const &, bool);
+       bool loadLyXFile(std::string const &, bool);
        ///
        void workAreaResize();
        ///
@@ -77,6 +78,8 @@ struct BufferView::Pimpl : public boost::signals::trackable {
         */
        void scroll(int lines);
        ///
+       typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
+       ///
        void workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state);
        ///
        void selectionRequested();
@@ -103,7 +106,7 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        ///
        void center();
        ///
-       bool insertInset(InsetOld * inset, string const & lout = string());
+       bool insertInset(InsetOld * inset, std::string const & lout = std::string());
        ///
        void updateInset(InsetOld const * inset);
        /// a function should be executed from the workarea
@@ -149,8 +152,8 @@ private:
         * string. May only be used with InsetCommand-derived insets
         * Returns true if a screen update is needed.
         */
-       bool ChangeInsets(InsetOld::Code code, string const & from,
-                         string const & to);
+       bool ChangeInsets(InsetOld::Code code, std::string const & from,
+                         std::string const & to);
 
        ///
        friend class BufferView;
@@ -168,13 +171,13 @@ private:
        ///
        Timeout cursor_timeout;
        ///
-       void stuffClipboard(string const &) const;
+       void stuffClipboard(std::string const &) const;
        ///
        bool using_xterm_cursor;
        ///
        struct Position {
                /// Filename
-               string filename;
+               std::string filename;
                /// Cursor paragraph Id
                int par_id;
                /// Cursor position
@@ -182,7 +185,7 @@ private:
                ///
                Position() : par_id(0), par_pos(0) {}
                ///
-               Position(string const & f, int id, lyx::pos_type pos)
+               Position(std::string const & f, int id, lyx::pos_type pos)
                        : filename(f), par_id(id), par_pos(pos) {}
        };
        ///
@@ -190,7 +193,7 @@ private:
        /// Get next inset of this class from current cursor position
        InsetOld * getInsetByCode(InsetOld::Code code);
        ///
-       void MenuInsertLyXFile(string const & filen);
+       void MenuInsertLyXFile(std::string const & filen);
        /// our workarea
        WorkArea & workarea() const;
 };