Minipage is no more (long live the box inset)

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

diff --git a/src/frontends/Toolbar.h b/src/frontends/Toolbar.h
index c698dd8a28fde6246f07e42933270285d50cb607..e6d23cac6ddd849fa36930941fcd259667802aa5 100644 (file)
--- a/src/frontends/Toolbar.h
+++ b/src/frontends/Toolbar.h
@@ -12,8 +12,6 @@
 #ifndef TOOLBAR_H
 #define TOOLBAR_H
 
-
-#include "LString.h"
 #include "ToolbarBackend.h"
 
 class LyXView;
@@ -28,17 +26,17 @@ public:
        ///
        Toolbar();
 
-       /// 
+       ///
        virtual ~Toolbar();
 
        /// Initialize toolbar from backend
-       void init();
+       void init();
 
        /// update the state of the toolbars
        void update(bool in_math, bool in_table);
 
        /// update the layout combox
-       virtual void setLayout(string const & layout) = 0;
+       virtual void setLayout(std::string const & layout) = 0;
        /**
         * Populate the layout combox - returns whether we did a full
         * update or not
@@ -57,7 +55,7 @@ private:
        virtual void update() = 0;
 
        /// show or hide a toolbar
-       virtual void displayToolbar(ToolbarBackend::Toolbar const & tb, 
+       virtual void displayToolbar(ToolbarBackend::Toolbar const & tb,
                                    bool show) = 0;
 
        /// Populate the layout combox.