Some string(widget->text()) fixes. Weirdness

[lyx.git] / src / frontends / qt2 / QContentPane.h

diff --git a/src/frontends/qt2/QContentPane.h b/src/frontends/qt2/QContentPane.h
index 1256762deaff39a2d4895de695a5a5aa602585c1..88f995e1541bfce1991d0950b7c9d32f2dfb68a5 100644 (file)
--- a/src/frontends/qt2/QContentPane.h
+++ b/src/frontends/qt2/QContentPane.h
@@ -1,10 +1,12 @@
 // -*- C++ -*-
 /**
  * \file QContentPane.h
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #ifndef QCONTENTPANE_H
@@ -14,17 +16,14 @@
 #pragma interface
 #endif
 
-#include <config.h>
-#include <utility>
-#include <boost/smart_ptr.hpp>
-
 #include <qwidget.h>
-#include <qscrollbar.h>
-#include <qpixmap.h>
 #include <qevent.h>
+#include <qpixmap.h>
+
+#include <boost/scoped_ptr.hpp>
+
+class QWorkArea;
 
-class QWorkArea; 
- 
 /// for emulating triple click
 struct double_click {
        int x;
@@ -39,51 +38,49 @@ struct double_click {
 
        double_click()
                : x(0), y(0), state(Qt::NoButton), active(false) {}
- 
+
        double_click(QMouseEvent * e)
                : x(e->x()), y(e->y()),
                state(e->button()), active(true) {}
 };
 
+
 /**
  * Widget for actually drawing the document on
  */
 class QContentPane : public QWidget {
        Q_OBJECT
- 
 public:
        QContentPane(QWorkArea * parent);
-        
+
        /// return the backing pixmap
-       QPixmap * pixmap() const { return pixmap_.get(); } 
- 
+       QPixmap * pixmap() const { return pixmap_.get(); }
 protected:
        /// repaint part of the widget
        void paintEvent(QPaintEvent * e);
        /// widget has been resized
        void resizeEvent(QResizeEvent * e);
- 
+
        /// mouse button press
        void mousePressEvent(QMouseEvent * e);
-       /// mouse button release 
+       /// mouse button release
        void mouseReleaseEvent(QMouseEvent * e);
-       /// mouse double click of button 
+       /// mouse double click of button
        void mouseDoubleClickEvent(QMouseEvent * e);
        /// mouse motion
        void mouseMoveEvent(QMouseEvent * e);
- 
+       /// wheel event
+       void wheelEvent(QWheelEvent * e);
        /// key press
        void keyPressEvent(QKeyEvent * e);
- 
 public slots:
        void doubleClickTimeout();
- 
+
        void scrollBarChanged(int);
- 
 private:
        /// owning widget
        QWorkArea * wa_;
- 
+
        /// the double buffered pixmap
        boost::scoped_ptr<QPixmap> pixmap_;