diff options
Diffstat (limited to 'src/designer/src/lib')
59 files changed, 147 insertions, 144 deletions
diff --git a/src/designer/src/lib/extension/qextensionmanager.h b/src/designer/src/lib/extension/qextensionmanager.h index b0cef39d5..49dd56224 100644 --- a/src/designer/src/lib/extension/qextensionmanager.h +++ b/src/designer/src/lib/extension/qextensionmanager.h @@ -51,7 +51,7 @@ public: QObject *extension(QObject *object, const QString &iid) const override; private: - using FactoryList = QVector<QAbstractExtensionFactory *>; + using FactoryList = QList<QAbstractExtensionFactory *>; typedef QHash<QString, FactoryList> FactoryMap; FactoryMap m_extensions; FactoryList m_globalExtension; diff --git a/src/designer/src/lib/sdk/abstractformeditor.cpp b/src/designer/src/lib/sdk/abstractformeditor.cpp index 0b62e6d1a..2d4b20812 100644 --- a/src/designer/src/lib/sdk/abstractformeditor.cpp +++ b/src/designer/src/lib/sdk/abstractformeditor.cpp @@ -96,7 +96,7 @@ public: QDesignerDialogGuiInterface *m_dialogGui = nullptr; QPointer<QtResourceModel> m_resourceModel; QPointer<QtGradientManager> m_gradientManager; // instantiated and deleted by designer_integration - QVector<QDesignerOptionsPageInterface*> m_optionsPages; + QList<QDesignerOptionsPageInterface*> m_optionsPages; }; QDesignerFormEditorInterfacePrivate::QDesignerFormEditorInterfacePrivate() = default; @@ -399,7 +399,7 @@ void QDesignerFormEditorInterface::setIntegration(QDesignerIntegrationInterface \since 4.5 Returns the list of options pages that allow the user to configure \QD components. */ -QVector<QDesignerOptionsPageInterface*> QDesignerFormEditorInterface::optionsPages() const +QList<QDesignerOptionsPageInterface*> QDesignerFormEditorInterface::optionsPages() const { return d->m_optionsPages; } @@ -409,7 +409,7 @@ QVector<QDesignerOptionsPageInterface*> QDesignerFormEditorInterface::optionsPag \since 4.5 Sets the list of options pages that allow the user to configure \QD components. */ -void QDesignerFormEditorInterface::setOptionsPages(const QVector<QDesignerOptionsPageInterface*> &optionsPages) +void QDesignerFormEditorInterface::setOptionsPages(const QList<QDesignerOptionsPageInterface*> &optionsPages) { d->m_optionsPages = optionsPages; } diff --git a/src/designer/src/lib/sdk/abstractformeditor.h b/src/designer/src/lib/sdk/abstractformeditor.h index 05d503403..39f5054cc 100644 --- a/src/designer/src/lib/sdk/abstractformeditor.h +++ b/src/designer/src/lib/sdk/abstractformeditor.h @@ -88,7 +88,7 @@ public: QString resourceLocation() const; QtResourceModel *resourceModel() const; QtGradientManager *gradientManager() const; - QVector<QDesignerOptionsPageInterface*> optionsPages() const; + QList<QDesignerOptionsPageInterface*> optionsPages() const; void setTopLevel(QWidget *topLevel); void setWidgetBox(QDesignerWidgetBoxInterface *widgetBox); @@ -102,7 +102,7 @@ public: void setSettingsManager(QDesignerSettingsInterface *settingsManager); void setResourceModel(QtResourceModel *model); void setGradientManager(QtGradientManager *manager); - void setOptionsPages(const QVector<QDesignerOptionsPageInterface*> &optionsPages); + void setOptionsPages(const QList<QDesignerOptionsPageInterface*> &optionsPages); QObjectList pluginInstances() const; diff --git a/src/designer/src/lib/sdk/abstractformwindow.cpp b/src/designer/src/lib/sdk/abstractformwindow.cpp index f1b2f335f..0b24920aa 100644 --- a/src/designer/src/lib/sdk/abstractformwindow.cpp +++ b/src/designer/src/lib/sdk/abstractformwindow.cpp @@ -609,7 +609,7 @@ void QDesignerFormWindowInterface::activateResourceFilePaths(const QStringList & */ /*! - \fn virtual void QDesignerFormWindowInterface::simplifySelection(QVector<QWidget*> *widgets) const + \fn virtual void QDesignerFormWindowInterface::simplifySelection(QList<QWidget*> *widgets) const Simplifies the selection of widgets specified by \a widgets. diff --git a/src/designer/src/lib/sdk/abstractformwindow.h b/src/designer/src/lib/sdk/abstractformwindow.h index de23917a7..63aeaada8 100644 --- a/src/designer/src/lib/sdk/abstractformwindow.h +++ b/src/designer/src/lib/sdk/abstractformwindow.h @@ -133,7 +133,7 @@ public: virtual void beginCommand(const QString &description) = 0; virtual void endCommand() = 0; - virtual void simplifySelection(QVector<QWidget*> *widgets) const = 0; + virtual void simplifySelection(QList<QWidget*> *widgets) const = 0; // notifications virtual void emitSelectionChanged() = 0; diff --git a/src/designer/src/lib/sdk/abstractformwindowmanager.cpp b/src/designer/src/lib/sdk/abstractformwindowmanager.cpp index 2ae2711a5..387f0665c 100644 --- a/src/designer/src/lib/sdk/abstractformwindowmanager.cpp +++ b/src/designer/src/lib/sdk/abstractformwindowmanager.cpp @@ -505,7 +505,7 @@ QAction *QDesignerFormWindowManagerInterface::actionRedo() const */ /*! - \fn void QDesignerFormWindowManagerInterface::dragItems(const QVector<QDesignerDnDItemInterface*> &item_list) + \fn void QDesignerFormWindowManagerInterface::dragItems(const QList<QDesignerDnDItemInterface*> &item_list) \internal */ diff --git a/src/designer/src/lib/sdk/abstractformwindowmanager.h b/src/designer/src/lib/sdk/abstractformwindowmanager.h index b6fd734c4..eddba7387 100644 --- a/src/designer/src/lib/sdk/abstractformwindowmanager.h +++ b/src/designer/src/lib/sdk/abstractformwindowmanager.h @@ -120,7 +120,7 @@ public: virtual QDesignerFormEditorInterface *core() const = 0; - virtual void dragItems(const QVector<QDesignerDnDItemInterface*> &item_list) = 0; + virtual void dragItems(const QList<QDesignerDnDItemInterface*> &item_list) = 0; virtual QPixmap createPreviewPixmap() const = 0; diff --git a/src/designer/src/lib/sdk/abstractmetadatabase.cpp b/src/designer/src/lib/sdk/abstractmetadatabase.cpp index df28d91b6..3ba2d5804 100644 --- a/src/designer/src/lib/sdk/abstractmetadatabase.cpp +++ b/src/designer/src/lib/sdk/abstractmetadatabase.cpp @@ -71,7 +71,7 @@ QDesignerMetaDataBaseInterface::~QDesignerMetaDataBaseInterface() = default; */ /*! - \fn QVector<QObject*> QDesignerMetaDataBaseInterface::objects() const + \fn QList<QObject*> QDesignerMetaDataBaseInterface::objects() const Returns the list of objects that have corresponding items in the meta database. */ @@ -119,7 +119,7 @@ QDesignerMetaDataBaseInterface::~QDesignerMetaDataBaseInterface() = default; */ /*! - \fn QVector<QWidget*> QDesignerMetaDataBaseItemInterface::tabOrder() const + \fn QList<QWidget*> QDesignerMetaDataBaseItemInterface::tabOrder() const Returns a list of widgets in the order defined by the form's tab order. @@ -128,7 +128,7 @@ QDesignerMetaDataBaseInterface::~QDesignerMetaDataBaseInterface() = default; /*! - \fn void QDesignerMetaDataBaseItemInterface::setTabOrder(const QVector<QWidget*> &tabOrder) + \fn void QDesignerMetaDataBaseItemInterface::setTabOrder(const QList<QWidget*> &tabOrder) Sets the tab order in the form using the list of widgets defined by \a tabOrder. diff --git a/src/designer/src/lib/sdk/abstractmetadatabase.h b/src/designer/src/lib/sdk/abstractmetadatabase.h index 17e0ac160..adeb6c7ee 100644 --- a/src/designer/src/lib/sdk/abstractmetadatabase.h +++ b/src/designer/src/lib/sdk/abstractmetadatabase.h @@ -53,8 +53,8 @@ public: virtual QString name() const = 0; virtual void setName(const QString &name) = 0; - virtual QVector<QWidget*> tabOrder() const = 0; - virtual void setTabOrder(const QVector<QWidget*> &tabOrder) = 0; + virtual QList<QWidget*> tabOrder() const = 0; + virtual void setTabOrder(const QList<QWidget*> &tabOrder) = 0; virtual bool enabled() const = 0; virtual void setEnabled(bool b) = 0; @@ -72,7 +72,7 @@ public: virtual void add(QObject *object) = 0; virtual void remove(QObject *object) = 0; - virtual QVector<QObject*> objects() const = 0; + virtual QList<QObject*> objects() const = 0; virtual QDesignerFormEditorInterface *core() const = 0; diff --git a/src/designer/src/lib/sdk/abstractpromotioninterface.cpp b/src/designer/src/lib/sdk/abstractpromotioninterface.cpp index d59c7fb3d..a8e8ecdb6 100644 --- a/src/designer/src/lib/sdk/abstractpromotioninterface.cpp +++ b/src/designer/src/lib/sdk/abstractpromotioninterface.cpp @@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE with an error message in \a errorMessage on failure. */ -/*! \fn virtual QVector<QDesignerWidgetDataBaseItemInterface *> QDesignerPromotionInterface::promotionBaseClasses() const +/*! \fn virtual QList<QDesignerWidgetDataBaseItemInterface *> QDesignerPromotionInterface::promotionBaseClasses() const Return a list of base classes that are suitable for promotion. */ diff --git a/src/designer/src/lib/sdk/abstractpromotioninterface.h b/src/designer/src/lib/sdk/abstractpromotioninterface.h index d709c8f03..3ec2a3038 100644 --- a/src/designer/src/lib/sdk/abstractpromotioninterface.h +++ b/src/designer/src/lib/sdk/abstractpromotioninterface.h @@ -53,7 +53,7 @@ public: QDesignerWidgetDataBaseItemInterface *promotedItem; }; - using PromotedClasses = QVector<PromotedClass>; + using PromotedClasses = QList<PromotedClass>; virtual PromotedClasses promotedClasses() const = 0; @@ -70,7 +70,7 @@ public: virtual bool setPromotedClassIncludeFile(const QString &className, const QString &includeFile, QString *errorMessage) = 0; - virtual QVector<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const = 0; + virtual QList<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const = 0; }; QT_END_NAMESPACE diff --git a/src/designer/src/lib/sdk/abstractwidgetbox.cpp b/src/designer/src/lib/sdk/abstractwidgetbox.cpp index 39dad6ec5..9bdef3c5b 100644 --- a/src/designer/src/lib/sdk/abstractwidgetbox.cpp +++ b/src/designer/src/lib/sdk/abstractwidgetbox.cpp @@ -158,7 +158,7 @@ int QDesignerWidgetBoxInterface::findOrInsertCategory(const QString &categoryNam /*! \internal - \fn void QDesignerWidgetBoxInterface::dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) + \fn void QDesignerWidgetBoxInterface::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) */ diff --git a/src/designer/src/lib/sdk/abstractwidgetbox.h b/src/designer/src/lib/sdk/abstractwidgetbox.h index 846fb8b3d..6d038fc6a 100644 --- a/src/designer/src/lib/sdk/abstractwidgetbox.h +++ b/src/designer/src/lib/sdk/abstractwidgetbox.h @@ -72,7 +72,7 @@ public: QSharedDataPointer<QDesignerWidgetBoxWidgetData> m_data; }; - using WidgetList = QVector<Widget>; + using WidgetList = QList<Widget>; class Category { @@ -99,7 +99,7 @@ public: WidgetList m_widget_list; }; - using CategoryList = QVector<Category>; + using CategoryList = QList<Category>; explicit QDesignerWidgetBoxInterface(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); virtual ~QDesignerWidgetBoxInterface(); @@ -116,7 +116,7 @@ public: int findOrInsertCategory(const QString &categoryName); - virtual void dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, + virtual void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) = 0; virtual void setFileName(const QString &file_name) = 0; diff --git a/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp b/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp index 581fd464d..a348580ea 100644 --- a/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp +++ b/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp @@ -333,13 +333,13 @@ bool QDesignerWidgetDataBaseInterface::isCustom(QObject *object, bool resolveNam */ /*! - \fn virtual void QDesignerWidgetDataBaseItemInterface::setDefaultPropertyValues(const QVector<QVariant> &list) = 0 + \fn virtual void QDesignerWidgetDataBaseItemInterface::setDefaultPropertyValues(const QList<QVariant> &list) = 0 Sets the default property values for the widget to the given \a list. */ /*! - \fn virtual QVector<QVariant> QDesignerWidgetDataBaseItemInterface::defaultPropertyValues() const = 0 + \fn virtual QList<QVariant> QDesignerWidgetDataBaseItemInterface::defaultPropertyValues() const = 0 Returns a list of default values to be used as properties for the item. */ diff --git a/src/designer/src/lib/sdk/abstractwidgetdatabase.h b/src/designer/src/lib/sdk/abstractwidgetdatabase.h index 3320018cd..c162039fc 100644 --- a/src/designer/src/lib/sdk/abstractwidgetdatabase.h +++ b/src/designer/src/lib/sdk/abstractwidgetdatabase.h @@ -85,8 +85,8 @@ public: virtual QString extends() const = 0; virtual void setExtends(const QString &s) = 0; - virtual void setDefaultPropertyValues(const QVector<QVariant> &list) = 0; - virtual QVector<QVariant> defaultPropertyValues() const = 0; + virtual void setDefaultPropertyValues(const QList<QVariant> &list) = 0; + virtual QList<QVariant> defaultPropertyValues() const = 0; }; class QDESIGNER_SDK_EXPORT QDesignerWidgetDataBaseInterface: public QObject @@ -115,7 +115,7 @@ Q_SIGNALS: void changed(); protected: - QVector<QDesignerWidgetDataBaseItemInterface *> m_items; + QList<QDesignerWidgetDataBaseItemInterface *> m_items; }; QT_END_NAMESPACE diff --git a/src/designer/src/lib/sdk/layoutdecoration.h b/src/designer/src/lib/sdk/layoutdecoration.h index 91f8c06b1..e893d1947 100644 --- a/src/designer/src/lib/sdk/layoutdecoration.h +++ b/src/designer/src/lib/sdk/layoutdecoration.h @@ -57,7 +57,7 @@ public: QDesignerLayoutDecorationExtension() = default; virtual ~QDesignerLayoutDecorationExtension() = default; - virtual QVector<QWidget*> widgets(QLayout *layout) const = 0; + virtual QList<QWidget*> widgets(QLayout *layout) const = 0; virtual QRect itemInfo(int index) const = 0; virtual int indexOf(QWidget *widget) const = 0; diff --git a/src/designer/src/lib/sdk/layoutdecoration.qdoc b/src/designer/src/lib/sdk/layoutdecoration.qdoc index 16cd44830..04beec341 100644 --- a/src/designer/src/lib/sdk/layoutdecoration.qdoc +++ b/src/designer/src/lib/sdk/layoutdecoration.qdoc @@ -49,7 +49,7 @@ */ /*! - \fn virtual QVector<QWidget*> QDesignerLayoutDecorationExtension::widgets(QLayout *layout) const + \fn virtual QList<QWidget*> QDesignerLayoutDecorationExtension::widgets(QLayout *layout) const Returns the widgets that are managed by the given \a layout. diff --git a/src/designer/src/lib/sdk/membersheet.h b/src/designer/src/lib/sdk/membersheet.h index f4d67a9f7..a3a927538 100644 --- a/src/designer/src/lib/sdk/membersheet.h +++ b/src/designer/src/lib/sdk/membersheet.h @@ -65,8 +65,8 @@ public: virtual QString declaredInClass(int index) const = 0; virtual QString signature(int index) const = 0; - virtual QVector<QByteArray> parameterTypes(int index) const = 0; - virtual QVector<QByteArray> parameterNames(int index) const = 0; + virtual QList<QByteArray> parameterTypes(int index) const = 0; + virtual QList<QByteArray> parameterNames(int index) const = 0; }; Q_DECLARE_EXTENSION_INTERFACE(QDesignerMemberSheetExtension, "org.qt-project.Qt.Designer.MemberSheet") diff --git a/src/designer/src/lib/sdk/membersheet.qdoc b/src/designer/src/lib/sdk/membersheet.qdoc index 7ad66e38d..39fc0caa0 100644 --- a/src/designer/src/lib/sdk/membersheet.qdoc +++ b/src/designer/src/lib/sdk/membersheet.qdoc @@ -231,7 +231,7 @@ */ /*! - \fn QVector<QByteArray> QDesignerMemberSheetExtension::parameterTypes(int index) const + \fn QList<QByteArray> QDesignerMemberSheetExtension::parameterTypes(int index) const Returns the parameter types of the member function with the given \a index, as a QByteArray list. @@ -240,7 +240,7 @@ */ /*! - \fn QVector<QByteArray> QDesignerMemberSheetExtension::parameterNames(int index) const + \fn QList<QByteArray> QDesignerMemberSheetExtension::parameterNames(int index) const Returns the parameter names of the member function with the given \a index, as a QByteArray list. diff --git a/src/designer/src/lib/sdk/taskmenu.h b/src/designer/src/lib/sdk/taskmenu.h index 9147f8b3d..fd588baf1 100644 --- a/src/designer/src/lib/sdk/taskmenu.h +++ b/src/designer/src/lib/sdk/taskmenu.h @@ -45,7 +45,7 @@ public: virtual QAction *preferredEditAction() const; - virtual QVector<QAction*> taskActions() const = 0; + virtual QList<QAction*> taskActions() const = 0; }; Q_DECLARE_EXTENSION_INTERFACE(QDesignerTaskMenuExtension, "org.qt-project.Qt.Designer.TaskMenu") diff --git a/src/designer/src/lib/sdk/taskmenu.qdoc b/src/designer/src/lib/sdk/taskmenu.qdoc index aec98be51..b768fc5b2 100644 --- a/src/designer/src/lib/sdk/taskmenu.qdoc +++ b/src/designer/src/lib/sdk/taskmenu.qdoc @@ -128,7 +128,7 @@ */ /*! - \fn QVector<QAction*> QDesignerTaskMenuExtension::taskActions() const + \fn QList<QAction*> QDesignerTaskMenuExtension::taskActions() const Returns the task menu extension as a list of actions which will be included in \QD's task menu when a plugin with the specified diff --git a/src/designer/src/lib/shared/actioneditor_p.h b/src/designer/src/lib/shared/actioneditor_p.h index 73c70ed2a..2f78887ba 100644 --- a/src/designer/src/lib/shared/actioneditor_p.h +++ b/src/designer/src/lib/shared/actioneditor_p.h @@ -122,7 +122,7 @@ signals: void contextMenuRequested(QMenu *menu, QAction *item); private: - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; void deleteActions(QDesignerFormWindowInterface *formWindow, const ActionList &); #if QT_CONFIG(clipboard) void copyActions(QDesignerFormWindowInterface *formWindow, const ActionList &); diff --git a/src/designer/src/lib/shared/actionrepository_p.h b/src/designer/src/lib/shared/actionrepository_p.h index 38ca6a7b7..333093a09 100644 --- a/src/designer/src/lib/shared/actionrepository_p.h +++ b/src/designer/src/lib/shared/actionrepository_p.h @@ -98,7 +98,7 @@ signals: void resourceImageDropped(const QString &path, QAction *action); private: - using QStandardItemList = QVector<QStandardItem *>; + using QStandardItemList = QList<QStandardItem *>; void initializeHeaders(); static void setItems(QDesignerFormEditorInterface *core, QAction *a, @@ -203,7 +203,7 @@ public: QAction *currentAction() const; void setCurrentIndex(const QModelIndex &index); - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; ActionList selectedActions() const; QItemSelection selection() const; @@ -232,7 +232,7 @@ class QDESIGNER_SHARED_EXPORT ActionRepositoryMimeData: public QMimeData { Q_OBJECT public: - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; ActionRepositoryMimeData(const ActionList &, Qt::DropAction dropAction); ActionRepositoryMimeData(QAction *, Qt::DropAction dropAction); diff --git a/src/designer/src/lib/shared/formlayoutmenu_p.h b/src/designer/src/lib/shared/formlayoutmenu_p.h index 9d88d8ced..d4b56ac96 100644 --- a/src/designer/src/lib/shared/formlayoutmenu_p.h +++ b/src/designer/src/lib/shared/formlayoutmenu_p.h @@ -61,7 +61,7 @@ class QDESIGNER_SHARED_EXPORT FormLayoutMenu : public QObject Q_DISABLE_COPY_MOVE(FormLayoutMenu) Q_OBJECT public: - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; explicit FormLayoutMenu(QObject *parent); diff --git a/src/designer/src/lib/shared/formwindowbase.cpp b/src/designer/src/lib/shared/formwindowbase.cpp index 81529d1ad..8a126c1a1 100644 --- a/src/designer/src/lib/shared/formwindowbase.cpp +++ b/src/designer/src/lib/shared/formwindowbase.cpp @@ -462,7 +462,7 @@ void FormWindowBase::deleteWidgetList(const QWidgetList &widget_list) QMenu *FormWindowBase::createExtensionTaskMenu(QDesignerFormWindowInterface *fw, QObject *o, bool trailingSeparator) { - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; ActionList actions; // 1) Standard public extension QExtensionManager *em = fw->core()->extensionManager(); diff --git a/src/designer/src/lib/shared/formwindowbase_p.h b/src/designer/src/lib/shared/formwindowbase_p.h index c18ee0021..b240aa521 100644 --- a/src/designer/src/lib/shared/formwindowbase_p.h +++ b/src/designer/src/lib/shared/formwindowbase_p.h @@ -108,7 +108,7 @@ public: // Helper to create a basic popup menu from task menu extensions (internal/public) static QMenu *createExtensionTaskMenu(QDesignerFormWindowInterface *fw, QObject *o, bool trailingSeparator = true); - virtual bool dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, QWidget *target, + virtual bool dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target, const QPoint &global_mouse_pos) = 0; // Helper to find the widget at the mouse position with some flags. diff --git a/src/designer/src/lib/shared/morphmenu_p.h b/src/designer/src/lib/shared/morphmenu_p.h index 58ade96d0..eba1bdf3a 100644 --- a/src/designer/src/lib/shared/morphmenu_p.h +++ b/src/designer/src/lib/shared/morphmenu_p.h @@ -55,7 +55,7 @@ class QDESIGNER_SHARED_EXPORT MorphMenu : public QObject { Q_DISABLE_COPY_MOVE(MorphMenu) Q_OBJECT public: - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; explicit MorphMenu(QObject *parent = nullptr); diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp index c1b601836..88b581862 100644 --- a/src/designer/src/lib/shared/pluginmanager.cpp +++ b/src/designer/src/lib/shared/pluginmanager.cpp @@ -476,8 +476,8 @@ class QDesignerPluginManagerPrivate { // Synced lists of custom widgets and their data. Note that the list // must be ordered for collections to appear in order. - QVector<QDesignerCustomWidgetInterface *> m_customWidgets; - QVector<QDesignerCustomWidgetData> m_customWidgetData; + QList<QDesignerCustomWidgetInterface *> m_customWidgets; + QList<QDesignerCustomWidgetData> m_customWidgetData; QStringList defaultPluginPaths() const; diff --git a/src/designer/src/lib/shared/pluginmanager_p.h b/src/designer/src/lib/shared/pluginmanager_p.h index df264ad02..373d0fe51 100644 --- a/src/designer/src/lib/shared/pluginmanager_p.h +++ b/src/designer/src/lib/shared/pluginmanager_p.h @@ -99,7 +99,7 @@ class QDESIGNER_SHARED_EXPORT QDesignerPluginManager: public QObject { Q_OBJECT public: - using CustomWidgetList = QVector<QDesignerCustomWidgetInterface *>; + using CustomWidgetList = QList<QDesignerCustomWidgetInterface *>; explicit QDesignerPluginManager(QDesignerFormEditorInterface *core); ~QDesignerPluginManager() override; diff --git a/src/designer/src/lib/shared/promotionmodel.cpp b/src/designer/src/lib/shared/promotionmodel.cpp index ec7ac25d9..37136ced6 100644 --- a/src/designer/src/lib/shared/promotionmodel.cpp +++ b/src/designer/src/lib/shared/promotionmodel.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE namespace { - using StandardItemList = QVector<QStandardItem *>; + using StandardItemList = QList<QStandardItem *>; // Model columns. enum { ClassNameColumn, IncludeFileColumn, IncludeTypeColumn, ReferencedColumn, NumColumns }; diff --git a/src/designer/src/lib/shared/promotiontaskmenu_p.h b/src/designer/src/lib/shared/promotiontaskmenu_p.h index 3f02ed380..641efa9b3 100644 --- a/src/designer/src/lib/shared/promotiontaskmenu_p.h +++ b/src/designer/src/lib/shared/promotiontaskmenu_p.h @@ -83,7 +83,7 @@ public: // Defaults to "Demote to %1".arg(class). void setDemoteLabel(const QString &demoteLabel); - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; enum AddFlags { LeadingSeparator = 1, TrailingSeparator = 2, SuppressGlobalEdit = 4}; @@ -120,7 +120,7 @@ private: QPointer<QWidget> m_widget; // Per-Widget actions - QVector<QAction *> m_promotionActions; + QList<QAction *> m_promotionActions; QAction *m_globalEditAction; QAction *m_EditPromoteToAction; diff --git a/src/designer/src/lib/shared/qdesigner_dnditem_p.h b/src/designer/src/lib/shared/qdesigner_dnditem_p.h index 26aa62c4a..36419389b 100644 --- a/src/designer/src/lib/shared/qdesigner_dnditem_p.h +++ b/src/designer/src/lib/shared/qdesigner_dnditem_p.h @@ -91,7 +91,7 @@ class QDESIGNER_SHARED_EXPORT QDesignerMimeData : public QMimeData { Q_OBJECT public: - using QDesignerDnDItems = QVector<QDesignerDnDItemInterface *>; + using QDesignerDnDItems = QList<QDesignerDnDItemInterface *>; ~QDesignerMimeData() override; diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp index 4c8282ca1..3b25125af 100644 --- a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp +++ b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp @@ -224,7 +224,7 @@ static bool readDomEnumerationValue(const DomProperty *p, return false; } -void QDesignerFormBuilder::applyProperties(QObject *o, const QVector<DomProperty*> &properties) +void QDesignerFormBuilder::applyProperties(QObject *o, const QList<DomProperty*> &properties) { if (properties.isEmpty()) return; diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder_p.h b/src/designer/src/lib/shared/qdesigner_formbuilder_p.h index da1f75eb7..ceaf1b395 100644 --- a/src/designer/src/lib/shared/qdesigner_formbuilder_p.h +++ b/src/designer/src/lib/shared/qdesigner_formbuilder_p.h @@ -111,7 +111,7 @@ protected: virtual QIcon nameToIcon(const QString &filePath, const QString &qrcPath); virtual QPixmap nameToPixmap(const QString &filePath, const QString &qrcPath); - void applyProperties(QObject *o, const QVector<DomProperty*> &properties) override; + void applyProperties(QObject *o, const QList<DomProperty*> &properties) override; void loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) override; diff --git a/src/designer/src/lib/shared/qdesigner_membersheet.cpp b/src/designer/src/lib/shared/qdesigner_membersheet.cpp index f0295601a..2e62aab7f 100644 --- a/src/designer/src/lib/shared/qdesigner_membersheet.cpp +++ b/src/designer/src/lib/shared/qdesigner_membersheet.cpp @@ -34,11 +34,14 @@ #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE -static QVector<QByteArray> stringListToByteArray(const QStringList &l) -{ - QVector<QByteArray> rc; - for (const QString &s : l) - rc.append(s.toUtf8()); +static QList<QByteArray> stringListToByteArray(const QStringList &l) +{ + if (l.isEmpty()) + return QList<QByteArray>(); + QList<QByteArray> rc; + const QStringList::const_iterator cend = l.constEnd(); + for (QStringList::const_iterator it = l.constBegin(); it != cend; ++it) + rc += it->toUtf8(); return rc; } @@ -184,12 +187,12 @@ bool QDesignerMemberSheet::inheritedFromWidget(int index) const } -QVector<QByteArray> QDesignerMemberSheet::parameterTypes(int index) const +QList<QByteArray> QDesignerMemberSheet::parameterTypes(int index) const { return stringListToByteArray(d->m_meta->method(index)->parameterTypes()); } -QVector<QByteArray> QDesignerMemberSheet::parameterNames(int index) const +QList<QByteArray> QDesignerMemberSheet::parameterNames(int index) const { return stringListToByteArray(d->m_meta->method(index)->parameterNames()); } diff --git a/src/designer/src/lib/shared/qdesigner_membersheet_p.h b/src/designer/src/lib/shared/qdesigner_membersheet_p.h index eac3d6383..b67ad3792 100644 --- a/src/designer/src/lib/shared/qdesigner_membersheet_p.h +++ b/src/designer/src/lib/shared/qdesigner_membersheet_p.h @@ -80,8 +80,8 @@ public: QString declaredInClass(int index) const override; QString signature(int index) const override; - QVector<QByteArray> parameterTypes(int index) const override; - QVector<QByteArray> parameterNames(int index) const override; + QList<QByteArray> parameterTypes(int index) const override; + QList<QByteArray> parameterNames(int index) const override; private: QDesignerMemberSheetPrivate *d; diff --git a/src/designer/src/lib/shared/qdesigner_menubar.cpp b/src/designer/src/lib/shared/qdesigner_menubar.cpp index 84bc8e365..287a2fc3c 100644 --- a/src/designer/src/lib/shared/qdesigner_menubar.cpp +++ b/src/designer/src/lib/shared/qdesigner_menubar.cpp @@ -56,7 +56,7 @@ Q_DECLARE_METATYPE(QAction*) QT_BEGIN_NAMESPACE -using ActionList = QVector<QAction *>; +using ActionList = QList<QAction *>; using namespace qdesigner_internal; diff --git a/src/designer/src/lib/shared/qdesigner_menubar_p.h b/src/designer/src/lib/shared/qdesigner_menubar_p.h index 87631ea5b..8b6e5383e 100644 --- a/src/designer/src/lib/shared/qdesigner_menubar_p.h +++ b/src/designer/src/lib/shared/qdesigner_menubar_p.h @@ -91,7 +91,7 @@ public: void moveDown(); // Helpers for MenuTaskMenu/MenuBarTaskMenu extensions - QVector<QAction *> contextMenuActions(); + QList<QAction *> contextMenuActions(); void deleteMenuAction(QAction *action); private slots: diff --git a/src/designer/src/lib/shared/qdesigner_promotion.cpp b/src/designer/src/lib/shared/qdesigner_promotion.cpp index 448fab314..08b2848fd 100644 --- a/src/designer/src/lib/shared/qdesigner_promotion.cpp +++ b/src/designer/src/lib/shared/qdesigner_promotion.cpp @@ -164,7 +164,7 @@ namespace qdesigner_internal { return true; } - QVector<QDesignerWidgetDataBaseItemInterface *> QDesignerPromotion::promotionBaseClasses() const + QList<QDesignerWidgetDataBaseItemInterface *> QDesignerPromotion::promotionBaseClasses() const { using SortedDatabaseItemMap = QMap<QString, QDesignerWidgetDataBaseItemInterface *>; SortedDatabaseItemMap sortedDatabaseItemMap; diff --git a/src/designer/src/lib/shared/qdesigner_promotion_p.h b/src/designer/src/lib/shared/qdesigner_promotion_p.h index c88e7130c..3448fd999 100644 --- a/src/designer/src/lib/shared/qdesigner_promotion_p.h +++ b/src/designer/src/lib/shared/qdesigner_promotion_p.h @@ -70,7 +70,7 @@ namespace qdesigner_internal { bool setPromotedClassIncludeFile(const QString &className, const QString &includeFile, QString *errorMessage) override; - QVector<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const override; + QList<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const override; private: bool canBePromoted(const QDesignerWidgetDataBaseItemInterface *) const; diff --git a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp index 186410fd0..18261f640 100644 --- a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp +++ b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp @@ -290,7 +290,7 @@ namespace qdesigner_internal { } const QStringList &QDesignerPromotionDialog::baseClassNames(const QDesignerPromotionInterface *promotion) { - using WidgetDataBaseItemList = QVector<QDesignerWidgetDataBaseItemInterface *>; + using WidgetDataBaseItemList = QList<QDesignerWidgetDataBaseItemInterface *>; static QStringList rc; if (rc.isEmpty()) { // Convert the item list into a string list. diff --git a/src/designer/src/lib/shared/qdesigner_propertycommand_p.h b/src/designer/src/lib/shared/qdesigner_propertycommand_p.h index 7aaa7e944..1cc528a19 100644 --- a/src/designer/src/lib/shared/qdesigner_propertycommand_p.h +++ b/src/designer/src/lib/shared/qdesigner_propertycommand_p.h @@ -148,7 +148,7 @@ public: protected: using PropertyHelperPtr = QSharedPointer<PropertyHelper>; - using PropertyHelperList = QVector<PropertyHelperPtr>; + using PropertyHelperList = QList<PropertyHelperPtr>; // add an object bool add(QObject *object, const QString &propertyName); @@ -259,14 +259,14 @@ class QDESIGNER_SHARED_EXPORT AddDynamicPropertyCommand: public QDesignerFormWin public: explicit AddDynamicPropertyCommand(QDesignerFormWindowInterface *formWindow); - bool init(const QVector<QObject *> &selection, QObject *current, const QString &propertyName, const QVariant &value); + bool init(const QList<QObject *> &selection, QObject *current, const QString &propertyName, const QVariant &value); void redo() override; void undo() override; private: void setDescription(); QString m_propertyName; - QVector<QObject *> m_selection; + QList<QObject *> m_selection; QVariant m_value; }; @@ -276,7 +276,7 @@ class QDESIGNER_SHARED_EXPORT RemoveDynamicPropertyCommand: public QDesignerForm public: explicit RemoveDynamicPropertyCommand(QDesignerFormWindowInterface *formWindow); - bool init(const QVector<QObject *> &selection, QObject *current, const QString &propertyName); + bool init(const QList<QObject *> &selection, QObject *current, const QString &propertyName); void redo() override; void undo() override; diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp index 163107732..2582a3a14 100644 --- a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp +++ b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp @@ -693,7 +693,7 @@ QDesignerPropertySheet::QDesignerPropertySheet(QObject *object, QObject *parent) createFakeProperty(QStringLiteral("floating")); } - using ByteArrayList = QVector<QByteArray>; + using ByteArrayList = QList<QByteArray>; const ByteArrayList names = object->dynamicPropertyNames(); if (!names.isEmpty()) { const ByteArrayList::const_iterator cend = names.constEnd(); diff --git a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp index c73a99d86..e51cd3a73 100644 --- a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp +++ b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp @@ -466,14 +466,14 @@ void QDesignerTaskMenu::removeStatusBar() } } -QVector<QAction*> QDesignerTaskMenu::taskActions() const +QList<QAction*> QDesignerTaskMenu::taskActions() const { QDesignerFormWindowInterface *formWindow = QDesignerFormWindowInterface::findFormWindow(widget()); Q_ASSERT(formWindow); const bool isMainContainer = formWindow->mainContainer() == widget(); - QVector<QAction*> actions; + QList<QAction*> actions; if (const QMainWindow *mw = qobject_cast<const QMainWindow*>(formWindow->mainContainer())) { if (isMainContainer || mw->centralWidget() == widget()) { diff --git a/src/designer/src/lib/shared/qdesigner_taskmenu_p.h b/src/designer/src/lib/shared/qdesigner_taskmenu_p.h index 99d64a5ef..b4bc23da4 100644 --- a/src/designer/src/lib/shared/qdesigner_taskmenu_p.h +++ b/src/designer/src/lib/shared/qdesigner_taskmenu_p.h @@ -68,7 +68,7 @@ public: QWidget *widget() const; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; enum PropertyMode { CurrentWidgetMode, MultiSelectionMode }; diff --git a/src/designer/src/lib/shared/qdesigner_toolbar.cpp b/src/designer/src/lib/shared/qdesigner_toolbar.cpp index 62dd127ce..d098e97a0 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbar.cpp +++ b/src/designer/src/lib/shared/qdesigner_toolbar.cpp @@ -56,7 +56,7 @@ Q_DECLARE_METATYPE(QAction*) QT_BEGIN_NAMESPACE -using ActionList = QVector<QAction *>; +using ActionList = QList<QAction *>; namespace qdesigner_internal { // ------------------- ToolBarEventFilter diff --git a/src/designer/src/lib/shared/qdesigner_toolbar_p.h b/src/designer/src/lib/shared/qdesigner_toolbar_p.h index 272b5dddc..a3fa2c2ad 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbar_p.h +++ b/src/designer/src/lib/shared/qdesigner_toolbar_p.h @@ -86,7 +86,7 @@ public: bool eventFilter (QObject *watched, QEvent *event) override; // Helper for task menu extension - QVector<QAction *> contextMenuActions(const QPoint &globalPos = QPoint(-1, -1)); + QList<QAction *> contextMenuActions(const QPoint &globalPos = QPoint(-1, -1)); static ToolBarEventFilter *eventFilterOf(const QToolBar *tb); diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp index 647104cd9..5090aae17 100644 --- a/src/designer/src/lib/shared/qlayout_widget.cpp +++ b/src/designer/src/lib/shared/qlayout_widget.cpp @@ -608,7 +608,7 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const // Figure out states of a cell and return as a flat vector of // [column1, column2,...] (address as row * columnCount + col) - static CellStates cellStates(const QVector<QRect> &rects, int numRows, int numColumns); + static CellStates cellStates(const QList<QRect> &rects, int numRows, int numColumns); typedef QMap<QWidget *, QRect> WidgetItemMap; typedef QMap<QWidget *, Qt::Alignment> WidgetAlignmentMap; @@ -635,7 +635,7 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const return str; } - GridLayoutState::CellStates GridLayoutState::cellStates(const QVector<QRect> &rects, int numRows, int numColumns) + GridLayoutState::CellStates GridLayoutState::cellStates(const QList<QRect> &rects, int numRows, int numColumns) { CellStates rc = CellStates(numRows * numColumns, CellState(Free, Free)); for (const auto &rect : rects) { diff --git a/src/designer/src/lib/shared/qsimpleresource_p.h b/src/designer/src/lib/shared/qsimpleresource_p.h index ad8dfb989..e2dccaa53 100644 --- a/src/designer/src/lib/shared/qsimpleresource_p.h +++ b/src/designer/src/lib/shared/qsimpleresource_p.h @@ -101,7 +101,7 @@ private: // Contents of clipboard for formbuilder copy and paste operations // (Actions and widgets) struct QDESIGNER_SHARED_EXPORT FormBuilderClipboard { - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; FormBuilderClipboard() = default; FormBuilderClipboard(QWidget *w); diff --git a/src/designer/src/lib/shared/qtresourceeditordialog.cpp b/src/designer/src/lib/shared/qtresourceeditordialog.cpp index 5c7d27f32..a1c15e708 100644 --- a/src/designer/src/lib/shared/qtresourceeditordialog.cpp +++ b/src/designer/src/lib/shared/qtresourceeditordialog.cpp @@ -82,7 +82,7 @@ struct QtResourceFileData { struct QtResourcePrefixData { QString prefix; QString language; - QVector<QtResourceFileData> resourceFileList; + QList<QtResourceFileData> resourceFileList; bool operator==(const QtResourcePrefixData &other) const { return prefix == other.prefix && language == other.language @@ -92,7 +92,7 @@ struct QtResourcePrefixData { struct QtQrcFileData { QString qrcPath; - QVector<QtResourcePrefixData> resourceList; + QList<QtResourcePrefixData> resourceList; bool operator==(const QtQrcFileData &other) const { return qrcPath == other.qrcPath && resourceList == other.resourceList; } }; @@ -230,13 +230,13 @@ public: QString prefix() const { return m_prefix; } QString language() const { return m_language; } - QVector<QtResourceFile *> resourceFiles() const { return m_resourceFiles; } + QList<QtResourceFile *> resourceFiles() const { return m_resourceFiles; } private: QtResourcePrefix() = default; QString m_prefix; QString m_language; - QVector<QtResourceFile *> m_resourceFiles; + QList<QtResourceFile *> m_resourceFiles; }; // ------------------- QtQrcFile @@ -246,7 +246,7 @@ public: QString path() const { return m_path; } QString fileName() const { return m_fileName; } - QVector<QtResourcePrefix *> resourcePrefixList() const { return m_resourcePrefixes; } + QList<QtResourcePrefix *> resourcePrefixList() const { return m_resourcePrefixes; } QtQrcFileData initialState() const { return m_initialState; } private: @@ -260,7 +260,7 @@ private: QString m_path; QString m_fileName; - QVector<QtResourcePrefix *> m_resourcePrefixes; + QList<QtResourcePrefix *> m_resourcePrefixes; QtQrcFileData m_initialState; }; @@ -272,7 +272,7 @@ public: QtQrcManager(QObject *parent = nullptr); ~QtQrcManager() override; - QVector<QtQrcFile *> qrcFiles() const; + QList<QtQrcFile *> qrcFiles() const; // helpers QtQrcFile *qrcFileOf(const QString &path) const; @@ -332,12 +332,12 @@ signals: void resourceFileRemoved(QtResourceFile *resourceFile); private: - QVector<QtQrcFile *> m_qrcFiles; + QList<QtQrcFile *> m_qrcFiles; QMap<QString, QtQrcFile *> m_pathToQrc; QMap<QtQrcFile *, bool> m_qrcFileToExists; QMap<QtResourcePrefix *, QtQrcFile *> m_prefixToQrc; QMap<QtResourceFile *, QtResourcePrefix *> m_fileToPrefix; - QMap<QString, QVector<QtResourceFile *> > m_fullPathToResourceFiles; + QMap<QString, QList<QtResourceFile *> > m_fullPathToResourceFiles; QMap<QString, QIcon> m_fullPathToIcon; QMap<QString, bool> m_fullPathToExists; }; @@ -353,7 +353,7 @@ QtQrcManager::~QtQrcManager() clear(); } -QVector<QtQrcFile *> QtQrcManager::qrcFiles() const +QList<QtQrcFile *> QtQrcManager::qrcFiles() const { return m_qrcFiles; } @@ -397,11 +397,11 @@ void QtQrcManager::exportQrcFile(QtQrcFile *qrcFile, QtQrcFileData *qrcFileData) QtQrcFileData &data = *qrcFileData; - QVector<QtResourcePrefixData> resourceList; + QList<QtResourcePrefixData> resourceList; const auto resourcePrefixes = qrcFile->resourcePrefixList(); for (const QtResourcePrefix *prefix : resourcePrefixes) { - QVector<QtResourceFileData> resourceFileList; + QList<QtResourceFileData> resourceFileList; const auto resourceFiles = prefix->resourceFiles(); for (QtResourceFile *file : resourceFiles) { QtResourceFileData fileData; @@ -857,7 +857,7 @@ public: QtResourceModel *m_resourceModel = nullptr; QDesignerDialogGuiInterface *m_dlgGui = nullptr; QtQrcManager *m_qrcManager = nullptr; - QVector<QtQrcFileData> m_initialState; + QList<QtQrcFileData> m_initialState; QMap<QtQrcFile *, QListWidgetItem *> m_qrcFileToItem; QMap<QListWidgetItem *, QtQrcFile *> m_itemToQrcFile; @@ -983,7 +983,7 @@ QStandardItem *QtResourceEditorDialogPrivate::insertResourcePrefix(QtResourcePre QStandardItem *prefixItem = new QStandardItem(); QStandardItem *languageItem = new QStandardItem(); - QVector<QStandardItem *> items; + QList<QStandardItem *> items; items << prefixItem; items << languageItem; m_treeModel->insertRow(row, items); @@ -1087,7 +1087,7 @@ void QtResourceEditorDialogPrivate::slotResourceFileInserted(QtResourceFile *res QStandardItem *pathItem = new QStandardItem(resourceFile->path()); QStandardItem *aliasItem = new QStandardItem(); QStandardItem *parentItem = m_resourcePrefixToPrefixItem.value(resourcePrefix); - QVector<QStandardItem *> items; + QList<QStandardItem *> items; items << pathItem; items << aliasItem; @@ -2094,7 +2094,7 @@ void QtResourceEditorDialog::displayResourceFailures(const QString &logOutput, Q void QtResourceEditorDialog::accept() { QStringList newQrcPaths; - QVector<QtQrcFileData> currentState; + QList<QtQrcFileData> currentState; const auto qrcFiles = d_ptr->m_qrcManager->qrcFiles(); for (QtQrcFile *qrcFile : qrcFiles) { diff --git a/src/designer/src/lib/shared/qtresourcemodel.cpp b/src/designer/src/lib/shared/qtresourcemodel.cpp index f853e13c2..fec22a015 100644 --- a/src/designer/src/lib/shared/qtresourcemodel.cpp +++ b/src/designer/src/lib/shared/qtresourcemodel.cpp @@ -79,7 +79,7 @@ public: // then later when that resource set is activated it needs to be reregistered) QMap<QtResourceSet *, bool> m_newlyCreated; // all created but not activated yet // (if was active at some point and it's not now it will not be on that map) - QMap<QString, QVector<QtResourceSet *> > m_pathToResourceSet; + QMap<QString, QList<QtResourceSet *> > m_pathToResourceSet; QtResourceSet *m_currentResourceSet = nullptr; typedef QMap<QString, const QByteArray *> PathDataMap; @@ -487,7 +487,7 @@ void QtResourceModel::setModified(const QString &path) d_ptr->m_resourceSetToReload.insert(rs, true); } -QVector<QtResourceSet *> QtResourceModel::resourceSets() const +QList<QtResourceSet *> QtResourceModel::resourceSets() const { return d_ptr->m_resourceSetToPaths.keys(); } diff --git a/src/designer/src/lib/shared/qtresourcemodel_p.h b/src/designer/src/lib/shared/qtresourcemodel_p.h index e6da05351..65d615f52 100644 --- a/src/designer/src/lib/shared/qtresourcemodel_p.h +++ b/src/designer/src/lib/shared/qtresourcemodel_p.h @@ -91,7 +91,7 @@ public: bool isModified(const QString &path) const; // only for paths which are on loadedQrcFiles() list void setModified(const QString &path); // only for paths which are on loadedQrcPaths() list - QVector<QtResourceSet *> resourceSets() const; + QList<QtResourceSet *> resourceSets() const; QtResourceSet *currentResourceSet() const; void setCurrentResourceSet(QtResourceSet *resourceSet, int *errorCount = nullptr, QString *errorMessages = nullptr); diff --git a/src/designer/src/lib/shared/widgetdatabase.cpp b/src/designer/src/lib/shared/widgetdatabase.cpp index 97769bcee..8621f2840 100644 --- a/src/designer/src/lib/shared/widgetdatabase.cpp +++ b/src/designer/src/lib/shared/widgetdatabase.cpp @@ -188,12 +188,12 @@ void WidgetDataBaseItem::setExtends(const QString &s) m_extends = s; } -void WidgetDataBaseItem::setDefaultPropertyValues(const QVector<QVariant> &list) +void WidgetDataBaseItem::setDefaultPropertyValues(const QList<QVariant> &list) { m_defaultPropertyValues = list; } -QVector<QVariant> WidgetDataBaseItem::defaultPropertyValues() const +QList<QVariant> WidgetDataBaseItem::defaultPropertyValues() const { return m_defaultPropertyValues; } @@ -348,7 +348,7 @@ static WidgetDataBaseItem *createCustomWidgetItem(const QDesignerCustomWidgetInt void WidgetDataBase::loadPlugins() { typedef QMap<QString, int> NameIndexMap; - using ItemList = QVector<QDesignerWidgetDataBaseItemInterface *>; + using ItemList = QList<QDesignerWidgetDataBaseItemInterface *>; using NameSet = QSet<QString>; // 1) create a map of existing custom classes NameIndexMap existingCustomClasses; @@ -417,7 +417,7 @@ void WidgetDataBase::remove(int index) delete m_items.takeAt(index); } -QVector<QVariant> WidgetDataBase::defaultPropertyValues(const QString &name) +QList<QVariant> WidgetDataBase::defaultPropertyValues(const QString &name) { WidgetFactory *factory = qobject_cast<WidgetFactory *>(m_core->widgetFactory()); Q_ASSERT(factory); @@ -537,7 +537,7 @@ QStringList WidgetDataBase::customFormWidgetClasses(const QDesignerFormEditorInt // properties to be suitable for new forms static QString xmlFromWidgetBox(const QDesignerFormEditorInterface *core, const QString &className, const QString &objectName) { - using PropertyList = QVector<DomProperty *>; + using PropertyList = QList<DomProperty *>; QDesignerWidgetBoxInterface::Widget widget; const bool found = QDesignerWidgetBox::findWidget(core->widgetBox(), className, QString(), &widget); diff --git a/src/designer/src/lib/shared/widgetdatabase_p.h b/src/designer/src/lib/shared/widgetdatabase_p.h index 8a591ec6a..73f00b6b6 100644 --- a/src/designer/src/lib/shared/widgetdatabase_p.h +++ b/src/designer/src/lib/shared/widgetdatabase_p.h @@ -101,8 +101,8 @@ public: QString extends() const override; void setExtends(const QString &s) override; - void setDefaultPropertyValues(const QVector<QVariant> &list) override; - QVector<QVariant> defaultPropertyValues() const override; + void setDefaultPropertyValues(const QList<QVariant> &list) override; + QList<QVariant> defaultPropertyValues() const override; static WidgetDataBaseItem *clone(const QDesignerWidgetDataBaseItemInterface *item); @@ -129,7 +129,7 @@ private: uint m_container: 1; uint m_custom: 1; uint m_promoted: 1; - QVector<QVariant> m_defaultPropertyValues; + QList<QVariant> m_defaultPropertyValues; QStringList m_fakeSlots; QStringList m_fakeSignals; }; @@ -170,7 +170,7 @@ public slots: void loadPlugins(); private: - QVector<QVariant> defaultPropertyValues(const QString &name); + QList<QVariant> defaultPropertyValues(const QString &name); QDesignerFormEditorInterface *m_core; }; @@ -184,7 +184,7 @@ QDESIGNER_SHARED_EXPORT QDesignerWidgetDataBaseItemInterface bool promoted, bool custom); -using WidgetDataBaseItemList = QVector<QDesignerWidgetDataBaseItemInterface *>; +using WidgetDataBaseItemList = QList<QDesignerWidgetDataBaseItemInterface *>; QDESIGNER_SHARED_EXPORT WidgetDataBaseItemList promotionCandidates(const QDesignerWidgetDataBaseInterface *db, diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp index fa55b7aae..221acbbaf 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.cpp +++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp @@ -907,7 +907,7 @@ QLayoutItem *QAbstractFormBuilder::create(DomLayoutItem *ui_layoutItem, QLayout /*! \internal */ -void QAbstractFormBuilder::applyProperties(QObject *o, const QVector<DomProperty*> &properties) +void QAbstractFormBuilder::applyProperties(QObject *o, const QList<DomProperty*> &properties) { for (DomProperty *p : properties) { const QVariant v = toVariant(o->metaObject(), p); @@ -1255,9 +1255,9 @@ void FormBuilderSaveLayoutEntry::setAlignment(Qt::Alignment al) } // Create list from standard box layout -static QVector<FormBuilderSaveLayoutEntry> saveLayoutEntries(const QLayout *layout) +static QList<FormBuilderSaveLayoutEntry> saveLayoutEntries(const QLayout *layout) { - QVector<FormBuilderSaveLayoutEntry> rc; + QList<FormBuilderSaveLayoutEntry> rc; if (const int count = layout->count()) { rc.reserve(count); for (int idx = 0; idx < count; ++idx) { @@ -1271,9 +1271,9 @@ static QVector<FormBuilderSaveLayoutEntry> saveLayoutEntries(const QLayout *layo } // Create list from grid layout -static QVector<FormBuilderSaveLayoutEntry> saveGridLayoutEntries(QGridLayout *gridLayout) +static QList<FormBuilderSaveLayoutEntry> saveGridLayoutEntries(QGridLayout *gridLayout) { - QVector<FormBuilderSaveLayoutEntry> rc; + QList<FormBuilderSaveLayoutEntry> rc; if (const int count = gridLayout->count()) { rc.reserve(count); for (int idx = 0; idx < count; ++idx) { @@ -1289,9 +1289,9 @@ static QVector<FormBuilderSaveLayoutEntry> saveGridLayoutEntries(QGridLayout *gr #if QT_CONFIG(formlayout) // Create list from form layout -static QVector<FormBuilderSaveLayoutEntry> saveFormLayoutEntries(const QFormLayout *formLayout) +static QList<FormBuilderSaveLayoutEntry> saveFormLayoutEntries(const QFormLayout *formLayout) { - QVector<FormBuilderSaveLayoutEntry> rc; + QList<FormBuilderSaveLayoutEntry> rc; if (const int count = formLayout->count()) { rc.reserve(count); for (int idx = 0; idx < count; ++idx) { @@ -1332,7 +1332,7 @@ DomLayout *QAbstractFormBuilder::createDom(QLayout *layout, DomLayout *ui_layout lay->setAttributeName(objectName); lay->setElementProperty(computeProperties(layout)); - QVector<FormBuilderSaveLayoutEntry> newList; + QList<FormBuilderSaveLayoutEntry> newList; if (QGridLayout *gridLayout = qobject_cast<QGridLayout *>(layout)) { newList = saveGridLayoutEntries(gridLayout); #if QT_CONFIG(formlayout) @@ -1394,7 +1394,7 @@ DomSpacer *QAbstractFormBuilder::createDom(QSpacerItem *spacer, DomLayout *ui_la Q_UNUSED(ui_parentWidget); DomSpacer *ui_spacer = new DomSpacer(); - QVector<DomProperty*> properties; + QList<DomProperty*> properties; DomProperty *prop = nullptr; const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); @@ -1430,9 +1430,9 @@ DomProperty *QAbstractFormBuilder::createProperty(QObject *obj, const QString &p /*! \internal */ -QVector<DomProperty*> QAbstractFormBuilder::computeProperties(QObject *obj) +QList<DomProperty*> QAbstractFormBuilder::computeProperties(QObject *obj) { - QVector<DomProperty*> lst; + QList<DomProperty*> lst; const QMetaObject *meta = obj->metaObject(); @@ -1494,7 +1494,7 @@ QVector<DomProperty*> QAbstractFormBuilder::computeProperties(QObject *obj) /*! \internal */ -QAbstractFormBuilder::DomPropertyHash QAbstractFormBuilder::propertyMap(const QVector<DomProperty*> &properties) +QAbstractFormBuilder::DomPropertyHash QAbstractFormBuilder::propertyMap(const QList<DomProperty*> &properties) { DomPropertyHash map; @@ -1607,7 +1607,7 @@ public: }; template<class T> -static void storeItemFlags(const T *item, QVector<DomProperty*> *properties) +static void storeItemFlags(const T *item, QList<DomProperty*> *properties) { static const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); static const Qt::ItemFlags defaultFlags = T().flags(); @@ -1623,7 +1623,7 @@ static void storeItemFlags(const T *item, QVector<DomProperty*> *properties) template<class T> static void storeItemProps(QAbstractFormBuilder *abstractFormBuilder, const T *item, - QVector<DomProperty*> *properties) + QList<DomProperty*> *properties) { static const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); FriendlyFB * const formBuilder = static_cast<FriendlyFB *>(abstractFormBuilder); @@ -1648,7 +1648,7 @@ static void storeItemProps(QAbstractFormBuilder *abstractFormBuilder, const T *i template<class T> static void storeItemPropsNFlags(QAbstractFormBuilder *abstractFormBuilder, const T *item, - QVector<DomProperty*> *properties) + QList<DomProperty*> *properties) { storeItemProps<T>(abstractFormBuilder, item, properties); storeItemFlags<T>(item, properties); @@ -1714,7 +1714,7 @@ void QAbstractFormBuilder::saveTreeWidgetExtraInfo(QTreeWidget *treeWidget, DomW for (int c = 0; c<treeWidget->columnCount(); ++c) { DomColumn *column = new DomColumn; - QVector<DomProperty*> properties; + QList<DomProperty*> properties; for (const QFormBuilderStrings::TextRoleNName &it : strings.itemTextRoles) { p = saveText(it.second, treeWidget->headerItem()->data(c, it.first.second)); @@ -1758,7 +1758,7 @@ void QAbstractFormBuilder::saveTreeWidgetExtraInfo(QTreeWidget *treeWidget, DomW DomItem *currentDomItem = new DomItem; - QVector<DomProperty*> properties; + QList<DomProperty*> properties; for (int c = 0; c < treeWidget->columnCount(); c++) { for (const QFormBuilderStrings::TextRoleNName &it : strings.itemTextRoles) if ((p = saveText(it.second, item->data(c, it.first.second)))) @@ -1799,7 +1799,7 @@ void QAbstractFormBuilder::saveTableWidgetExtraInfo(QTableWidget *tableWidget, D // save the horizontal header QVector<DomColumn *> columns; for (int c = 0; c < tableWidget->columnCount(); c++) { - QVector<DomProperty*> properties; + QList<DomProperty*> properties; QTableWidgetItem *item = tableWidget->horizontalHeaderItem(c); if (item) storeItemProps(this, item, &properties); @@ -1813,7 +1813,7 @@ void QAbstractFormBuilder::saveTableWidgetExtraInfo(QTableWidget *tableWidget, D // save the vertical header QVector<DomRow *> rows; for (int r = 0; r < tableWidget->rowCount(); r++) { - QVector<DomProperty*> properties; + QList<DomProperty*> properties; QTableWidgetItem *item = tableWidget->verticalHeaderItem(r); if (item) storeItemProps(this, item, &properties); @@ -1829,7 +1829,7 @@ void QAbstractFormBuilder::saveTableWidgetExtraInfo(QTableWidget *tableWidget, D for (int c = 0; c < tableWidget->columnCount(); c++) { QTableWidgetItem *item = tableWidget->item(r, c); if (item) { - QVector<DomProperty*> properties; + QList<DomProperty*> properties; storeItemPropsNFlags(this, item, &properties); DomItem *domItem = new DomItem; @@ -1852,7 +1852,7 @@ void QAbstractFormBuilder::saveListWidgetExtraInfo(QListWidget *listWidget, DomW auto ui_items = ui_widget->elementItem(); for (int i=0; i<listWidget->count(); ++i) { - QVector<DomProperty*> properties; + QList<DomProperty*> properties; storeItemPropsNFlags(this, listWidget->item(i), &properties); DomItem *ui_item = new DomItem(); @@ -1879,7 +1879,7 @@ void QAbstractFormBuilder::saveComboBoxExtraInfo(QComboBox *comboBox, DomWidget comboBox->itemData(i, Qt::DisplayPropertyRole)); DomProperty *iconProperty = saveResource(comboBox->itemData(i, Qt::DecorationPropertyRole)); if (textProperty || iconProperty) { - QVector<DomProperty*> properties; + QList<DomProperty*> properties; if (textProperty) properties.push_back(textProperty); if (iconProperty) @@ -1901,7 +1901,7 @@ void QAbstractFormBuilder::saveComboBoxExtraInfo(QComboBox *comboBox, DomWidget void QAbstractFormBuilder::saveButtonExtraInfo(const QAbstractButton *widget, DomWidget *ui_widget, DomWidget *) { - using DomPropertyList = QVector<DomProperty *>; + using DomPropertyList = QList<DomProperty *>; if (const QButtonGroup *buttonGroup = widget->group()) { DomPropertyList attributes = ui_widget->elementAttribute(); DomString *domString = new DomString(); @@ -2315,7 +2315,7 @@ void QAbstractFormBuilder::loadItemViewExtraInfo(DomWidget *ui_widget, QAbstract if (QTreeView *treeView = qobject_cast<QTreeView*>(itemView)) { const auto &allAttributes = ui_widget->elementAttribute(); - QVector<DomProperty *> headerProperties; + QList<DomProperty *> headerProperties; for (QString realPropertyName : realPropertyNames) { const QString upperPropertyName = realPropertyName.at(0).toUpper() + realPropertyName.mid(1); @@ -2335,7 +2335,7 @@ void QAbstractFormBuilder::loadItemViewExtraInfo(DomWidget *ui_widget, QAbstract const auto &allAttributes = ui_widget->elementAttribute(); for (const QString &headerPrefix : headerPrefixes) { - QVector<DomProperty*> headerProperties; + QList<DomProperty*> headerProperties; for (QString realPropertyName : realPropertyNames) { const QString upperPropertyName = realPropertyName.at(0).toUpper() + realPropertyName.mid(1); diff --git a/src/designer/src/lib/uilib/abstractformbuilder.h b/src/designer/src/lib/uilib/abstractformbuilder.h index 58c9aef26..d33ceb76c 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.h +++ b/src/designer/src/lib/uilib/abstractformbuilder.h @@ -135,7 +135,7 @@ protected: virtual QActionGroup *create(DomActionGroup *ui_action_group, QObject *parent); virtual void addMenuAction(QAction *action); - virtual void applyProperties(QObject *o, const QVector<DomProperty*> &properties); + virtual void applyProperties(QObject *o, const QList<DomProperty*> &properties); bool applyPropertyInternally(QObject *o, const QString &propertyName, const QVariant &value); virtual void applyTabStops(QWidget *widget, DomTabStops *tabStops); @@ -175,7 +175,7 @@ protected: virtual DomTabStops *saveTabStops(); virtual DomResources *saveResources(); DomButtonGroups *saveButtonGroups(const QWidget *mainContainer); - virtual QVector<DomProperty*> computeProperties(QObject *obj); + virtual QList<DomProperty*> computeProperties(QObject *obj); virtual bool checkProperty(QObject *obj, const QString &prop) const; virtual DomProperty *createProperty(QObject *object, const QString &propertyName, const QVariant &value); @@ -210,7 +210,7 @@ protected: static QString toString(const DomString *str); using DomPropertyHash = QHash<QString, DomProperty*>; - static DomPropertyHash propertyMap(const QVector<DomProperty*> &properties); + static DomPropertyHash propertyMap(const QList<DomProperty*> &properties); void setupColorGroup(QPalette &palette, QPalette::ColorGroup colorGroup, DomColorGroup *group); DomColorGroup *saveColorGroup(const QPalette &palette); diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp index 590fe2b3a..4b5e99c69 100644 --- a/src/designer/src/lib/uilib/formbuilder.cpp +++ b/src/designer/src/lib/uilib/formbuilder.cpp @@ -494,11 +494,11 @@ void QFormBuilder::updateCustomWidgets() } /*! - \fn QVector<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const + \fn QList<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const Returns a list of the available plugins. */ -QVector<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const +QList<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const { return d->m_customWidgets.values(); } @@ -507,7 +507,7 @@ QVector<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const \internal */ -void QFormBuilder::applyProperties(QObject *o, const QVector<DomProperty*> &properties) +void QFormBuilder::applyProperties(QObject *o, const QList<DomProperty*> &properties) { if (properties.isEmpty()) diff --git a/src/designer/src/lib/uilib/formbuilder.h b/src/designer/src/lib/uilib/formbuilder.h index b2a61bf9f..79013d221 100644 --- a/src/designer/src/lib/uilib/formbuilder.h +++ b/src/designer/src/lib/uilib/formbuilder.h @@ -69,7 +69,7 @@ public: void addPluginPath(const QString &pluginPath); void setPluginPath(const QStringList &pluginPaths); - QVector<QDesignerCustomWidgetInterface*> customWidgets() const; + QList<QDesignerCustomWidgetInterface*> customWidgets() const; protected: QWidget *create(DomUI *ui, QWidget *parentWidget) override; @@ -88,7 +88,7 @@ protected: bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) override; virtual void updateCustomWidgets(); - void applyProperties(QObject *o, const QVector<DomProperty*> &properties) override; + void applyProperties(QObject *o, const QList<DomProperty*> &properties) override; static QWidget *widgetByName(QWidget *topLevel, const QString &name); diff --git a/src/designer/src/lib/uilib/formbuilderextra_p.h b/src/designer/src/lib/uilib/formbuilderextra_p.h index f70fc7b56..94b0c2231 100644 --- a/src/designer/src/lib/uilib/formbuilderextra_p.h +++ b/src/designer/src/lib/uilib/formbuilderextra_p.h @@ -261,14 +261,14 @@ struct QDESIGNER_UILIB_EXPORT QFormBuilderStrings { const QString scriptChildWidgetsVariable; using RoleNName = QPair<Qt::ItemDataRole, QString>; - QVector<RoleNName> itemRoles; + QList<RoleNName> itemRoles; QHash<QString, Qt::ItemDataRole> treeItemRoleHash; // first.first is primary role, first.second is shadow role. // Shadow is used for either the translation source or the designer // representation of the string value. using TextRoleNName = QPair<QPair<Qt::ItemDataRole, Qt::ItemDataRole>, QString>; - QVector<TextRoleNName> itemTextRoles; + QList<TextRoleNName> itemTextRoles; QHash<QString, QPair<Qt::ItemDataRole, Qt::ItemDataRole> > treeItemTextRoleHash; }; #ifdef QFORMINTERNAL_NAMESPACE |