QPlatformDialogHelpers: Reduce dependency on QDialog.

For each QDialog-derived class, introduce a Q[X]Options class
containing the options of the dialog. An instance is shared
between the QDialog (or dialog desktop component) and the
helper.

Change-Id: Ibabf508a4b9eaea25615638a47a4c1b8f93c019e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.h b/src/plugins/platforms/windows/qwindowsdialoghelpers.h
index 96c03bbaec..a4fa8c4a3a 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.h
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.h
@@ -73,7 +73,9 @@ public:
     virtual void platformNativeDialogModalHelp();
     virtual void _q_platformRunNativeAppModalPanel();
     virtual void deleteNativeDialog_sys();
-    virtual bool show_sys(QWindow *parent);
+    virtual bool show_sys(QPlatformDialogHelper::ShowFlags flags,
+                          Qt::WindowFlags windowFlags,
+                          QWindow *parent);
     virtual void hide_sys();
     virtual QVariant styleHint(QPlatformDialogHelper::StyleHint) const;
 
@@ -82,14 +84,13 @@ public:
     virtual bool supportsNonModalDialog() const { return true; }
 
 protected:
-    explicit QWindowsDialogHelperBase(QDialog *dialog);
+    QWindowsDialogHelperBase();
     QWindowsNativeDialogBase *nativeDialog() const;
 
 private:
     virtual QWindowsNativeDialogBase *createNativeDialog() = 0;
     inline QWindowsNativeDialogBase *ensureNativeDialog();
 
-    QDialog *m_dialog;
     QWindowsNativeDialogBase *m_nativeDialog;
     HWND m_ownerWindow;
 };