clean up Abdel's cleanup

[lyx.git] / src / frontends / qt3 / qscreen.C

diff --git a/src/frontends/qt3/qscreen.C b/src/frontends/qt3/qscreen.C
index 53ae53d284a966657a2357888d54eb39a13301ea..ef0dcded4274e91d3ad081a5610e21fb4482d32d 100644 (file)
--- a/src/frontends/qt3/qscreen.C
+++ b/src/frontends/qt3/qscreen.C
@@ -10,8 +10,11 @@
 
 #include <config.h>
 
-#include "QWorkArea.h"
+// Dear Lord, deliver us from Evil, aka the Qt headers
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
 #include "qscreen.h"
+#include "QWorkArea.h"
 
 #include "debug.h"
 #include "lcolorcache.h"
@@ -30,9 +33,11 @@ void copyInPixmap(QPixmap * p, int dest_y, int src_y, int src_w, int src_h)
 
 } // namespace anon
 
+namespace lyx {
+namespace frontend {
 
 QScreen::QScreen(QWorkArea & o)
-       : LyXScreen(), owner_(o)
+       : owner_(o)
 {
 }
 
@@ -42,12 +47,6 @@ QScreen::~QScreen()
 }
 
 
-WorkArea & QScreen::workarea() const
-{
-       return owner_;
-}
-
-
 void QScreen::repaint()
 {
        QWidget * content = owner_.getContent();
@@ -64,7 +63,7 @@ void QScreen::expose(int x, int y, int w, int h)
 }
 
 
-void QScreen::showCursor(int x, int y, int h, Cursor_Shape shape)
+void QScreen::showCursor(int x, int y, int h, CursorShape shape)
 {
        if (!qApp->focusWidget())
                return;
@@ -162,3 +161,7 @@ void QScreen::removeCursor()
        owner_.getContent()
                ->update(cursor_x_, cursor_y_, cursor_w_, cursor_h_);
 }
+
+
+} // namespace frontend
+} // namespace lyx