diff options
Diffstat (limited to 'src/designer/src/lib/shared')
33 files changed, 76 insertions, 73 deletions
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, |