Designer: BC cleanup of QDesignerIntegrationInterface.

Add features enumeration similar to that of
QDesignerFormWindowInterface. Add missing virtuals for IDE
integration.

Make a cleaned-up version of Qt Designer's implemenation
public as QDesignerIntegration such that IDE integrations
can use an integration class derived from it.

Add a bit of documentation, marked as \internal.

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

4 files changed, 5 insertions, 11 deletions

diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp
index a84e0732d..8b76294f1 100644
--- a/src/designer/src/designer/qdesigner_actions.cpp
+++ b/src/designer/src/designer/qdesigner_actions.cpp
@@ -59,11 +59,11 @@
 #include <previewmanager_p.h>
 #include <codedialog_p.h>
 #include <qdesigner_formwindowmanager_p.h>
-#include "qdesigner_integration_p.h"
 
 // sdk
 #include <QtDesigner/QDesignerFormEditorInterface>
 #include <QtDesigner/QDesignerFormWindowInterface>
+#include <QtDesigner/QDesignerIntegrationInterface>
 #include <QtDesigner/QDesignerLanguageExtension>
 #include <QtDesigner/QDesignerMetaDataBaseInterface>
 #include <QtDesigner/QDesignerFormWindowManagerInterface>
@@ -1089,9 +1089,7 @@ QAction *QDesignerActions::editWidgets() const
 
 void QDesignerActions::showWidgetSpecificHelp()
 {
-    QString helpId;
-    if (const qdesigner_internal::QDesignerIntegration *integration = qobject_cast<qdesigner_internal::QDesignerIntegration *>(core()->integration()))
-        helpId = integration->contextHelpId();
+    const QString helpId = core()->integration()->contextHelpId();
 
     if (helpId.isEmpty()) {
         showDesignerHelp();
diff --git a/src/designer/src/designer/qdesigner_formwindow.cpp b/src/designer/src/designer/qdesigner_formwindow.cpp
index 4770d2a58..dfee657da 100644
--- a/src/designer/src/designer/qdesigner_formwindow.cpp
+++ b/src/designer/src/designer/qdesigner_formwindow.cpp
@@ -93,7 +93,6 @@ QDesignerFormWindow::QDesignerFormWindow(QDesignerFormWindowInterface *editor, Q
 
     connect(m_editor->commandHistory(), SIGNAL(indexChanged(int)), this, SLOT(updateChanged()));
     connect(m_editor, SIGNAL(geometryChanged()), this, SLOT(geometryChanged()));
-    qdesigner_internal::FormWindowBase::setupDefaultAction(m_editor);
 }
 
 QDesignerFormWindow::~QDesignerFormWindow()
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp
index ffc4b8c7a..d6c925dc6 100644
--- a/src/designer/src/designer/qdesigner_workbench.cpp
+++ b/src/designer/src/designer/qdesigner_workbench.cpp
@@ -56,7 +56,7 @@
 #include <QtDesigner/QDesignerMetaDataBaseInterface>
 
 #include <QtDesigner/QDesignerComponents>
-#include <QtDesigner/private/qdesigner_integration_p.h>
+#include <QtDesigner/QDesignerIntegrationInterface>
 #include <QtDesigner/private/pluginmanager_p.h>
 #include <QtDesigner/private/formwindowbase_p.h>
 #include <QtDesigner/private/actioneditor_p.h>
@@ -231,7 +231,7 @@ QDesignerWorkbench::QDesignerWorkbench()  :
             connect(toolWindow, SIGNAL(closeEventReceived(QCloseEvent*)), this, SLOT(handleCloseEvent(QCloseEvent*)));
     }
     // Integration
-    m_integration = new qdesigner_internal::QDesignerIntegration(m_core, this);
+    m_integration = new QDesignerIntegration(m_core, this);
     connect(m_integration, SIGNAL(helpRequested(QString,QString)), m_actionManager, SLOT(helpRequested(QString,QString)));
 
     // remaining view options (config toolbars)
diff --git a/src/designer/src/designer/qdesigner_workbench.h b/src/designer/src/designer/qdesigner_workbench.h
index 9266eea60..d174baaa6 100644
--- a/src/designer/src/designer/qdesigner_workbench.h
+++ b/src/designer/src/designer/qdesigner_workbench.h
@@ -75,10 +75,7 @@ class ToolBarManager;
 class QDesignerFormEditorInterface;
 class QDesignerFormWindowInterface;
 class QDesignerFormWindowManagerInterface;
-
-namespace qdesigner_internal {
 class QDesignerIntegration;
-}
 
 class QDesignerWorkbench: public QObject
 {
@@ -161,7 +158,7 @@ private:
     void saveSettings() const;
 
     QDesignerFormEditorInterface *m_core;
-    qdesigner_internal::QDesignerIntegration *m_integration;
+    QDesignerIntegration *m_integration;
 
     QDesignerActions *m_actionManager;
     QActionGroup *m_windowActions;