Refactor: Preparing to move Window to libgui

It will serve as the base class for CanvasWindow.
skyjake · Apr 3, 2013 · 0bff9d8 · 0bff9d8
1 parent 7c1ee4d
commit 0bff9d8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/doomsday/client/include/ui/canvaswindow.h b/doomsday/client/include/ui/canvaswindow.h
@@ -27,15 +27,15 @@
 #  error "canvaswindow.h is only for __CLIENT__"
 #endif
 
-#include <QMainWindow>
+#include <de/Window>
 #include <de/RootWidget>
 #include "canvas.h"
 
 /**
  * Top-level window that contains an OpenGL drawing canvas. @ingroup base
  * @see Canvas
  */
-class CanvasWindow : public QMainWindow
+class CanvasWindow : public de::Window
 {
     Q_OBJECT
 
@@ -47,7 +47,7 @@ class CanvasWindow : public QMainWindow
     };
 
 public:
-    explicit CanvasWindow(QWidget *parent = 0);
+    CanvasWindow();
 
     de::RootWidget &root();
 

diff --git a/doomsday/client/include/ui/window.h b/doomsday/client/include/ui/window.h
@@ -46,9 +46,12 @@
 #define FLIP(y)             (DENG_WINDOW->height() - (y+1))
 
 /**
- * Window and window management.
+ * General-purpose top-level window with persistent state, plus legacy window
+ * management.
  *
- * @deprecated  Windows will be represented by CanvasWindow instances.
+ * @todo Merge this into libgui (as de::Window).
+ * @todo The class hierarchy should be CanvasWindow <= de::Window <= QMainWindow.
+ * @todo Window management belongs in the WindowSystem.
  */
 class Window
 {