From fd61c9b24d27452df3eb478a81d7e7725fe6f5b4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 4 May 2011 16:23:01 +0200 Subject: [PATCH] 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 --- .../components/formeditor/qdesigner_resource.cpp | 15 ++++---- .../src/lib/shared/qdesigner_formbuilder.cpp | 3 +- src/designer/src/lib/shared/qsimpleresource.cpp | 44 ---------------------- src/designer/src/lib/shared/qsimpleresource_p.h | 7 ---- 4 files changed, 8 insertions(+), 61 deletions(-) diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp index 409a20e..2229684 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -949,9 +949,9 @@ QWidget *QDesignerResource::create(DomWidget *ui_widget, QWidget *parentWidget) sep->setSeparator(true); w->addAction(sep); addMenuAction(sep); - } else if (QAction *a = m_actions.value(name)) { + } else if (QAction *a = d->m_actions.value(name)) { w->addAction(a); - } else if (QActionGroup *g = m_actionGroups.value(name)) { + } else if (QActionGroup *g = d->m_actionGroups.value(name)) { w->addActions(g->actions()); } else if (QMenu *menu = w->findChild(name)) { w->addAction(menu->menuAction()); @@ -1089,7 +1089,6 @@ void QDesignerResource::applyProperties(QObject *o, const QList &p if (!sheet) return; - QFormBuilderExtra *formBuilderExtra = QFormBuilderExtra::instance(this); QDesignerDynamicPropertySheetExtension *dynamicSheet = qt_extension(core()->extensionManager(), o); const bool dynamicPropertiesAllowed = dynamicSheet && dynamicSheet->dynamicPropertiesAllowed(); @@ -1135,7 +1134,7 @@ void QDesignerResource::applyProperties(QObject *o, const QList &p } } - formBuilderExtra->applyPropertyInternally(o, propertyName, v); + d->applyPropertyInternally(o, propertyName, v); if (index != -1) { sheet->setProperty(index, v); sheet->setChanged(index, true); @@ -1371,14 +1370,14 @@ DomLayoutItem *QDesignerResource::createDom(QLayoutItem *item, DomLayout *ui_lay ui_item = new DomLayoutItem(); ui_item->setElementSpacer(spacer); - m_laidout.insert(item->widget(), true); + d->m_laidout.insert(item->widget(), true); } else if (QLayoutWidget *layoutWidget = qobject_cast(item->widget())) { // Do not save a QLayoutWidget if it is within a layout (else it is saved as "QWidget" Q_ASSERT(layoutWidget->layout()); DomLayout *l = createDom(layoutWidget->layout(), ui_layout, ui_parentWidget); ui_item = new DomLayoutItem(); ui_item->setElementLayout(l); - m_laidout.insert(item->widget(), true); + d->m_laidout.insert(item->widget(), true); } else if (!item->spacerItem()) { // we use spacer as fake item in the Designer ui_item = QAbstractFormBuilder::createDom(item, ui_layout, ui_parentWidget); } else { @@ -1856,7 +1855,7 @@ bool QDesignerResource::copy(QIODevice *dev, const FormBuilderClipboard &selecti DomUI *ui = copy(selection); - m_laidout.clear(); + d->m_laidout.clear(); m_copyWidget = false; if (!ui) @@ -1911,7 +1910,7 @@ DomUI *QDesignerResource::copy(const FormBuilderClipboard &selection) } } - m_laidout.clear(); + d->m_laidout.clear(); m_copyWidget = false; if (!hasItems) { diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp index a805474..59e32cd 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 if (properties.empty()) return; - QFormBuilderExtra *formBuilderExtra = QFormBuilderExtra::instance(this); const QDesignerPropertySheetExtension *sheet = qt_extension(core()->extensionManager(), o); const QDesignerDynamicPropertySheetExtension *dynamicSheet = qt_extension(core()->extensionManager(), o); const bool changingMetaObject = WidgetFactory::classNameOf(core(), o) == QLatin1String("QAxWidget"); @@ -309,7 +308,7 @@ void QDesignerFormBuilder::applyProperties(QObject *o, const QList 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 178ba3e..48c74b8 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 597b101..b4f85bd 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 DomScripts; -- 2.7.4