diff widgets/WindowTypeSelector.h @ 946:36cddc3de023 alignment_view

Merge from default branch
author Chris Cannam
date Mon, 20 Apr 2015 09:19:52 +0100
parents 4a578a360011
children 05d614f6e46d
line wrap: on
line diff
--- a/widgets/WindowTypeSelector.h	Thu Jan 15 16:00:53 2015 +0000
+++ b/widgets/WindowTypeSelector.h	Mon Apr 20 09:19:52 2015 +0100
@@ -28,8 +28,8 @@
     Q_OBJECT
 
 public:
-    WindowTypeSelector(WindowType defaultType = WindowType(999), // 999 -> get from preferences
-                       QWidget *parent = 0);
+    WindowTypeSelector(WindowType defaultType);
+    WindowTypeSelector(); // get window type from preferences
     virtual ~WindowTypeSelector();
 
     WindowType getWindowType() const;
@@ -48,6 +48,8 @@
     WindowShapePreview *m_windowShape;
     WindowType *m_windows;
     WindowType m_windowType;
+
+    void init(WindowType type);
 };
 
 #endif