Remove the magic boolean in getChildren() from the public interface.

[lyx.git] / src / frontends / qt4 / Toolbars.cpp

diff --git a/src/frontends/qt4/Toolbars.cpp b/src/frontends/qt4/Toolbars.cpp
index 4af1582cdfc8b52c2be809484555f34e395d98ac..b03b110d13e56ae8bbd1d271824d28770a15b645 100644 (file)
--- a/src/frontends/qt4/Toolbars.cpp
+++ b/src/frontends/qt4/Toolbars.cpp
@@ -23,7 +23,7 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 
 #include <algorithm>
 
@@ -55,7 +55,7 @@ ToolbarItem::ToolbarItem(Type type, string const & name, docstring const & label
 void ToolbarInfo::add(ToolbarItem const & item)
 {
        items.push_back(item);
-       items.back().func_.origin = FuncRequest::TOOLBAR;
+       items.back().func_.setOrigin(FuncRequest::TOOLBAR);
 }
 
 
@@ -218,7 +218,7 @@ ToolbarInfo & ToolbarInfo::read(Lexer & lex)
                                        break;
                                case TO_IMPORTFORMATS:
                                        lfun = LFUN_BUFFER_IMPORT;
-                                       tooltip = _("Import %1$s ...");
+                                       tooltip = _("Import %1$s");
                                        break;
                                case TO_UPDATEFORMATS:
                                        lfun = LFUN_BUFFER_UPDATE;
@@ -358,6 +358,8 @@ void Toolbars::readToolbarSettings(Lexer & lex)
                                flag = RIGHT;
                        else if (!compare_ascii_no_case(*cit, "auto"))
                                flag = AUTO;
+                       else if (!compare_ascii_no_case(*cit, "samerow"))
+                               flag = SAMEROW;
                        else {
                                LYXERR(Debug::ANY,
                                        "Toolbars::readToolbarSettings: unrecognised token:`"