* Painter.h:

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index 53fcf3a6962e80dc84c3505c9d33df49a5c04853..75f5da045397ac248101862c5fc27afe8f212651 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -18,7 +18,7 @@
 #include "coordcache.h"
 #include "cursor.h"
 #include "metricsinfo.h"
-
+#include "UpdateFlags.h"
 #include "support/types.h"
 
 #include <boost/utility.hpp>
@@ -26,6 +26,9 @@
 
 #include <string>
 
+
+namespace lyx {
+
 class Buffer;
 class Change;
 class DocIterator;
@@ -38,26 +41,6 @@ class LyXText;
 class ParIterator;
 class ViewMetricsInfo;
 
-namespace Update {
-       enum flags {
-               FitCursor = 1,
-               Force = 2,
-               SinglePar = 4,
-               MultiParSel = 8
-       };
-
-inline flags operator|(flags const f, flags const g)
-{
-       return static_cast<flags>(int(f) | int(g));
-}
-
-inline flags operator&(flags const f, flags const g)
-{
-       return static_cast<flags>(int(f) & int(g));
-}
-
-} // namespace
-
 /// Scrollbar Parameters
 struct ScrollbarParameters
 {
@@ -138,7 +121,7 @@ public:
        LyXText const * getLyXText() const;
 
        /// move cursor to the named label
-       void gotoLabel(lyx::docstring const & label);
+       void gotoLabel(docstring const & label);
 
        /// set the cursor based on the given TeX source row
        void setCursorFromRow(int row);
@@ -166,7 +149,7 @@ public:
        bool dispatch(FuncRequest const & argument);
 
        ///
-       lyx::docstring const requestSelection();
+       docstring const requestSelection();
        ///
        void clearSelection();
 
@@ -177,7 +160,7 @@ public:
        bool workAreaDispatch(FuncRequest const & ev);
 
        /// access to anchor
-       lyx::pit_type anchor_ref() const;
+       pit_type anchor_ref() const;
 
        /// access to full cursor
        LCursor & cursor();
@@ -214,7 +197,7 @@ public:
        Intl const & getIntl() const { return *intl_.get(); }
 
        /// This signal is emitted when some message shows up.
-       boost::signal<void(lyx::docstring)> message;
+       boost::signal<void(docstring)> message;
 
        /// This signal is emitted when some dialog needs to be shown.
        boost::signal<void(std::string name)> showDialog;
@@ -261,11 +244,11 @@ private:
                /// Cursor paragraph Id
                int par_id;
                /// Cursor position
-               lyx::pos_type par_pos;
+               pos_type par_pos;
                ///
                Position() : par_id(0), par_pos(0) {}
                ///
-               Position(std::string const & f, int id, lyx::pos_type pos)
+               Position(std::string const & f, int id, pos_type pos)
                        : filename(f), par_id(id), par_pos(pos) {}
        };
        ///
@@ -284,7 +267,7 @@ private:
        ///
        bool multiparsel_cache_;
        ///
-       lyx::pit_type anchor_ref_;
+       pit_type anchor_ref_;
        ///
        int offset_ref_;
 
@@ -292,4 +275,7 @@ private:
        boost::scoped_ptr<Intl> const intl_;
 };
 
+
+} // namespace lyx
+
 #endif // BUFFERVIEW_H