Upstreaming compilation patch needed for Gentoo.

[lyx.git] / src / frontends / qt4 / GuiWorkArea_Private.h

diff --git a/src/frontends/qt4/GuiWorkArea_Private.h b/src/frontends/qt4/GuiWorkArea_Private.h
index 0915b64d4c2d87b0c2bb456bacb65269225275f6..76b05c0d36bb1f5327f8f8544db6ca3f7e0a8ab1 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea_Private.h
+++ b/src/frontends/qt4/GuiWorkArea_Private.h
@@ -15,6 +15,7 @@
 #include "FuncRequest.h"
 #include "LyXRC.h"
 
+#include "support/FileName.h"
 #include "support/Timeout.h"
 
 #include <QMouseEvent>
@@ -105,12 +106,13 @@ struct GuiWorkArea::Private
        /// hide the cursor
        void removeCursor();
        ///
-       void dispatch(FuncRequest const & cmd0, KeyModifier = NoModifier);
+       void dispatch(FuncRequest const & cmd0);
        /// hide the visible cursor, if it is visible
        void hideCursor();
        /// show the cursor if it is not visible
        void showCursor();
-       ///
+       /// Set the range and value of the scrollbar and connect to its valueChanged
+       /// signal.
        void updateScrollbar();
        /// Change the cursor when the mouse hovers over a clickable inset
        void updateCursorShape();
@@ -126,16 +128,19 @@ struct GuiWorkArea::Private
                delete screen_;
                pixel_ratio_ = p->pixelRatio();
                if (lyxrc.use_qimage) {
-                       QImage *x = new QImage(pixel_ratio_ * p->viewport()->width(),
-                               pixel_ratio_ * p->viewport()->height(), QImage::Format_ARGB32_Premultiplied);
-#if QT_VERSION > 0x050000
+                       QImage *x =
+                               new QImage(static_cast<int>(pixel_ratio_ * p->viewport()->width()),
+                                                  static_cast<int>(pixel_ratio_ * p->viewport()->height()),
+                                                  QImage::Format_ARGB32_Premultiplied);
+#if QT_VERSION >= 0x050000
                        x->setDevicePixelRatio(pixel_ratio_);
 #endif
                        screen_ = x;
                } else {
-                       QPixmap *x = new QPixmap(pixel_ratio_ * p->viewport()->width(),
-                               pixel_ratio_ * p->viewport()->height());
-#if QT_VERSION > 0x050000
+                       QPixmap *x =
+                               new QPixmap(static_cast<int>(pixel_ratio_ * p->viewport()->width()),
+                                                       static_cast<int>(pixel_ratio_ * p->viewport()->height()));
+#if QT_VERSION >= 0x050000
                        x->setDevicePixelRatio(pixel_ratio_);
 #endif
                        screen_ = x;
@@ -147,8 +152,6 @@ struct GuiWorkArea::Private
        QPaintDevice * screen_;
        ///
        BufferView * buffer_view_;
-       /// Read only Buffer status cache.
-       bool read_only_;
        ///
        GuiView * lyx_view_;
        /// is the cursor currently displayed
@@ -180,10 +183,25 @@ struct GuiWorkArea::Private
        /// are ignored
        bool dialog_mode_;
        /// store the name of the context menu when the mouse is
-       /// pressed. This is used to get the correct context menu 
+       /// pressed. This is used to get the correct context menu
        /// when the menu is actually shown (after releasing on Windows)
        /// and after the DEPM has done its job.
        std::string context_menu_name_;
+
+       /// stuff related to window title
+       ///
+       support::FileName file_name_;
+       ///
+       bool shell_escape_;
+       ///
+       bool read_only_;
+       ///
+       docstring vc_status_;
+       ///
+       bool clean_;
+       ///
+       bool externally_modified_;
+
 }; // GuiWorkArea
 
 } // namespace frontend