fix merge build src/frontends/qt4/QDocument.cpp

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

diff --git a/src/frontends/Toolbars.cpp b/src/frontends/Toolbars.cpp
index c424be9d05413a149c24feaa91fc3dcb50e15809..20082cdd635bc6a11e83ec227cdb28c9b44c698b 100644 (file)
--- a/src/frontends/Toolbars.cpp
+++ b/src/frontends/Toolbars.cpp
@@ -20,7 +20,7 @@
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "LyXFunc.h"
-#include "LyXTextClass.h"
+#include "TextClass.h"
 #include "LyXView.h"
 #include "LyX.h"
 
@@ -151,14 +151,13 @@ void Toolbars::display(string const & name, bool show)
        for (; cit != end; ++cit) {
                if (cit->name == name) {
                        unsigned int flags = cit->flags;
+                       TurnOffFlag(ON);
+                       TurnOffFlag(OFF);
                        TurnOffFlag(AUTO);
-                       if (show) {
+                       if (show)
                                TurnOnFlag(ON);
+                       else
                                TurnOnFlag(OFF);
-                       } else {
-                               TurnOnFlag(OFF);
-                               TurnOnFlag(ON);
-                       }
                        cit->flags = static_cast<lyx::ToolbarInfo::Flags>(flags);
                        displayToolbar(*cit, show);
                        return;
@@ -248,6 +247,16 @@ void Toolbars::update(bool in_math, bool in_table, bool review)
 }
 
 
+bool Toolbars::visible(string const & name) const
+{
+       std::map<string, ToolbarPtr>::const_iterator it =
+               toolbars_.find(name);
+       if (it == toolbars_.end())
+               return false;
+       return it->second.get()->isVisible();
+}
+
+
 void Toolbars::saveToolbarInfo()
 {
        ToolbarSection & tb = LyX::ref().session().toolbars();
@@ -361,10 +370,10 @@ void Toolbars::update()
 
 void layoutSelected(LyXView & lv, string const & name)
 {
-       LyXTextClass const & tc = lv.buffer()->params().getLyXTextClass();
+       TextClass const & tc = lv.buffer()->params().getTextClass();
 
-       LyXTextClass::const_iterator it  = tc.begin();
-       LyXTextClass::const_iterator const end = tc.end();
+       TextClass::const_iterator it  = tc.begin();
+       TextClass::const_iterator const end = tc.end();
        for (; it != end; ++it) {
                string const & itname = (*it)->name();
                // Yes, the lyx::to_utf8(_()) is correct