Designer: BC cleanup of QDesignerFormWindowManager.

Obsolete the virtual action-accessors causing Qt 4 BC grief
by action() taking an enumeration that can be easily extended.
Make actions added during Qt 4 development available.

Make preview functionality public for IDE integration.

Acked-by: Jarek Kobus <jkobus@trolltech.com>

2 files changed, 3 insertions, 82 deletions

diff --git a/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp b/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp
index 1521e146e..14bdfde18 100644
--- a/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp
+++ b/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp
@@ -70,50 +70,6 @@ QDesignerFormWindowManager::~QDesignerFormWindowManager()
 }
 
 /*!
-    Allows you to intervene and control \QD's form "Preview" action. The
-    function returns the original action.
-
-    \since 4.5
-  */
-QAction *QDesignerFormWindowManager::actionDefaultPreview() const
-{
-    return 0;
-}
-
-/*!
-    Allows you to intervene and control \QD's form "Preview in" style action. The
-    function returns the original list of actions.
-
-    The method calls PreviewManager::createStyleActionGroup() internally.
-
-    \since 4.5
-  */
-QActionGroup *QDesignerFormWindowManager::actionGroupPreviewInStyle() const
-{
-    return 0;
-}
-
-/*!
-    \fn QPixmap QDesignerFormWindowManager::createPreviewPixmap(QString *errorMessage)
-
-    Creates a pixmap representing the preview of the currently active form.
-
-    The method calls PreviewManager::createPreviewPixmap() internally.
-
-    \since 4.5
-  */
-
-
-/*!
-    \fn QPixmap QDesignerFormWindowManager::closeAllPreviews()
-
-    Closes all preview windows generated by actionDefaultPreview, actionGroupPreviewInStyle
-    and the corresponding methods in PreviewManager.
-
-    \since 4.5
-  */
-
-/*!
     \fn PreviewManager *QDesignerFormWindowManager::previewManager()
 
     Accesses the previewmanager implementation.
@@ -122,31 +78,7 @@ QActionGroup *QDesignerFormWindowManager::actionGroupPreviewInStyle() const
     \internal
   */
 
-/*!
-    \fn QAction *QDesignerFormWindowManager::actionShowFormWindowSettingsDialog() const;
-
-    Allows you to intervene and control \QD's form "Form Settings" action. The
-    function returns the original action.
-
-    \since 4.5
-    \internal
-  */
-
-QAction *QDesignerFormWindowManager::actionShowFormWindowSettingsDialog() const
-{
-    return 0;
-}
-
-/*!
-    \fn void QDesignerFormWindowManager::aboutPlugins()
-
-    Pops up an "About plugins" dialog.
-
-    \since 4.5
-    \internal
-  */
-
-void QDesignerFormWindowManager::aboutPlugins()
+void QDesignerFormWindowManager::showPluginDialog()
 {
     PluginDialog dlg(core(), core()->topLevel());
     dlg.exec();
@@ -161,7 +93,7 @@ void QDesignerFormWindowManager::aboutPlugins()
 
     \since 4.5
     \internal
-  */
+*/
 
 
 QT_END_NAMESPACE
diff --git a/src/designer/src/lib/shared/qdesigner_formwindowmanager_p.h b/src/designer/src/lib/shared/qdesigner_formwindowmanager_p.h
index 43c9149fc..835e71b22 100644
--- a/src/designer/src/lib/shared/qdesigner_formwindowmanager_p.h
+++ b/src/designer/src/lib/shared/qdesigner_formwindowmanager_p.h
@@ -73,20 +73,9 @@ public:
     explicit QDesignerFormWindowManager(QObject *parent = 0);
     virtual ~QDesignerFormWindowManager();
 
-    virtual QAction *actionDefaultPreview() const;
-    virtual QActionGroup *actionGroupPreviewInStyle() const;
-    virtual QAction *actionShowFormWindowSettingsDialog() const;
-
-    virtual QPixmap createPreviewPixmap(QString *errorMessage) = 0;
-
     virtual PreviewManager *previewManager() const = 0;
 
-Q_SIGNALS:
-    void formWindowSettingsChanged(QDesignerFormWindowInterface *fw);
-
-public Q_SLOTS:
-    virtual void closeAllPreviews() = 0;
-    void aboutPlugins();
+    virtual void showPluginDialog();
 
 private:
     void *m_unused;