1 files changed, 1 insertions, 120 deletions

diff --git a/tools/designer/src/components/formeditor/qdesigner_resource.cpp b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
index 064da9b..f94fb5c 100644
--- a/tools/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -753,26 +753,6 @@ void QDesignerResource::setSaveRelative(bool relative)
     m_resourceBuilder->setSaveRelative(relative);
 }
 
-static bool addFakeMethods(const DomSlots *domSlots, QStringList &fakeSlots, QStringList &fakeSignals)
-{
-    if (!domSlots)
-        return false;
-
-    bool rc = false;
-    foreach (const QString &fakeSlot, domSlots->elementSlot())
-        if (fakeSlots.indexOf(fakeSlot) == -1) {
-            fakeSlots += fakeSlot;
-            rc = true;
-        }
-
-    foreach (const QString &fakeSignal, domSlots->elementSignal())
-        if (fakeSignals.indexOf(fakeSignal) == -1) {
-            fakeSignals += fakeSignal;
-            rc = true;
-        }
-    return rc;
-}
-
 QWidget *QDesignerResource::create(DomUI *ui, QWidget *parentWidget)
 {
     // Load extra info extension. This is used by Jambi for preventing
@@ -1435,108 +1415,9 @@ DomLayoutItem *QDesignerResource::createDom(QLayoutItem *item, DomLayout *ui_lay
     return ui_item;
 }
 
-static void addFakeMethodsToWidgetDataBase(const DomCustomWidget *domCustomWidget, WidgetDataBaseItem *item)
-{
-    const DomSlots *domSlots = domCustomWidget->elementSlots();
-    if (!domSlots)
-        return;
-
-    // Merge in new slots, signals
-    QStringList fakeSlots = item->fakeSlots();
-    QStringList fakeSignals = item->fakeSignals();
-    if (addFakeMethods(domSlots, fakeSlots, fakeSignals)) {
-        item->setFakeSlots(fakeSlots);
-        item->setFakeSignals(fakeSignals);
-    }
-}
-
-void QDesignerResource::addCustomWidgetsToWidgetDatabase(DomCustomWidgetList& custom_widget_list)
-{
-    // Perform one iteration of adding the custom widgets to the database,
-    // looking up the base class and inheriting its data.
-    // Remove the succeeded custom widgets from the list.
-    // Classes whose base class could not be found are left in the list.
-    QDesignerWidgetDataBaseInterface *db = m_formWindow->core()->widgetDataBase();
-    for (int i=0; i < custom_widget_list.size(); ) {
-        bool classInserted = false;
-        DomCustomWidget *custom_widget = custom_widget_list[i];
-        const QString customClassName = custom_widget->elementClass();
-        const QString base_class = custom_widget->elementExtends();
-        QString includeFile;
-        IncludeType includeType = IncludeLocal;
-        if (const DomHeader *header = custom_widget->elementHeader()) {
-            includeFile = header->text();
-            if (header->hasAttributeLocation() && header->attributeLocation() == QLatin1String("global"))
-                includeType = IncludeGlobal;
-        }
-        const bool domIsContainer = custom_widget->elementContainer();
-        // Append a new item
-        if (base_class.isEmpty()) {
-            WidgetDataBaseItem *item = new WidgetDataBaseItem(customClassName);
-            item->setPromoted(false);
-            item->setGroup(QApplication::translate("Designer", "Custom Widgets"));
-            item->setIncludeFile(buildIncludeFile(includeFile, includeType));
-            item->setContainer(domIsContainer);
-            item->setCustom(true);
-            addFakeMethodsToWidgetDataBase(custom_widget, item);
-            db->append(item);
-            custom_widget_list.removeAt(i);
-            classInserted = true;
-        } else {
-            // Create a new entry cloned from base class. Note that this will ignore existing
-            // classes, eg, plugin custom widgets.
-            QDesignerWidgetDataBaseItemInterface *item =
-                appendDerived(db, customClassName, QApplication::translate("Designer", "Promoted Widgets"),
-                              base_class,
-                              buildIncludeFile(includeFile, includeType),
-                              true,true);
-            // Ok, base class found.
-            if (item) {
-                // Hack to accommodate for old UI-files in which "contains" is not set properly:
-                // Apply "contains" from DOM only if true (else, eg classes from QFrame might not accept
-                // dropping child widgets on them as container=false). This also allows for
-                // QWidget-derived stacked pages.
-                if (domIsContainer)
-                    item->setContainer(domIsContainer);
-
-                addFakeMethodsToWidgetDataBase(custom_widget, static_cast<WidgetDataBaseItem*>(item));
-                custom_widget_list.removeAt(i);
-                classInserted = true;
-            }
-        }
-        // Skip failed item.
-        if (!classInserted)
-            i++;
-    }
-
-}
 void QDesignerResource::createCustomWidgets(DomCustomWidgets *dom_custom_widgets)
 {
-    if (dom_custom_widgets == 0)
-        return;
-    DomCustomWidgetList custom_widget_list = dom_custom_widgets->elementCustomWidget();
-    // Attempt to insert each item derived from its base class.
-    // This should at most require two iterations in the event that the classes are out of order
-    // (derived first, max depth: promoted custom plugin = 2)
-    for (int iteration = 0;  iteration < 2;  iteration++) {
-        addCustomWidgetsToWidgetDatabase(custom_widget_list);
-        if (custom_widget_list.empty())
-            return;
-    }
-    // Oops, there are classes left whose base class could not be found.
-    // Default them to QWidget with warnings.
-    const QString fallBackBaseClass = QLatin1String("QWidget");
-    for (int i=0; i < custom_widget_list.size(); i++ ) {
-        DomCustomWidget *custom_widget = custom_widget_list[i];
-        const QString customClassName = custom_widget->elementClass();
-        const QString base_class = custom_widget->elementExtends();
-        qDebug() << "** WARNING The base class " << base_class << " of the custom widget class " << customClassName
-            << " could not be found. Defaulting to " << fallBackBaseClass << '.';
-        custom_widget->setElementExtends(fallBackBaseClass);
-    }
-    // One more pass.
-    addCustomWidgetsToWidgetDatabase(custom_widget_list);
-    Q_ASSERT(custom_widget_list.empty());
+    QSimpleResource::handleDomCustomWidgets(core(), dom_custom_widgets);
 }
 
 DomTabStops *QDesignerResource::saveTabStops()