Fix reloading of local layout file (bug #11120)

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

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index bc720d5edd55f0263541832603f57307e9696265..db96e0e526dbf3ed77bf208bc7092a191c7c6029 100644 (file)
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -71,7 +71,7 @@ GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiView & owner)
 void GuiToolbar::setVisible(bool visible)
 {
        // This is a hack to find out which toolbars have been restored by
-       // MainWindow::restoreState and which toolbars should be initialized 
+       // MainWindow::restoreState and which toolbars should be initialized
        // by us (i.e., new toolbars)
        restored_ = true;
        QToolBar::setVisible(visible);
@@ -91,7 +91,7 @@ void GuiToolbar::fill()
        ToolbarInfo::item_iterator it = tbinfo_.items.begin();
        ToolbarInfo::item_iterator end = tbinfo_.items.end();
        for (; it != end; ++it)
-               add(*it);       
+               add(*it);
        filled_ = true;
 }
 
@@ -178,7 +178,7 @@ public:
        }
 };
 
-}
+} // namespace
 
 
 MenuButton::MenuButton(GuiToolbar * bar, ToolbarItem const & item, bool const sticky)
@@ -351,9 +351,8 @@ QString GuiToolbar::sessionKey() const
 }
 
 
-void GuiToolbar::saveSession() const
+void GuiToolbar::saveSession(QSettings & settings) const
 {
-       QSettings settings;
        settings.setValue(sessionKey() + "/visibility", visibility_);
        settings.setValue(sessionKey() + "/movability", isMovable());
 }
@@ -368,7 +367,7 @@ void GuiToolbar::restoreSession()
        if (visibility == error_val || visibility == 0) {
                // This should not happen, but in case we use the defaults
                LYXERR(Debug::GUI, "Session settings could not be found! Defaults are used instead.");
-               visibility = 
+               visibility =
                        guiApp->toolbars().defaultVisibility(fromqstr(objectName()));
        }
        setVisibility(visibility);