1 files changed, 3 insertions, 61 deletions

diff --git a/src/tools/uic/cpp/cppwritedeclaration.cpp b/src/tools/uic/cpp/cppwritedeclaration.cpp
index 6ebef1cc41..9e774ad07b 100644
--- a/src/tools/uic/cpp/cppwritedeclaration.cpp
+++ b/src/tools/uic/cpp/cppwritedeclaration.cpp
@@ -27,10 +27,7 @@
 ****************************************************************************/
 
 #include "cppwritedeclaration.h"
-#include "cppwriteicondeclaration.h"
 #include "cppwriteinitialization.h"
-#include "cppwriteiconinitialization.h"
-#include "cppextractimages.h"
 #include "driver.h"
 #include "ui4.h"
 #include "uic.h"
@@ -56,47 +53,15 @@ namespace {
                 output << "} // namespace " << *it << "\n";
         }
     }
-
-    void writeScriptContextClass(const QString &indent, QTextStream &str) {
-         str << indent << "class ScriptContext\n"
-             << indent << "{\n"
-             << indent << "public:\n"
-             << indent << "    void run(const QString &script, QWidget *widget, const QWidgetList &childWidgets)\n"
-             << indent << "    {\n"
-             << indent << "        QScriptValue widgetObject =  scriptEngine.newQObject(widget);\n"
-             << indent << "        QScriptValue childWidgetArray = scriptEngine.newArray (childWidgets.size());\n"
-             << indent << "        for (int i = 0; i < childWidgets.size(); i++)\n"
-             << indent << "               childWidgetArray.setProperty(i, scriptEngine.newQObject(childWidgets[i]));\n"
-             << indent << "        QScriptContext *ctx = scriptEngine.pushContext();\n"
-             << indent << "        ctx ->activationObject().setProperty(QLatin1String(\"widget\"), widgetObject);\n"
-             << indent << "        ctx ->activationObject().setProperty(QLatin1String(\"childWidgets\"), childWidgetArray);\n\n"
-             << indent << "        scriptEngine.evaluate(script);\n"
-             << indent << "        if (scriptEngine.hasUncaughtException ()) {\n"
-             << indent << "            qWarning() << \"An exception occurred at line \" << scriptEngine.uncaughtExceptionLineNumber()\n"
-             << indent << "                       << \" of the script for \" << widget->objectName() << \": \" << engineError() << '\\n'\n"
-             << indent << "                       << script;\n"
-             << indent << "        }\n\n"
-             << indent << "        scriptEngine.popContext();\n"
-             << indent << "    }\n\n"
-             << indent << "private:\n"
-             << indent << "    QString engineError()\n"
-             << indent << "    {\n"
-             << indent << "        QScriptValue error = scriptEngine.evaluate(\"Error\");\n"
-             << indent << "        return error.toString();\n"
-             << indent << "    }\n\n"
-             << indent << "    QScriptEngine scriptEngine;\n"
-             << indent << "};\n\n";
-    }
 }
 
 namespace CPP {
 
-WriteDeclaration::WriteDeclaration(Uic *uic, bool activateScripts)  :
+WriteDeclaration::WriteDeclaration(Uic *uic)  :
     m_uic(uic),
     m_driver(uic->driver()),
     m_output(uic->output()),
-    m_option(uic->option()),
-    m_activateScripts(activateScripts)
+    m_option(uic->option())
 {
 }
 
@@ -106,7 +71,6 @@ void WriteDeclaration::acceptUI(DomUI *node)
     QString className = qualifiedClassName;
 
     m_driver->findOrInsertWidget(node->elementWidget());
-    QString widgetClassName = node->elementWidget()->attributeClass();
 
     QString exportMacro = node->elementExportMacro();
     if (!exportMacro.isEmpty())
@@ -154,29 +118,7 @@ void WriteDeclaration::acceptUI(DomUI *node)
 
     m_output << "\n";
 
-    WriteInitialization(m_uic, m_activateScripts).acceptUI(node);
-
-    if (node->elementImages()) {
-        if (m_option.extractImages) {
-            ExtractImages(m_uic->option()).acceptUI(node);
-        } else {
-            m_output << "\n"
-                << "protected:\n"
-                << m_option.indent << "enum IconID\n"
-                << m_option.indent << "{\n";
-            WriteIconDeclaration(m_uic).acceptUI(node);
-
-            m_output << m_option.indent << m_option.indent << "unknown_ID\n"
-                << m_option.indent << "};\n";
-
-            WriteIconInitialization(m_uic).acceptUI(node);
-        }
-    }
-
-    if (m_activateScripts) {
-        m_output << "\nprivate:\n\n";
-        writeScriptContextClass(m_option.indent, m_output);
-    }
+    WriteInitialization(m_uic).acceptUI(node);
 
     m_output << "};\n\n";