diff options
Diffstat (limited to 'src/designer/src/components/formeditor')
12 files changed, 26 insertions, 25 deletions
diff --git a/src/designer/src/components/formeditor/dpi_chooser.cpp b/src/designer/src/components/formeditor/dpi_chooser.cpp index 5e2f9f605..a254bf12a 100644 --- a/src/designer/src/components/formeditor/dpi_chooser.cpp +++ b/src/designer/src/components/formeditor/dpi_chooser.cpp @@ -94,7 +94,7 @@ DPI_Chooser::DPI_Chooser(QWidget *parent) : setFocusProxy(m_predefinedCombo); m_predefinedCombo->setEditable(false); m_predefinedCombo->setCurrentIndex(0); - connect(m_predefinedCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), + connect(m_predefinedCombo, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, &DPI_Chooser::syncSpinBoxes); // top row with predefined settings QVBoxLayout *vBoxLayout = new QVBoxLayout; diff --git a/src/designer/src/components/formeditor/embeddedoptionspage.cpp b/src/designer/src/components/formeditor/embeddedoptionspage.cpp index 85cc1f930..062fc6e4f 100644 --- a/src/designer/src/components/formeditor/embeddedoptionspage.cpp +++ b/src/designer/src/components/formeditor/embeddedoptionspage.cpp @@ -145,7 +145,7 @@ void EmbeddedOptionsControlPrivate::init(EmbeddedOptionsControl *q) m_profileCombo->setEditable(false); hLayout->addWidget(m_profileCombo); m_profileCombo->addItem(EmbeddedOptionsControl::tr("None")); - EmbeddedOptionsControl::connect(m_profileCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), + EmbeddedOptionsControl::connect(m_profileCombo, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), m_q, &EmbeddedOptionsControl::slotProfileIndexChanged); m_addButton->setIcon(createIconSet(QString::fromUtf8("plus.png"))); diff --git a/src/designer/src/components/formeditor/formeditor.cpp b/src/designer/src/components/formeditor/formeditor.cpp index 05e7fc4ee..0e1db2501 100644 --- a/src/designer/src/components/formeditor/formeditor.cpp +++ b/src/designer/src/components/formeditor/formeditor.cpp @@ -142,7 +142,7 @@ FormEditor::FormEditor(QObject *parent) connect(resourceModel, &QtResourceModel::qrcFileModifiedExternally, this, &FormEditor::slotQrcFileChangedExternally); - QList<QDesignerOptionsPageInterface*> optionsPages; + QVector<QDesignerOptionsPageInterface*> optionsPages; optionsPages << new TemplateOptionsPage(this) << new FormEditorOptionsPage(this) << new EmbeddedOptionsPage(this); setOptionsPages(optionsPages); diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp index 84e065bcb..8285d84c5 100644 --- a/src/designer/src/components/formeditor/formwindow.cpp +++ b/src/designer/src/components/formeditor/formwindow.cpp @@ -723,7 +723,7 @@ bool FormWindow::handleMouseMoveEvent(QWidget *, QWidget *, QMouseEvent *e) sel.prepend(current); } - QList<QDesignerDnDItemInterface*> item_list; + QVector<QDesignerDnDItemInterface*> item_list; const QPoint globalPos = mapToGlobal(m_startPos); const QDesignerDnDItemInterface::DropType dropType = (mouseFlags(e->modifiers()) & CopyDragModifier) ? QDesignerDnDItemInterface::CopyDrop : QDesignerDnDItemInterface::MoveDrop; @@ -2827,7 +2827,7 @@ bool FormWindow::dropDockWidget(QDesignerDnDItemInterface *item, const QPoint &g return true; } -bool FormWindow::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target, +bool FormWindow::dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, QWidget *target, const QPoint &global_mouse_pos) { diff --git a/src/designer/src/components/formeditor/formwindow.h b/src/designer/src/components/formeditor/formwindow.h index abecc8252..cb5019d35 100644 --- a/src/designer/src/components/formeditor/formwindow.h +++ b/src/designer/src/components/formeditor/formwindow.h @@ -189,7 +189,7 @@ public: void resizeWidget(QWidget *widget, const QRect &geometry); bool dropDockWidget(QDesignerDnDItemInterface *item, const QPoint &global_mouse_pos); - bool dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target, + bool dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, QWidget *target, const QPoint &global_mouse_pos) override; QWidget *findContainer(QWidget *w, bool excludeLayout) const override; diff --git a/src/designer/src/components/formeditor/formwindow_widgetstack.h b/src/designer/src/components/formeditor/formwindow_widgetstack.h index 01ee921fd..e1a5dd161 100644 --- a/src/designer/src/components/formeditor/formwindow_widgetstack.h +++ b/src/designer/src/components/formeditor/formwindow_widgetstack.h @@ -76,7 +76,7 @@ protected: QWidget *defaultEditor() const; private: - QList<QDesignerFormWindowToolInterface*> m_tools; + QVector<QDesignerFormWindowToolInterface*> m_tools; QWidget *m_formContainer; QStackedLayout *m_formContainerLayout; QStackedLayout *m_layout; diff --git a/src/designer/src/components/formeditor/formwindowmanager.cpp b/src/designer/src/components/formeditor/formwindowmanager.cpp index 692b20c54..ce3db6583 100644 --- a/src/designer/src/components/formeditor/formwindowmanager.cpp +++ b/src/designer/src/components/formeditor/formwindowmanager.cpp @@ -955,7 +955,7 @@ void FormWindowManager::deviceProfilesChanged() // DnD stuff -void FormWindowManager::dragItems(const QList<QDesignerDnDItemInterface*> &item_list) +void FormWindowManager::dragItems(const QVector<QDesignerDnDItemInterface*> &item_list) { QDesignerMimeData::execDrag(item_list, m_core->topLevel()); } diff --git a/src/designer/src/components/formeditor/formwindowmanager.h b/src/designer/src/components/formeditor/formwindowmanager.h index d9723cea6..cae24e407 100644 --- a/src/designer/src/components/formeditor/formwindowmanager.h +++ b/src/designer/src/components/formeditor/formwindowmanager.h @@ -77,7 +77,7 @@ public: bool eventFilter(QObject *o, QEvent *e) override; - void dragItems(const QList<QDesignerDnDItemInterface*> &item_list) override; + void dragItems(const QVector<QDesignerDnDItemInterface*> &item_list) override; QUndoGroup *undoGroup() const; @@ -122,7 +122,7 @@ private: QDesignerFormEditorInterface *m_core; FormWindow *m_activeFormWindow; - QList<FormWindow*> m_formWindows; + QVector<FormWindow*> m_formWindows; PreviewManager *m_previewManager; diff --git a/src/designer/src/components/formeditor/formwindowsettings.cpp b/src/designer/src/components/formeditor/formwindowsettings.cpp index de03c6792..3e24b7623 100644 --- a/src/designer/src/components/formeditor/formwindowsettings.cpp +++ b/src/designer/src/components/formeditor/formwindowsettings.cpp @@ -108,12 +108,13 @@ void FormWindowData::fromFormWindow(FormWindowBase* fw) defaultMargin = defaultSpacing = INT_MIN; fw->layoutDefault(&defaultMargin, &defaultSpacing); - QStyle *style = fw->formContainer()->style(); + auto container = fw->formContainer(); + QStyle *style = container->style(); layoutDefaultEnabled = defaultMargin != INT_MIN || defaultSpacing != INT_MIN; if (defaultMargin == INT_MIN) - defaultMargin = style->pixelMetric(QStyle::PM_DefaultChildMargin, nullptr); + defaultMargin = style->pixelMetric(QStyle::PM_LayoutLeftMargin, nullptr, container); if (defaultSpacing == INT_MIN) - defaultSpacing = style->pixelMetric(QStyle::PM_DefaultLayoutSpacing, nullptr); + defaultSpacing = style->pixelMetric(QStyle::PM_LayoutHorizontalSpacing, nullptr); marginFunction.clear(); diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp index ff4a42744..2a1cdce3f 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -108,7 +108,7 @@ Q_DECLARE_METATYPE(QWidgetList) QT_BEGIN_NAMESPACE namespace { - using DomPropertyList = QList<DomProperty *>; + using DomPropertyList = QVector<DomProperty *>; } static const char *currentUiVersion = "4.0"; @@ -939,7 +939,7 @@ static bool readDomEnumerationValue(const DomProperty *p, return false; } -void QDesignerResource::applyProperties(QObject *o, const QList<DomProperty*> &properties) +void QDesignerResource::applyProperties(QObject *o, const QVector<DomProperty*> &properties) { if (properties.isEmpty()) return; @@ -1387,7 +1387,7 @@ DomWidget *QDesignerResource::saveWidget(QTabWidget *widget, DomWidget *ui_paren designerWarning(msgUnmanagedPage(core(), widget, i, page)); continue; } - QList<DomProperty*> ui_attribute_list; + QVector<DomProperty*> ui_attribute_list; const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); // attribute `icon' @@ -1456,7 +1456,7 @@ DomWidget *QDesignerResource::saveWidget(QToolBox *widget, DomWidget *ui_parentW } // attribute `label' - QList<DomProperty*> ui_attribute_list; + QVector<DomProperty*> ui_attribute_list; const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); @@ -1534,7 +1534,7 @@ bool QDesignerResource::checkProperty(QObject *obj, const QString &prop) const const QDesignerMetaObjectInterface *meta = core()->introspection()->metaObject(obj); const int pindex = meta->indexOfProperty(prop); - if (pindex != -1 && !(meta->property(pindex)->attributes(obj) & QDesignerMetaPropertyInterface::StoredAttribute)) + if (pindex != -1 && !meta->property(pindex)->attributes().testFlag(QDesignerMetaPropertyInterface::StoredAttribute)) return false; if (prop == QStringLiteral("objectName") || prop == QStringLiteral("spacerName")) // ### don't store the property objectName @@ -1889,13 +1889,13 @@ bool QDesignerResource::canCompressSpacings(QObject *object) const return false; } -QList<DomProperty*> QDesignerResource::computeProperties(QObject *object) +QVector<DomProperty*> QDesignerResource::computeProperties(QObject *object) { - QList<DomProperty*> properties; + QVector<DomProperty*> properties; if (QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), object)) { QDesignerDynamicPropertySheetExtension *dynamicSheet = qt_extension<QDesignerDynamicPropertySheetExtension*>(core()->extensionManager(), object); const int count = sheet->count(); - QList<DomProperty *> spacingProperties; + QVector<DomProperty *> spacingProperties; const bool compressSpacings = canCompressSpacings(object); for (int index = 0; index < count; ++index) { if (!sheet->isChanged(index) && (!dynamicSheet || !dynamicSheet->isDynamicProperty(index))) diff --git a/src/designer/src/components/formeditor/qdesigner_resource.h b/src/designer/src/components/formeditor/qdesigner_resource.h index d667f1372..78e4bacb6 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.h +++ b/src/designer/src/components/formeditor/qdesigner_resource.h @@ -90,8 +90,8 @@ protected: QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) override; QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget) override; QLayoutItem *create(DomLayoutItem *ui_layoutItem, QLayout *layout, QWidget *parentWidget) override; - void applyProperties(QObject *o, const QList<DomProperty*> &properties) override; - QList<DomProperty*> computeProperties(QObject *obj) override; + void applyProperties(QObject *o, const QVector<DomProperty*> &properties) override; + QVector<DomProperty*> computeProperties(QObject *obj) override; DomProperty *createProperty(QObject *object, const QString &propertyName, const QVariant &value) override; QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) override; @@ -145,7 +145,7 @@ private: QStringList mergeWithLoadedPaths(const QStringList &paths) const; void applyAttributesToPropertySheet(const DomWidget *ui_widget, QWidget *widget); - using DomCustomWidgetList = QList<DomCustomWidget *>; + using DomCustomWidgetList = QVector<DomCustomWidget *>; void addCustomWidgetsToWidgetDatabase(DomCustomWidgetList& list); FormWindow *m_formWindow; bool m_isMainWidget; diff --git a/src/designer/src/components/formeditor/qmainwindow_container.cpp b/src/designer/src/components/formeditor/qmainwindow_container.cpp index 180c38e79..37b376115 100644 --- a/src/designer/src/components/formeditor/qmainwindow_container.cpp +++ b/src/designer/src/components/formeditor/qmainwindow_container.cpp @@ -92,7 +92,7 @@ Qt::DockWidgetArea dockWidgetArea(QDockWidget *me) if (const QMainWindow *mw = qobject_cast<const QMainWindow*>(me->parentWidget())) { // Make sure that me is actually managed by mw, otherwise // QMainWindow::dockWidgetArea() will be VERY upset - QList<QLayout*> candidates; + QVector<QLayout*> candidates; if (mw->layout()) { candidates.append(mw->layout()); candidates += mw->layout()->findChildren<QLayout*>(); |