BC cleanup in uitools.

Remove virtual functions obsoleted by new resource handling
in Qt Designer 4.4. Remove static hash of private objects
for formbuilder.
Depends on a4b96f62237e0dcf6678969933e73c83c708f509 in qtbase.

Rubber-stamped-by: axis

3 files changed, 1 insertions, 53 deletions

diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp
index a8054748b..59e32cd7e 100644
--- a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp
+++ b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp
@@ -281,7 +281,6 @@ void QDesignerFormBuilder::applyProperties(QObject *o, const QList<DomProperty*>
     if (properties.empty())
         return;
 
-    QFormBuilderExtra *formBuilderExtra = QFormBuilderExtra::instance(this);
     const QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), o);
     const QDesignerDynamicPropertySheetExtension *dynamicSheet = qt_extension<QDesignerDynamicPropertySheetExtension*>(core()->extensionManager(), o);
     const bool changingMetaObject = WidgetFactory::classNameOf(core(), o) == QLatin1String("QAxWidget");
@@ -309,7 +308,7 @@ void QDesignerFormBuilder::applyProperties(QObject *o, const QList<DomProperty*>
             continue;
 
         const QString attributeName = p->attributeName();
-        if (formBuilderExtra->applyPropertyInternally(o, attributeName, v))
+        if (d->applyPropertyInternally(o, attributeName, v))
             continue;
 
         // refuse fake properties like current tab name (weak test)
diff --git a/src/designer/src/lib/shared/qsimpleresource.cpp b/src/designer/src/lib/shared/qsimpleresource.cpp
index 178ba3e18..48c74b8f4 100644
--- a/src/designer/src/lib/shared/qsimpleresource.cpp
+++ b/src/designer/src/lib/shared/qsimpleresource.cpp
@@ -102,50 +102,6 @@ DomBrush *QSimpleResource::saveBrush(const QBrush &brush)
     return QAbstractFormBuilder::saveBrush(brush);
 }
 
-QIcon QSimpleResource::nameToIcon(const QString &filePath, const QString &qrcPath)
-{
-    Q_UNUSED(filePath)
-    Q_UNUSED(qrcPath)
-    qWarning() << "QSimpleResource::nameToIcon() is obsoleted";
-    return QIcon();
-}
-
-QString QSimpleResource::iconToFilePath(const QIcon &pm) const
-{
-    Q_UNUSED(pm)
-    qWarning() << "QSimpleResource::iconToFilePath() is obsoleted";
-    return QString();
-}
-
-QString QSimpleResource::iconToQrcPath(const QIcon &pm) const
-{
-    Q_UNUSED(pm)
-    qWarning() << "QSimpleResource::iconToQrcPath() is obsoleted";
-    return QString();
-}
-
-QPixmap QSimpleResource::nameToPixmap(const QString &filePath, const QString &qrcPath)
-{
-    Q_UNUSED(filePath)
-    Q_UNUSED(qrcPath)
-    qWarning() << "QSimpleResource::nameToPixmap() is obsoleted";
-    return QPixmap();
-}
-
-QString QSimpleResource::pixmapToFilePath(const QPixmap &pm) const
-{
-    Q_UNUSED(pm)
-    qWarning() << "QSimpleResource::pixmapToFilePath() is obsoleted";
-    return QString();
-}
-
-QString QSimpleResource::pixmapToQrcPath(const QPixmap &pm) const
-{
-    Q_UNUSED(pm)
-    qWarning() << "QSimpleResource::pixmapToQrcPath() is obsoleted";
-    return QString();
-}
-
 DomScript *QSimpleResource::createScript(const QString &script, ScriptSource source)
 {
     if (script.isEmpty())
diff --git a/src/designer/src/lib/shared/qsimpleresource_p.h b/src/designer/src/lib/shared/qsimpleresource_p.h
index 597b101cd..b4f85bd0c 100644
--- a/src/designer/src/lib/shared/qsimpleresource_p.h
+++ b/src/designer/src/lib/shared/qsimpleresource_p.h
@@ -104,13 +104,6 @@ public:
                                        const DomCustomWidgets *dom_custom_widgets);
 
 protected:
-    virtual QIcon nameToIcon(const QString &filePath, const QString &qrcPath);
-    virtual QString iconToFilePath(const QIcon &pm) const;
-    virtual QString iconToQrcPath(const QIcon &pm) const;
-    virtual QPixmap nameToPixmap(const QString &filePath, const QString &qrcPath);
-    virtual QString pixmapToFilePath(const QPixmap &pm) const;
-    virtual QString pixmapToQrcPath(const QPixmap &pm) const;
-
     enum ScriptSource { ScriptDesigner, ScriptExtension, ScriptCustomWidgetPlugin };
     static DomScript*createScript(const QString &script, ScriptSource source);
     typedef QList<DomScript*> DomScripts;