Qt Designer: Remove QScript extension.

Change-Id: I351b1437442b65a96e07de6fa633e06f3953c128
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

1 files changed, 3 insertions, 59 deletions

diff --git a/src/designer/src/lib/shared/qsimpleresource.cpp b/src/designer/src/lib/shared/qsimpleresource.cpp
index 3cc17f28b..fd24d6b7c 100644
--- a/src/designer/src/lib/shared/qsimpleresource.cpp
+++ b/src/designer/src/lib/shared/qsimpleresource.cpp
@@ -43,13 +43,11 @@
 #include "widgetfactory_p.h"
 #include "widgetdatabase_p.h"
 
-#include <QtDesigner/private/formscriptrunner_p.h>
 #include <QtDesigner/private/properties_p.h>
 #include <QtDesigner/private/ui4_p.h>
 
 #include <QtDesigner/QDesignerFormEditorInterface>
 #include <QtDesigner/QDesignerLanguageExtension>
-#include <script_p.h>
 #include <QtDesigner/QExtensionManager>
 #include <QtDesigner/QDesignerCustomWidgetInterface>
 #include <QtDesigner/extrainfo.h>
@@ -81,10 +79,6 @@ QSimpleResource::QSimpleResource(QDesignerFormEditorInterface *core) :
     workingDirectory +=  QDir::separator();
     workingDirectory +=  QStringLiteral(".designer");
     setWorkingDirectory(QDir(workingDirectory));
-#ifndef QT_FORMBUILDER_NO_SCRIPT
-    // Disable scripting in the editors.
-    formScriptRunner()-> setOptions(QFormScriptRunner::DisableScripts);
-#endif
 }
 
 QSimpleResource::~QSimpleResource()
@@ -131,7 +125,7 @@ void QSimpleResource::addScript(const QString &script, ScriptSource source, DomS
     }
 }
 
-void QSimpleResource::addExtensionDataToDOM(QAbstractFormBuilder *afb,
+void QSimpleResource::addExtensionDataToDOM(QAbstractFormBuilder * /* afb */,
                                             QDesignerFormEditorInterface *core,
                                             DomWidget *ui_widget, QWidget *widget)
 {
@@ -139,66 +133,16 @@ void QSimpleResource::addExtensionDataToDOM(QAbstractFormBuilder *afb,
     if (QDesignerExtraInfoExtension *extra = qt_extension<QDesignerExtraInfoExtension*>(emgr, widget)) {
         extra->saveWidgetExtraInfo(ui_widget);
     }
-    if (QDesignerScriptExtension *scriptExt = qt_extension<QDesignerScriptExtension*>(emgr, widget)) {
-        // Add internal state
-        const QVariantMap data = scriptExt->data();
-        if (!data.empty()) {
-            // Convert the map to a DomState.
-            // We pass on the widget for property introspection. Thus, non-designable properties
-            // that have to be converted using QMetaObject (enums and the like) will work.
-            DomPropertyList properties;
-            const QVariantMap::const_iterator vcend = data.constEnd();
-            for (QVariantMap::const_iterator it = data.constBegin(); it != vcend; ++it) {
-                if (DomProperty *prop = variantToDomProperty(afb, widget->metaObject(), it.key(), it.value()))
-                    properties += prop;
-            }
-            if (!properties.empty()) {
-                DomWidgetData *domData = new DomWidgetData;
-                domData->setElementProperty(properties);
-                DomWidgetDataList domDataList;
-                 domDataList += domData;
-                ui_widget->setElementWidgetData(domDataList);
-            }
-
-        }
-        // Add script
-        const QString script = scriptExt->script();
-        if (!script.isEmpty()) {
-            DomScripts domScripts = ui_widget->elementScript();
-            addScript(script, ScriptExtension, domScripts);
-            ui_widget->setElementScript(domScripts);
-        }
-    }
 }
 
-void QSimpleResource::applyExtensionDataFromDOM(QAbstractFormBuilder *afb,
+void QSimpleResource::applyExtensionDataFromDOM(QAbstractFormBuilder * /* afb */,
                                                 QDesignerFormEditorInterface *core,
-                                                DomWidget *ui_widget, QWidget *widget, bool applyState)
+                                                DomWidget *ui_widget, QWidget *widget)
 {
     QExtensionManager *emgr = core->extensionManager();
     if (QDesignerExtraInfoExtension *extra = qt_extension<QDesignerExtraInfoExtension*>(emgr, widget)) {
         extra->loadWidgetExtraInfo(ui_widget);
     }
-    if (applyState) {
-        if (QDesignerScriptExtension *scriptExt = qt_extension<QDesignerScriptExtension*>(emgr, widget)) {
-            // Apply the state.
-            // We pass on the widget for property introspection. Thus, non-designable properties
-            // that have to be converted using QMetaObject (enums and the like) will work.
-            QVariantMap data;
-            DomWidgetDataList domDataList = ui_widget->elementWidgetData();
-            if (!domDataList.empty()) {
-                foreach (const DomWidgetData *domData, domDataList) {
-                    const DomPropertyList properties = domData->elementProperty();
-                    foreach(const DomProperty *prop, properties) {
-                        const QVariant vprop = domPropertyToVariant(afb, widget->metaObject(), prop);
-                        if (vprop.type() != QVariant::Invalid)
-                            data.insert(prop->attributeName(), vprop);
-                    }
-                }
-            }
-            scriptExt->setData(data);
-        }
-    }
 }
 
 QString QSimpleResource::customWidgetScript(QDesignerFormEditorInterface *core, QObject *object)