Rename .C => .cpp for files in src/frontends/controllers, step 1

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

diff --git a/src/frontends/Toolbars.h b/src/frontends/Toolbars.h
index ad719b257b4764223982e73e3adf11e5f868c7bd..94c68a1527b07f953e5ae4eb996baa96e4935478 100644 (file)
--- a/src/frontends/Toolbars.h
+++ b/src/frontends/Toolbars.h
@@ -53,7 +53,7 @@ class Toolbar {
 public:
        virtual ~Toolbar() {}
        /// Add a button to the bar.
-       virtual void add(FuncRequest const & func, docstring const & tooltip) = 0;
+       virtual void add(ToolbarItem const & item) = 0;
 
        /** Hide the bar.
         *  \param update_metrics is a hint to the layout engine that the
@@ -68,7 +68,7 @@ public:
        /** update toolbar information
        * ToolbarInfo will then be saved by session
        */
-       virtual void saveInfo(ToolbarSection::ToolbarInfo & info) = 0;
+       virtual void saveInfo(ToolbarSection::ToolbarInfo & tbinfo) = 0;
 
        /// Refresh the contents of the bar.
        virtual void update() = 0;
@@ -89,7 +89,7 @@ public:
        void display(std::string const & name, bool show);
 
        /// get toolbar state (on/off/auto)
-       ToolbarBackend::Flags getToolbarState(std::string const & name);
+       ToolbarInfo::Flags getToolbarState(std::string const & name);
        
        /// toggle the state of toolbars (on/off/auto)
        void toggleToolbarState(std::string const & name);
@@ -117,10 +117,10 @@ public:
        typedef boost::shared_ptr<Toolbar> ToolbarPtr;
 
 private:
-       /// Add a new toolbar.
-       void add(ToolbarBackend::Toolbar const & tb);
+       /// Add a new toolbar. if newline==true, start from a new line
+       void add(ToolbarInfo const & tbinfo, bool newline);
        /// Show or hide a toolbar.
-       void displayToolbar(ToolbarBackend::Toolbar const & tb, bool show);
+       void displayToolbar(ToolbarInfo const & tbinfo, bool show);
        /// Update the state of the icons
        void update();
 
@@ -144,7 +144,7 @@ private:
        int last_textclass_;
 
        // load flags with saved values
-       void initFlags(ToolbarBackend::Toolbar & tbb);
+       void initFlags(ToolbarInfo & tbinfo);
 };
 
 /// Set the layout in the kernel when an entry has been selected