get rid of broken_header.h and some unneeded tests

[lyx.git] / src / frontends / LyXView.h

diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h
index 14a0633c937d7a4eb15d3c2382f08ba576ced6a6..c43dc7118638b69930cad6f8c0a786a2dfa73ef7 100644 (file)
--- a/src/frontends/LyXView.h
+++ b/src/frontends/LyXView.h
@@ -13,18 +13,17 @@
 #ifndef LYXVIEW_H
 #define LYXVIEW_H
 
-#include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
+#include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
-#include <boost/signals/signal0.hpp>
+#include <boost/utility.hpp>
 
 class Buffer;
 class Toolbars;
 class InsetBase;
 class Intl;
 class Menubar;
-class ControlCommandBuffer;
 
 class BufferView;
 class Dialogs;
@@ -33,6 +32,12 @@ class LyXFont;
 class Timeout;
 class FuncRequest;
 
+namespace lyx {
+namespace frontend {
+class ControlCommandBuffer;
+} // namespace frontend
+} // namespace lyx
+
 /**
  * LyXView - main LyX window
  *
@@ -82,7 +87,7 @@ public:
        /// return the toolbar for this view
        Toolbars & getToolbars() { return *toolbars_.get(); }
        ///
-       Toolbars const & getToolbasr() const { return *toolbars_.get(); }
+       Toolbars const & getToolbars() const { return *toolbars_.get(); }
 
        /// return the menubar for this view
        Menubar & getMenubar() { return *menubar_.get(); }
@@ -112,10 +117,10 @@ public:
        void updateMenubar();
 
        /// focus the command buffer (minibuffer)
-       boost::signal0<void> focus_command_buffer;
+       boost::signal<void()> focus_command_buffer;
 
        /// view state string changed
-       boost::signal0<void> view_state_changed;
+       boost::signal<void()> view_state_changed;
 
        /// display a message in the view
        virtual void message(std::string const &) = 0;
@@ -137,6 +142,9 @@ public:
         */
        Buffer const * const updateInset(InsetBase const *) const;
 
+       // returns true if this view has the focus.
+       virtual bool hasFocus() const = 0;
+
 protected:
        /// view of a buffer. Eventually there will be several.
        boost::shared_ptr<BufferView> bufferview_;
@@ -170,7 +178,10 @@ protected:
        /// view's command buffer controller
        // this has to be declared _after_ lyxfunc_ as its initialization depends
        // on it!
-       boost::scoped_ptr<ControlCommandBuffer> const controlcommand_;
+       typedef boost::scoped_ptr<lyx::frontend::ControlCommandBuffer>
+       CommandBufferPtr;
+
+       CommandBufferPtr const controlcommand_;
 };
 
 #endif // LYXVIEW_H