Compil fix.

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

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index c116bbb599494a6bd54e04505b4ea06bd5498ee5..d7d597021cfae7c4d4c3ca1b028f922e62dbab89 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -13,6 +13,10 @@
 
 #include "GuiWorkArea.h"
 
+#include "ColorCache.h"
+#include "FontLoader.h"
+#include "Menus.h"
+
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
@@ -60,6 +64,7 @@
 #include <QTimer>
 #include <QToolButton>
 #include <QToolTip>
+#include <QMenuBar>
 
 #include <boost/bind.hpp>
 
@@ -406,6 +411,12 @@ void GuiWorkArea::redraw()
 
 void GuiWorkArea::processKeySym(KeySymbol const & key, KeyModifier mod)
 {
+       if (lyx_view_->isFullScreen() && lyx_view_->menuBar()->isVisible()) {
+               // FIXME HACK: we should not have to do this here. See related comment
+               // in GuiView::event() (QEvent::ShortcutOverride)
+               lyx_view_->menuBar()->hide();
+       }
+
        // In order to avoid bad surprise in the middle of an operation,
        // we better stop the blinking cursor...
        // the cursor gets restarted in GuiView::restartCursor()
@@ -1526,8 +1537,8 @@ void TabWorkArea::updateTabTexts()
                        // final?
                        allFinal = allFinal && it->final();
                        
-                       LYXERR(Debug::GUI, "it = " << fromqstr(it->abs())
-                              << " => " << fromqstr(it->displayString()));
+                       LYXERR(Debug::GUI, "it = " << it->abs()
+                              << " => " << it->displayString());
                        
                        // still the same segment?
                        QString nextString;
@@ -1551,23 +1562,18 @@ void TabWorkArea::updateTabTexts()
                        It sit = segStart;
                        QString dspString = sit->forecastPathString();
                        LYXERR(Debug::GUI, "first forecast found for "
-                              << fromqstr(sit->abs())
-                              << " => " << fromqstr(dspString));
+                              << sit->abs() << " => " << dspString);
                        ++sit;
                        bool moreUnique = false;
                        for (; sit != next; ++sit) {
                                if (sit->forecastPathString() != dspString) {
                                        LYXERR(Debug::GUI, "different forecast found for "
-                                              << fromqstr(sit->abs())
-                                              << " => "
-                                              << fromqstr(sit->forecastPathString()));
+                                               << sit->abs() << " => " << sit->forecastPathString());
                                        moreUnique = true;
                                        break;
                                }
                                LYXERR(Debug::GUI, "same forecast found for "
-                                       << fromqstr(sit->abs())
-                                       << " => "
-                                       << fromqstr(dspString));
+                                       << sit->abs() << " => " << dspString);
                        }
                        
                        // if the path segment helped, add it. Otherwise add dots
@@ -1575,9 +1581,8 @@ void TabWorkArea::updateTabTexts()
                        LYXERR(Debug::GUI, "using dots = " << dots);
                        for (sit = segStart; sit != next; ++sit) {
                                sit->shiftPathSegment(dots);
-                               LYXERR(Debug::GUI, "shifting " << fromqstr(sit->abs())
-                                      << " => "
-                                      << fromqstr(sit->displayString()));
+                               LYXERR(Debug::GUI, "shifting "
+                                       << sit->abs() << " => " << sit->displayString());
                        }
 
                        // start new segment