This is the merging of the GUI API cleanup branch that was developed in svn+ssh:...

[features.git] / src / frontends / qt3 / qscreen.h

diff --git a/src/frontends/qt3/qscreen.h b/src/frontends/qt3/qscreen.h
index 7d595f5e45a675ea3e91fd484cd2ebe7450e11e0..fed647d2e85f1cd83356c5cdd025c838f80e6e58 100644 (file)
--- a/src/frontends/qt3/qscreen.h
+++ b/src/frontends/qt3/qscreen.h
@@ -12,27 +12,27 @@
 #ifndef QSCREEN_H
 #define QSCREEN_H
 
-#include "screen.h"
+#include "frontends/GuiCursor.h"
+
 #include <qcolor.h>
 #include <qpixmap.h>
 
+namespace lyx {
+namespace frontend {
+
 class QWorkArea;
-class WorkArea;
 
 
 /**
  * Qt implementation of toolkit-specific parts of LyXScreen.
  */
-class QScreen : public LyXScreen {
+class QScreen {
 public:
        QScreen(QWorkArea &);
 
        virtual ~QScreen();
 
-protected:
-       /// get the work area
-       virtual WorkArea & workarea();
-
+public:
        /// repaint the whole content immediately
        void repaint();
 
@@ -40,7 +40,7 @@ protected:
        virtual void expose(int x, int y, int exp_width, int exp_height);
 
        /// paint the cursor and store the background
-       virtual void showCursor(int x, int y, int h, Cursor_Shape shape);
+       virtual void showCursor(int x, int y, int h, lyx::frontend::Cursor_Shape shape);
 
        /// hide the cursor
        virtual void removeCursor();
@@ -63,4 +63,7 @@ private:
        QColor cursor_color_;
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif // QSCREEN_H