X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FLyXView.h;h=3f2acfe95291dbca68a52f3b98545aa28d117c78;hb=558e849e692cc72ea74ac3859405b85e54c6e315;hp=96b1ebb71d0d7753379cf8d1b29db2f55be0d0fe;hpb=70d0ba900118ac7e253c1e1969fd7a3d64ec8e03;p=lyx.git

diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h
index 96b1ebb71d..3f2acfe952 100644
--- a/src/frontends/LyXView.h
+++ b/src/frontends/LyXView.h
@@ -20,11 +20,10 @@
 #include <boost/signals/signal0.hpp>
 
 class Buffer;
-class Toolbar;
-class InsetOld;
+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
  *
@@ -80,9 +85,9 @@ public:
 	LyXFunc const & getLyXFunc() const { return *lyxfunc_.get(); }
 
 	/// return the toolbar for this view
-	Toolbar & getToolbar() { return *toolbar_.get(); }
+	Toolbars & getToolbars() { return *toolbars_.get(); }
 	///
-	Toolbar const & getToolbar() const { return *toolbar_.get(); }
+	Toolbars const & getToolbasr() const { return *toolbars_.get(); }
 
 	/// return the menubar for this view
 	Menubar & getMenubar() { return *menubar_.get(); }
@@ -107,7 +112,7 @@ public:
 	void updateLayoutChoice();
 
 	/// update the toolbar
-	void updateToolbar();
+	void updateToolbars();
 	/// update the menubar
 	void updateMenubar();
 
@@ -135,7 +140,7 @@ public:
 	/** redraw \c inset in all the BufferViews in which it is currently
 	 *  visible. If successful return a pointer to the owning Buffer.
 	 */
-	Buffer const * const updateInset(InsetOld const *) const;
+	Buffer const * const updateInset(InsetBase const *) const;
 
 protected:
 	/// view of a buffer. Eventually there will be several.
@@ -143,8 +148,6 @@ protected:
 
 	/// view's menubar
 	boost::scoped_ptr<Menubar> menubar_;
-	/// view's toolbar
-	boost::scoped_ptr<Toolbar> toolbar_;
 
 private:
 	/**
@@ -157,6 +160,8 @@ private:
 	/// called on timeout
 	void autoSave();
 
+	/// view's toolbar
+	boost::scoped_ptr<Toolbars> toolbars_;
 	/// keyboard mapping object
 	boost::scoped_ptr<Intl> const intl_;
 	/// auto-saving of buffers
@@ -170,7 +175,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