Use QFontMetrics information for underlines (and friends) width and position

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

diff --git a/src/frontends/qt4/GuiWorkArea.h b/src/frontends/qt4/GuiWorkArea.h
index 42bde9de90e25d5ce910d6712f47668901774f54..5039e45b84a97da4f7df7d3ab7c7329b15c1f891 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.h
+++ b/src/frontends/qt4/GuiWorkArea.h
@@ -15,8 +15,6 @@
 
 #include "frontends/WorkArea.h"
 
-#include "support/docstring.h"
-
 #include <QAbstractScrollArea>
 #include <QTabBar>
 #include <QTabWidget>
@@ -86,6 +84,9 @@ public:
        GuiView const & view() const;
        GuiView & view();
 
+       /// Current ratio between physical pixels and device-independent pixels
+       double pixelRatio() const;
+
 public Q_SLOTS:
        ///
        void stopBlinkingCursor();
@@ -201,6 +202,7 @@ public:
        GuiWorkArea * currentWorkArea();
        GuiWorkArea * workArea(Buffer & buffer);
        GuiWorkArea * workArea(int index);
+       void paintEvent(QPaintEvent *);
 
 Q_SIGNALS:
        ///
@@ -216,6 +218,8 @@ public Q_SLOTS:
        /// close the tab given by \c index
        void closeTab(int index);
        ///
+       void moveTab(int fromIndex, int toIndex);
+       ///
        void updateTabTexts();
        
 private Q_SLOTS:
@@ -224,8 +228,6 @@ private Q_SLOTS:
        ///
        void showContextMenu(const QPoint & pos);
        ///
-       void moveTab(int fromIndex, int toIndex);
-       ///
        void mouseDoubleClickEvent(QMouseEvent * event);
 
 private:
@@ -243,11 +245,6 @@ public:
        ///
        DragTabBar(QWidget * parent = 0);
 
-#if QT_VERSION < 0x040300
-       ///
-       int tabAt(QPoint const & position) const;
-#endif
-
 protected:
        ///
        void mousePressEvent(QMouseEvent * event);
@@ -261,8 +258,6 @@ protected:
 private:
        ///
        QPoint dragStartPos_;
-       ///
-       int dragCurrentIndex_;
 
 Q_SIGNALS:
        ///