From 6e6a8448c104bdee0ed993a806124b1c12af51f0 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 9 Apr 2025 15:27:48 +0200 Subject: [PATCH] ScxmlEditor: Code cosmetics QVector->QList, some namespaces, ... Change-Id: Ibcc577193249c8410e68981a7f31b1792dc936ae Reviewed-by: Alessandro Portale --- .../scxmleditor/common/colorpicker.cpp | 2 +- src/plugins/scxmleditor/common/colorpicker.h | 2 +- .../scxmleditor/common/colorthemes.cpp | 2 +- src/plugins/scxmleditor/common/colorthemes.h | 1 - .../scxmleditor/common/colorthemeview.cpp | 6 +++--- .../scxmleditor/common/colorthemeview.h | 4 ++-- src/plugins/scxmleditor/common/mainwidget.cpp | 2 +- src/plugins/scxmleditor/common/mainwidget.h | 4 ++-- src/plugins/scxmleditor/common/searchmodel.h | 2 +- src/plugins/scxmleditor/common/statistics.h | 2 +- src/plugins/scxmleditor/common/structure.cpp | 6 +++--- src/plugins/scxmleditor/common/structure.h | 6 +++--- .../scxmleditor/common/structuremodel.h | 4 ++-- .../scxmleditor/outputpane/outputtabwidget.h | 4 ++-- .../scxmleditor/outputpane/warningmodel.h | 2 +- .../plugin_interface/actionhandler.cpp | 4 +++- .../plugin_interface/actionhandler.h | 9 +++----- .../plugin_interface/connectableitem.cpp | 12 +++++------ .../plugin_interface/connectableitem.h | 14 ++++++------- .../plugin_interface/eventitem.cpp | 2 +- .../plugin_interface/graphicsscene.cpp | 12 +++++------ .../plugin_interface/graphicsscene.h | 6 +++--- .../plugin_interface/idwarningitem.cpp | 2 +- .../plugin_interface/parallelitem.cpp | 4 ++-- .../plugin_interface/sceneutils.cpp | 8 +++---- .../scxmleditor/plugin_interface/sceneutils.h | 4 ++-- .../plugin_interface/scshapeprovider.h | 4 ++-- .../plugin_interface/scxmldocument.cpp | 8 +++---- .../plugin_interface/scxmldocument.h | 14 ++++++------- .../scxmleditor/plugin_interface/scxmltag.cpp | 6 +++--- .../scxmleditor/plugin_interface/scxmltag.h | 6 +++--- .../plugin_interface/scxmltagutils.cpp | 18 ++++++++-------- .../plugin_interface/scxmltagutils.h | 21 +++++++------------ .../scxmleditor/plugin_interface/scxmltypes.h | 2 +- .../plugin_interface/scxmluifactory.h | 9 +++----- .../plugin_interface/shapeprovider.h | 9 +++----- .../plugin_interface/stateitem.cpp | 4 ++-- .../plugin_interface/transitionitem.h | 4 ++-- .../plugin_interface/undocommands.cpp | 4 ++-- 39 files changed, 111 insertions(+), 124 deletions(-) diff --git a/src/plugins/scxmleditor/common/colorpicker.cpp b/src/plugins/scxmleditor/common/colorpicker.cpp index a367ebbd7d0..3948ea05fdb 100644 --- a/src/plugins/scxmleditor/common/colorpicker.cpp +++ b/src/plugins/scxmleditor/common/colorpicker.cpp @@ -23,7 +23,7 @@ ColorPicker::ColorPicker(const QString &key, QWidget *parent) : QFrame(parent) , m_key(key) { - const QVector colors = { + const QList colors = { qRgb(0xed, 0xf7, 0xf2), qRgb(0xdf, 0xd3, 0xb6), qRgb(0x89, 0x72, 0x5b), qRgb(0xff, 0xd3, 0x93), qRgb(0xff, 0x97, 0x4f), qRgb(0xff, 0x85, 0x0d), qRgb(0xf7, 0xe9, 0x67), qRgb(0xef, 0xc9, 0x4c), qRgb(0xff, 0xe1, 0x1a), qRgb(0xc2, 0xe0, 0x78), qRgb(0xa2, 0xd7, 0x00), qRgb(0x45, 0xbf, 0x08), qRgb(0x91, 0xe3, 0xd8), qRgb(0x3c, 0xb3, 0xfd), qRgb(0x34, 0x67, 0xba), diff --git a/src/plugins/scxmleditor/common/colorpicker.h b/src/plugins/scxmleditor/common/colorpicker.h index 73399068904..c7ff900943a 100644 --- a/src/plugins/scxmleditor/common/colorpicker.h +++ b/src/plugins/scxmleditor/common/colorpicker.h @@ -29,7 +29,7 @@ private: QToolButton *createButton(const QColor &color); QStringList m_lastUsedColorNames; - QVector m_lastUsedColorButtons; + QList m_lastUsedColorButtons; QString m_key; QHBoxLayout *m_lastUsedColorContainer; diff --git a/src/plugins/scxmleditor/common/colorthemes.cpp b/src/plugins/scxmleditor/common/colorthemes.cpp index c6464522cb9..466efeea8fe 100644 --- a/src/plugins/scxmleditor/common/colorthemes.cpp +++ b/src/plugins/scxmleditor/common/colorthemes.cpp @@ -170,7 +170,7 @@ void ColorThemes::setCurrentColors(const QVariantMap &colorData) QStringList serializedColors; - QVector colors = ColorThemeView::defaultColors(); + QList colors = ColorThemeView::defaultColors(); for (QVariantMap::const_iterator i = colorData.begin(); i != colorData.end(); ++i) { const int k = i.key().toInt(); if (k >= 0 && k < colors.count()) { diff --git a/src/plugins/scxmleditor/common/colorthemes.h b/src/plugins/scxmleditor/common/colorthemes.h index 57a215f5f6d..a172cc75ae7 100644 --- a/src/plugins/scxmleditor/common/colorthemes.h +++ b/src/plugins/scxmleditor/common/colorthemes.h @@ -7,7 +7,6 @@ #include #include #include -#include QT_FORWARD_DECLARE_CLASS(QAction) QT_FORWARD_DECLARE_CLASS(QMenu) diff --git a/src/plugins/scxmleditor/common/colorthemeview.cpp b/src/plugins/scxmleditor/common/colorthemeview.cpp index 4edf3d177e7..8ece39d36b4 100644 --- a/src/plugins/scxmleditor/common/colorthemeview.cpp +++ b/src/plugins/scxmleditor/common/colorthemeview.cpp @@ -138,11 +138,11 @@ ColorThemeItem *ColorThemeView::createItem(int index, const QColor &color) return new ColorThemeItem(index, color, this); } -const QVector &ColorThemeView::defaultColors() +const QList &ColorThemeView::defaultColors() { // Left with hardcoded values for now if (Utils::creatorTheme()->colorScheme() == Qt::ColorScheme::Dark) { - static const QVector colors = { + static const QList colors = { QColor(0x64, 0x64, 0x64), QColor(0x60, 0x68, 0x59), QColor(0x6f, 0x6c, 0x58), @@ -153,7 +153,7 @@ const QVector &ColorThemeView::defaultColors() }; return colors; } - static const QVector colors = { + static const QList colors = { QColor(0xe0, 0xe0, 0xe0), QColor(0xd3, 0xe4, 0xc3), QColor(0xeb, 0xe4, 0xba), diff --git a/src/plugins/scxmleditor/common/colorthemeview.h b/src/plugins/scxmleditor/common/colorthemeview.h index ca2b7ef0d93..a80c58f8909 100644 --- a/src/plugins/scxmleditor/common/colorthemeview.h +++ b/src/plugins/scxmleditor/common/colorthemeview.h @@ -54,7 +54,7 @@ public: void setColor(int index, const QColor &color); QColor color(int index) const; QVariantMap colorData() const; - static const QVector &defaultColors(); + static const QList &defaultColors(); signals: void colorChanged(); @@ -66,7 +66,7 @@ private: void updateItemRects(); ColorThemeItem *createItem(int index, const QColor &color); - QVector m_themeItems; + QList m_themeItems; }; } // namespace Common diff --git a/src/plugins/scxmleditor/common/mainwidget.cpp b/src/plugins/scxmleditor/common/mainwidget.cpp index 88fcf079f3a..0c7a471e74c 100644 --- a/src/plugins/scxmleditor/common/mainwidget.cpp +++ b/src/plugins/scxmleditor/common/mainwidget.cpp @@ -497,7 +497,7 @@ void MainWidget::addStateView(BaseItem *item) // Update transitions auto scene = static_cast(it->scene()); if (scene) { - QVector childTransitionTags; + QList childTransitionTags; TagUtils::findAllTransitionChildren(it->tag(), childTransitionTags); for (int i = 0; i < childTransitionTags.count(); ++i) { BaseItem *item = scene->findItem(childTransitionTags[i]); diff --git a/src/plugins/scxmleditor/common/mainwidget.h b/src/plugins/scxmleditor/common/mainwidget.h index 047397c9710..d898f61aacf 100644 --- a/src/plugins/scxmleditor/common/mainwidget.h +++ b/src/plugins/scxmleditor/common/mainwidget.h @@ -108,8 +108,8 @@ private: PluginInterface::ScxmlDocument *m_document = nullptr; PluginInterface::ScxmlUiFactory *m_uiFactory = nullptr; - QVector m_toolButtons; - QVector m_views; + QList m_toolButtons; + QList m_views; bool m_autoFit = true; bool m_windowBlocked = false; PluginInterface::ActionHandler *m_actionHandler = nullptr; diff --git a/src/plugins/scxmleditor/common/searchmodel.h b/src/plugins/scxmleditor/common/searchmodel.h index a2faf255efc..913512ac341 100644 --- a/src/plugins/scxmleditor/common/searchmodel.h +++ b/src/plugins/scxmleditor/common/searchmodel.h @@ -36,7 +36,7 @@ private: void resetModel(); PluginInterface::ScxmlDocument *m_document = nullptr; - QVector m_allTags; + QList m_allTags; QString m_strFilter; }; diff --git a/src/plugins/scxmleditor/common/statistics.h b/src/plugins/scxmleditor/common/statistics.h index 5b8fc0d8c77..5c01d6fa760 100644 --- a/src/plugins/scxmleditor/common/statistics.h +++ b/src/plugins/scxmleditor/common/statistics.h @@ -40,7 +40,7 @@ private: void calculateStats(PluginInterface::ScxmlTag *tag); QStringList m_names; - QVector m_counts; + QList m_counts; int m_levels = 0; }; diff --git a/src/plugins/scxmleditor/common/structure.cpp b/src/plugins/scxmleditor/common/structure.cpp index 1ea5d9bb7a0..f55659a6b11 100644 --- a/src/plugins/scxmleditor/common/structure.cpp +++ b/src/plugins/scxmleditor/common/structure.cpp @@ -54,7 +54,7 @@ StructureSortFilterProxyModel::StructureSortFilterProxyModel(QObject *parent) { } -void StructureSortFilterProxyModel::setVisibleTags(const QVector &visibleTags) +void StructureSortFilterProxyModel::setVisibleTags(const QList &visibleTags) { m_visibleTags = visibleTags; if (!m_visibleTags.contains(Scxml)) @@ -102,7 +102,7 @@ Structure::Structure(QWidget *parent) m_proxyModel->setDynamicSortFilter(false); // Default set of the visible tags - QVector visibleTags; + QList visibleTags; for (int i = 0; i < Finalize; ++i) visibleTags << TagType(i); m_proxyModel->setVisibleTags(visibleTags); @@ -132,7 +132,7 @@ void Structure::addCheckbox(const QString &name, TagType type) void Structure::updateCheckBoxes() { - QVector visibleTags; + QList visibleTags; for (QCheckBox *box : std::as_const(m_checkboxes)) { if (box->isChecked()) { switch (TagType(box->property(Constants::C_SCXMLTAG_TAGTYPE).toInt())) { diff --git a/src/plugins/scxmleditor/common/structure.h b/src/plugins/scxmleditor/common/structure.h index cde23153ff9..7220a0863c5 100644 --- a/src/plugins/scxmleditor/common/structure.h +++ b/src/plugins/scxmleditor/common/structure.h @@ -43,11 +43,11 @@ public: explicit StructureSortFilterProxyModel(QObject *parent = nullptr); bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override; void setSourceModel(QAbstractItemModel *sourceModel) override; - void setVisibleTags(const QVector &visibleTags); + void setVisibleTags(const QList &visibleTags); private: QPointer m_sourceModel; - QVector m_visibleTags; + QList m_visibleTags; }; /** @@ -80,7 +80,7 @@ private: StructureModel *m_model; PluginInterface::ScxmlDocument *m_currentDocument = nullptr; PluginInterface::GraphicsScene *m_scene = nullptr; - QVector m_checkboxes; + QList m_checkboxes; TreeItemDelegate *m_customDelegate = nullptr; QWidget *m_paneInnerFrame = nullptr; diff --git a/src/plugins/scxmleditor/common/structuremodel.h b/src/plugins/scxmleditor/common/structuremodel.h index d82b5aa330e..e351015543e 100644 --- a/src/plugins/scxmleditor/common/structuremodel.h +++ b/src/plugins/scxmleditor/common/structuremodel.h @@ -37,8 +37,8 @@ public: private: QIcon m_emptyIcon; - QVector m_iconIndices; - QVector m_icons; + QList m_iconIndices; + QList m_icons; }; class StructureModel : public QAbstractItemModel diff --git a/src/plugins/scxmleditor/outputpane/outputtabwidget.h b/src/plugins/scxmleditor/outputpane/outputtabwidget.h index 3c92f960e8d..e8269961300 100644 --- a/src/plugins/scxmleditor/outputpane/outputtabwidget.h +++ b/src/plugins/scxmleditor/outputpane/outputtabwidget.h @@ -68,8 +68,8 @@ private: void buttonClicked(PaneTitleButton *button, bool checked); void showAlert(OutputPane *pane); - QVector m_pages; - QVector m_buttons; + QList m_pages; + QList m_buttons; QToolBar *m_toolBar = nullptr; QStackedWidget *m_stackedWidget = nullptr; diff --git a/src/plugins/scxmleditor/outputpane/warningmodel.h b/src/plugins/scxmleditor/outputpane/warningmodel.h index cf2783f0b55..48aa897aa7f 100644 --- a/src/plugins/scxmleditor/outputpane/warningmodel.h +++ b/src/plugins/scxmleditor/outputpane/warningmodel.h @@ -52,7 +52,7 @@ private: QString severityName(Warning::Severity severity) const; QIcon severityIcon(Warning::Severity severity) const; - QVector m_warnings; + QList m_warnings; QMap m_warningVisibilities; int m_oldCount = 0; QPointer m_countChecker; diff --git a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp index 01f0fdbafe6..ed5643ed2ac 100644 --- a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp +++ b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp @@ -9,7 +9,7 @@ #include -using namespace ScxmlEditor::PluginInterface; +namespace ScxmlEditor::PluginInterface { ActionHandler::ActionHandler(QObject *parent) : QObject(parent) @@ -68,3 +68,5 @@ QAction *ActionHandler::action(ActionType type) const return nullptr; } + +} // ScxmlEditor::PluginInterface diff --git a/src/plugins/scxmleditor/plugin_interface/actionhandler.h b/src/plugins/scxmleditor/plugin_interface/actionhandler.h index 8d78ec11fae..df883374594 100644 --- a/src/plugins/scxmleditor/plugin_interface/actionhandler.h +++ b/src/plugins/scxmleditor/plugin_interface/actionhandler.h @@ -9,9 +9,7 @@ QT_FORWARD_DECLARE_CLASS(QAction) -namespace ScxmlEditor { - -namespace PluginInterface { +namespace ScxmlEditor::PluginInterface { class ActionHandler : public QObject { @@ -23,8 +21,7 @@ public: QAction *action(ActionType type) const; private: - QVector m_actions; + QList m_actions; }; -} // namespace PluginInterface -} // namespace ScxmlEditor +} // namespace ScxmlEditor::PluginInterface diff --git a/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp b/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp index 715bcbb7c15..64dc4438a7f 100644 --- a/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp @@ -47,17 +47,17 @@ ConnectableItem::~ConnectableItem() { setBlockUpdates(true); - const QVector overlappedItems = m_overlappedItems; + const QList overlappedItems = m_overlappedItems; for (ConnectableItem *item : overlappedItems) item->removeOverlappingItem(this); m_overlappedItems.clear(); - const QVector outputTransitions = m_outputTransitions; + const QList outputTransitions = m_outputTransitions; for (TransitionItem *transition : outputTransitions) transition->disconnectItem(this); m_outputTransitions.clear(); - const QVector inputTransitions = m_inputTransitions; + const QList inputTransitions = m_inputTransitions; for (TransitionItem *transition : inputTransitions) transition->disconnectItem(this); m_inputTransitions.clear(); @@ -741,7 +741,7 @@ void ConnectableItem::removeOverlappingItem(ConnectableItem *item) void ConnectableItem::checkOverlapping() { - QVector overlappedItems; + QList overlappedItems; const QList items = collidingItems(); for (QGraphicsItem *it : items) { if (it->type() >= InitialStateType && it->parentItem() == parentItem()) { @@ -774,12 +774,12 @@ bool ConnectableItem::canStartTransition(ItemType type) const return true; } -QVector ConnectableItem::outputTransitions() const +QList ConnectableItem::outputTransitions() const { return m_outputTransitions; } -QVector ConnectableItem::inputTransitions() const +QList ConnectableItem::inputTransitions() const { return m_inputTransitions; } diff --git a/src/plugins/scxmleditor/plugin_interface/connectableitem.h b/src/plugins/scxmleditor/plugin_interface/connectableitem.h index 60fa2a1047d..982a0163b32 100644 --- a/src/plugins/scxmleditor/plugin_interface/connectableitem.h +++ b/src/plugins/scxmleditor/plugin_interface/connectableitem.h @@ -38,8 +38,8 @@ public: void addInputTransition(TransitionItem *transition); void removeOutputTransition(TransitionItem *transition); void removeInputTransition(TransitionItem *transition); - QVector outputTransitions() const; - QVector inputTransitions() const; + QList outputTransitions() const; + QList inputTransitions() const; void setMinimumWidth(int width); void setMinimumHeight(int height); @@ -101,10 +101,10 @@ private: void removeCorners(); void updateShadowClipRegion(); - QVector m_outputTransitions; - QVector m_inputTransitions; - QVector m_corners; - QVector m_quickTransitions; + QList m_outputTransitions; + QList m_inputTransitions; + QList m_corners; + QList m_quickTransitions; HighlightItem *m_highlighItem = nullptr; TransitionItem *m_newTransition = nullptr; QPen m_selectedPen; @@ -118,7 +118,7 @@ private: QPainterPath m_shadowClipPath; QPointF m_moveStartPoint; bool m_moveMacroStarted = false; - QVector m_overlappedItems; + QList m_overlappedItems; }; } // namespace PluginInterface diff --git a/src/plugins/scxmleditor/plugin_interface/eventitem.cpp b/src/plugins/scxmleditor/plugin_interface/eventitem.cpp index b0fdc701831..8b3fff23900 100644 --- a/src/plugins/scxmleditor/plugin_interface/eventitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/eventitem.cpp @@ -66,7 +66,7 @@ void OnEntryExitItem::updateAttributes() void OnEntryExitItem::finalizeCreation() { - const QVector children = tag()->allChildren(); + const QList children = tag()->allChildren(); auto pos = m_eventNameItem->boundingRect().bottomLeft(); for (auto child : children) { EventItem *item = new EventItem(pos, this); diff --git a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp index 12b9949f945..50a78469bfa 100644 --- a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp +++ b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp @@ -179,7 +179,7 @@ void GraphicsScene::cut() void GraphicsScene::removeSelectedItems() { - QVector tags = SceneUtils::findRemovedTags(m_baseItems); + QList tags = SceneUtils::findRemovedTags(m_baseItems); if (!tags.isEmpty()) { m_document->undoStack()->beginMacro(Tr::tr("Remove items")); @@ -199,9 +199,9 @@ void GraphicsScene::copy() return; QPointF minPos; - QVector tags; + QList tags; if (m_document->currentTag()->tagType() == Scxml) { - QVector items; + QList items; for (BaseItem *item : std::as_const(m_baseItems)) { if (!item->parentItem()) items << item; @@ -349,7 +349,7 @@ void GraphicsScene::runLayoutToSelectedStates() { m_document->undoStack()->beginMacro(Tr::tr("Re-layout")); - QVector selectedItems; + QList selectedItems; for (BaseItem *node : std::as_const(m_baseItems)) { if (node->isSelected()) { int index = 0; @@ -514,7 +514,7 @@ void GraphicsScene::endTagChange(ScxmlDocument::TagChange change, ScxmlTag *tag, if (!tag) break; - QVector childTransitionTags; + QList childTransitionTags; if (tag->tagName(false) == "transition") childTransitionTags << tag; @@ -721,7 +721,7 @@ void GraphicsScene::removeItems(const ScxmlTag *tag) { if (tag) { // Find right items - QVector items; + QList items; for (BaseItem *it : std::as_const(m_baseItems)) { if (it->tag() == tag) items << it; diff --git a/src/plugins/scxmleditor/plugin_interface/graphicsscene.h b/src/plugins/scxmleditor/plugin_interface/graphicsscene.h index d5920181aa6..10c667c5e0c 100644 --- a/src/plugins/scxmleditor/plugin_interface/graphicsscene.h +++ b/src/plugins/scxmleditor/plugin_interface/graphicsscene.h @@ -57,7 +57,7 @@ public: void setDocument(ScxmlDocument *document); void unselectAll(); void unhighlightAll(); - void highlightItems(const QVector &lstIds); + void highlightItems(const QList &lstIds); void addConnectableItem(ItemType type, const QPointF &pos, BaseItem *parentItem); void runAutomaticLayout(); void runLayoutToSelectedStates(); @@ -112,8 +112,8 @@ private: QPointer m_warningModel; QPointer m_uiFactory; QPointer m_document; - QVector m_baseItems; - QVector m_allWarnings; + QList m_baseItems; + QList m_allWarnings; int m_pasteCounter = 0; QPointer m_lastPasteTargetItem; SnapLine *m_lineX = nullptr; diff --git a/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp b/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp index 8997bf986f7..72d1438dd11 100644 --- a/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp @@ -43,7 +43,7 @@ void IdWarningItem::setId(const QString &text) void IdWarningItem::checkDuplicates(const QString &id) { if (scene()) { - QVector foundItems; + QList foundItems; QList items = scene()->items(); for (int i = 0; i < items.count(); ++i) { diff --git a/src/plugins/scxmleditor/plugin_interface/parallelitem.cpp b/src/plugins/scxmleditor/plugin_interface/parallelitem.cpp index aaf541ab454..ef4d07d019b 100644 --- a/src/plugins/scxmleditor/plugin_interface/parallelitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/parallelitem.cpp @@ -45,7 +45,7 @@ void ParallelItem::doLayout(int d) return; // 1. Find children items - QVector children; + QList children; const QList items = childItems(); for (QGraphicsItem *it : items) { if (it->type() >= StateType) { @@ -74,7 +74,7 @@ void ParallelItem::doLayout(int d) // 3. Relocate children-states // a) sort list - QVector sortedList; + QList sortedList; while (!children.isEmpty()) { qreal minTop = children.first()->boundingRect().top(); int minTopIndex = 0; diff --git a/src/plugins/scxmleditor/plugin_interface/sceneutils.cpp b/src/plugins/scxmleditor/plugin_interface/sceneutils.cpp index 4ec89c440f5..c6b533fe862 100644 --- a/src/plugins/scxmleditor/plugin_interface/sceneutils.cpp +++ b/src/plugins/scxmleditor/plugin_interface/sceneutils.cpp @@ -123,10 +123,10 @@ bool canDrop(int parentType, int childType) } } -QVector findCopyTags(const QVector &items, QPointF &minPos) +QList findCopyTags(const QList &items, QPointF &minPos) { QPointF pp(0, 0); - QVector tags; + QList tags; for (BaseItem *it : items) { if (it->type() >= InitialStateType && it->isSelected()) { BaseItem *parent = it->parentBaseItem(); @@ -155,10 +155,10 @@ QVector findCopyTags(const QVector &items, QPointF &minPos return tags; } -QVector findRemovedTags(const QVector &items) +QList findRemovedTags(const QList &items) { // Find right tags - QVector tags; + QList tags; for (BaseItem *it : items) { if (it->isSelected()) { // Find the last selected parent diff --git a/src/plugins/scxmleditor/plugin_interface/sceneutils.h b/src/plugins/scxmleditor/plugin_interface/sceneutils.h index 9309faa0360..08ab19b65a4 100644 --- a/src/plugins/scxmleditor/plugin_interface/sceneutils.h +++ b/src/plugins/scxmleditor/plugin_interface/sceneutils.h @@ -31,8 +31,8 @@ ConnectableItem *createItem(ItemType type, const QPointF &pos = QPointF()); ConnectableItem *createItemByTagType(TagType type, const QPointF &pos = QPointF()); ScxmlTag *createTag(ItemType type, ScxmlDocument *document); bool canDrop(int parentType, int childType); -QVector findCopyTags(const QVector &items, QPointF &minPos); -QVector findRemovedTags(const QVector &items); +QList findCopyTags(const QList &items, QPointF &minPos); +QList findRemovedTags(const QList &items); void layout(const QList &items); bool isSomeSelected(QGraphicsItem *item); void moveTop(BaseItem *item, GraphicsScene *scene); diff --git a/src/plugins/scxmleditor/plugin_interface/scshapeprovider.h b/src/plugins/scxmleditor/plugin_interface/scshapeprovider.h index 58ef0924b0a..3afa2a96df8 100644 --- a/src/plugins/scxmleditor/plugin_interface/scshapeprovider.h +++ b/src/plugins/scxmleditor/plugin_interface/scshapeprovider.h @@ -5,7 +5,7 @@ #include "shapeprovider.h" -#include +#include namespace ScxmlEditor { @@ -40,7 +40,7 @@ protected: private: void init(); - QVector m_groups; + QList m_groups; }; } // namespace PluginInterface diff --git a/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp b/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp index a2beac1167b..99e161b3a77 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp @@ -169,7 +169,7 @@ QColor ScxmlDocument::getColor(int depth) const return m_colors.isEmpty() ? QColor(Qt::gray) : m_colors[depth % m_colors.count()]; } -void ScxmlDocument::setLevelColors(const QVector &colors) +void ScxmlDocument::setLevelColors(const QList &colors) { m_colors = colors; emit colorThemeChanged(); @@ -294,7 +294,7 @@ bool ScxmlDocument::pasteData(const QByteArray &data, const QPointF &minPos, con } m_idMap.clear(); - QVector addedTags; + QList addedTags; while (!xml.atEnd()) { QXmlStreamReader::TokenType token = xml.readNext(); @@ -374,7 +374,7 @@ void ScxmlDocument::printSCXML() qDebug() << content(); } -QByteArray ScxmlDocument::content(const QVector &tags) const +QByteArray ScxmlDocument::content(const QList &tags) const { QByteArray result; if (!tags.isEmpty()) { @@ -494,7 +494,7 @@ void ScxmlDocument::changeOrder(ScxmlTag *child, int newPos) } } -void ScxmlDocument::addTags(ScxmlTag *parent, const QVector tags) +void ScxmlDocument::addTags(ScxmlTag *parent, const QList tags) { if (m_undoRedoRunning) return; diff --git a/src/plugins/scxmleditor/plugin_interface/scxmldocument.h b/src/plugins/scxmleditor/plugin_interface/scxmldocument.h index fe3f9949a8b..afd15008beb 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmldocument.h +++ b/src/plugins/scxmleditor/plugin_interface/scxmldocument.h @@ -5,11 +5,11 @@ #include #include +#include #include #include #include #include -#include QT_FORWARD_DECLARE_CLASS(QUndoStack) QT_FORWARD_DECLARE_CLASS(QXmlStreamReader) @@ -106,7 +106,7 @@ public: * @param child */ void addTag(ScxmlTag *parent, ScxmlTag *child); - void addTags(ScxmlTag *parent, const QVector tags); + void addTags(ScxmlTag *parent, const QList tags); /** * @brief removeTag - inform views that tag will be removed @@ -183,7 +183,7 @@ public: */ bool hasLayouted() const; - void setLevelColors(const QVector &colors); + void setLevelColors(const QList &colors); QColor getColor(int depth) const; bool hasError() const @@ -196,7 +196,7 @@ public: return m_lastError; } - QByteArray content(const QVector &tags) const; + QByteArray content(const QList &tags) const; QByteArray content(ScxmlTag *tag = nullptr) const; void clear(bool createRoot = true); @@ -256,14 +256,14 @@ private: ScxmlTag *createScxmlTag(); QString m_fileName; QUndoStack *m_undoStack; - QVector m_tags; + QList m_tags; QHash m_nextIdHash; QHash m_idMap; bool m_hasError = false; QString m_lastError; - QVector m_rootTags; + QList m_rootTags; QMap m_namespaces; - QVector m_colors; + QList m_colors; bool m_hasLayouted = false; QString m_idDelimiter; bool m_useFullNameSpace = false; diff --git a/src/plugins/scxmleditor/plugin_interface/scxmltag.cpp b/src/plugins/scxmleditor/plugin_interface/scxmltag.cpp index f7efa730d8d..36767e8f7dd 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmltag.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scxmltag.cpp @@ -476,14 +476,14 @@ ScxmlTag *ScxmlTag::tagForId(const QString &id) const return nullptr; } -QVector ScxmlTag::allChildren() const +QList ScxmlTag::allChildren() const { return m_childTags; } -QVector ScxmlTag::children(const QString &name) const +QList ScxmlTag::children(const QString &name) const { - QVector children; + QList children; for (ScxmlTag *tag : std::as_const(m_childTags)) { if (tag->tagName() == name) children << tag; diff --git a/src/plugins/scxmleditor/plugin_interface/scxmltag.h b/src/plugins/scxmleditor/plugin_interface/scxmltag.h index d9be19bfa0d..2fcb45d0242 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmltag.h +++ b/src/plugins/scxmleditor/plugin_interface/scxmltag.h @@ -83,8 +83,8 @@ public: void removeChild(ScxmlTag *child); void moveChild(int oldPos, int newPos); int childCount() const; - QVector allChildren() const; - QVector children(const QString &name) const; + QList allChildren() const; + QList children(const QString &name) const; ScxmlTag *child(const QString &name) const; ScxmlTag *child(int row) const; int childIndex(const ScxmlTag *child) const; @@ -116,7 +116,7 @@ private: QStringList m_attributeNames; QStringList m_attributeValues; QPointer m_parentTag; - QVector m_childTags; + QList m_childTags; QPointer m_document; TagType m_tagType = UnknownTag; QString m_tagName; diff --git a/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp b/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp index 78b151061bd..da60647ec25 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp @@ -24,7 +24,7 @@ bool checkPaste(const QString &copiedTagTypes, const ScxmlTag *currentTag) if (copiedTagTypes.isEmpty() || !currentTag) return false; - QVector tagTypes; + QList tagTypes; for (int i = 0; i < Finalize; ++i) { if (copiedTagTypes.contains(QLatin1String(scxml_tags[i].name))) tagTypes << TagType(i); @@ -35,7 +35,7 @@ bool checkPaste(const QString &copiedTagTypes, const ScxmlTag *currentTag) if (tagTypes.isEmpty()) return false; - QVector childTags = allowedChildTypes(currentTag->tagType()); + QList childTags = allowedChildTypes(currentTag->tagType()); for (const TagType &type : std::as_const(tagTypes)) { if (!childTags.contains(type)) return false; @@ -75,9 +75,9 @@ void createChildMenu(const ScxmlTag *tag, QMenu *menu, bool addRemove) } } -QVector allowedChildTypes(TagType tagType) +QList allowedChildTypes(TagType tagType) { - QVector childTags; + QList childTags; switch (tagType) { case Scxml: @@ -161,9 +161,9 @@ QVector allowedChildTypes(TagType tagType) return childTags; } -QVector childTypes(TagType tagType) +QList childTypes(TagType tagType) { - QVector childTags; + QList childTags; switch (tagType) { case Scxml: @@ -241,7 +241,7 @@ void initChildMenu(TagType tagType, QMenu *menu) { menu->setTitle(QLatin1String(scxml_tags[tagType].name)); - QVector childTags = childTypes(tagType); + QList childTags = childTypes(tagType); if (!childTags.isEmpty()) { for (int i = 0; i < childTags.count(); ++i) { @@ -301,7 +301,7 @@ ScxmlTag *findChild(const ScxmlTag *tag, TagType childType) return nullptr; } -void findAllChildren(const ScxmlTag *tag, QVector &children) +void findAllChildren(const ScxmlTag *tag, QList &children) { QTC_ASSERT(tag, return); @@ -312,7 +312,7 @@ void findAllChildren(const ScxmlTag *tag, QVector &children) } } -void findAllTransitionChildren(const ScxmlTag *tag, QVector &children) +void findAllTransitionChildren(const ScxmlTag *tag, QList &children) { QTC_ASSERT(tag, return); diff --git a/src/plugins/scxmleditor/plugin_interface/scxmltagutils.h b/src/plugins/scxmleditor/plugin_interface/scxmltagutils.h index 68fefabd179..dfbdf833425 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmltagutils.h +++ b/src/plugins/scxmleditor/plugin_interface/scxmltagutils.h @@ -4,14 +4,11 @@ #pragma once #include "scxmltag.h" + +#include #include -#include -namespace ScxmlEditor { - -namespace PluginInterface { - -namespace TagUtils { +namespace ScxmlEditor::PluginInterface::TagUtils { enum MenuAction { AddChild = 0, @@ -23,16 +20,14 @@ enum MenuAction { }; bool checkPaste(const QString &copiedTagType, const ScxmlTag *currentTag); -QVector allowedChildTypes(TagType tagType); -QVector childTypes(TagType type); +QList allowedChildTypes(TagType tagType); +QList childTypes(TagType type); void createChildMenu(const ScxmlTag *tag, QMenu *menu, bool addRemove = true); void initChildMenu(TagType tagType, QMenu *menu); ScxmlTag *findChild(const ScxmlTag *tag, TagType childType); ScxmlTag *metadataTag(ScxmlTag *tag, const QString &tagname, bool blockUpdates = false); -void findAllChildren(const ScxmlTag *tag, QVector &children); -void findAllTransitionChildren(const ScxmlTag *tag, QVector &children); +void findAllChildren(const ScxmlTag *tag, QList &children); +void findAllTransitionChildren(const ScxmlTag *tag, QList &children); void modifyPosition(ScxmlTag *tag, const QPointF &minPos, const QPointF &targetPos); -} // namespace TagUtils -} // namespace PluginInterface -} // namespace ScxmlEditor +} // namespace ScxmlEditor::PluginInterface::TagUtils diff --git a/src/plugins/scxmleditor/plugin_interface/scxmltypes.h b/src/plugins/scxmleditor/plugin_interface/scxmltypes.h index 0224fb8cb29..656baa2c363 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmltypes.h +++ b/src/plugins/scxmleditor/plugin_interface/scxmltypes.h @@ -3,8 +3,8 @@ #pragma once +#include #include -#include namespace ScxmlEditor { diff --git a/src/plugins/scxmleditor/plugin_interface/scxmluifactory.h b/src/plugins/scxmleditor/plugin_interface/scxmluifactory.h index a2d99412f97..2c6c35955eb 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmluifactory.h +++ b/src/plugins/scxmleditor/plugin_interface/scxmluifactory.h @@ -7,9 +7,7 @@ #include -namespace ScxmlEditor { - -namespace PluginInterface { +namespace ScxmlEditor::PluginInterface { class ISCEditor; class ScxmlDocument; @@ -41,9 +39,8 @@ public: private: void initPlugins(); - QVector m_plugins; + QList m_plugins; QMap m_objects; }; -} // namespace PluginInterface -} // namespace ScxmlEditor +} // namespace ScxmlEditor::PluginInterface diff --git a/src/plugins/scxmleditor/plugin_interface/shapeprovider.h b/src/plugins/scxmleditor/plugin_interface/shapeprovider.h index a7520e44652..3bfeb0f6cff 100644 --- a/src/plugins/scxmleditor/plugin_interface/shapeprovider.h +++ b/src/plugins/scxmleditor/plugin_interface/shapeprovider.h @@ -9,9 +9,7 @@ #include #include -namespace ScxmlEditor { - -namespace PluginInterface { +namespace ScxmlEditor::PluginInterface { class ShapeProvider : public QObject { @@ -36,7 +34,7 @@ public: } QString title; - QVector shapes; + QList shapes; void addShape(Shape *shape) { shapes << shape; @@ -59,5 +57,4 @@ signals: void changed(); }; -} // namespace PluginInterface -} // namespace ScxmlEditor +} // namespace ScxmlEditor::PluginInterface diff --git a/src/plugins/scxmleditor/plugin_interface/stateitem.cpp b/src/plugins/scxmleditor/plugin_interface/stateitem.cpp index 62f29d7b511..90ee4f07d09 100644 --- a/src/plugins/scxmleditor/plugin_interface/stateitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/stateitem.cpp @@ -190,7 +190,7 @@ void StateItem::updateBoundingRect() void StateItem::shrink() { QRectF trect; - const QVector items = outputTransitions(); + const QList items = outputTransitions(); for (TransitionItem *item : items) { if (item->targetType() == TransitionItem::InternalSameTarget || item->targetType() == TransitionItem::InternalNoTarget) { trect = trect.united(item->wholeBoundingRect()); @@ -223,7 +223,7 @@ void StateItem::transitionsChanged() { QRectF rr = boundingRect(); QRectF rectInternalTransitions; - const QVector internalTransitions = outputTransitions(); + const QList internalTransitions = outputTransitions(); for (TransitionItem *item : internalTransitions) { if (item->targetType() <= TransitionItem::InternalNoTarget) { QRectF br = mapFromItem(item, item->boundingRect()).boundingRect(); diff --git a/src/plugins/scxmleditor/plugin_interface/transitionitem.h b/src/plugins/scxmleditor/plugin_interface/transitionitem.h index 13a3a3cf2da..04f12a96770 100644 --- a/src/plugins/scxmleditor/plugin_interface/transitionitem.h +++ b/src/plugins/scxmleditor/plugin_interface/transitionitem.h @@ -4,13 +4,13 @@ #pragma once #include "transitionwarningitem.h" + #include #include #include #include #include #include -#include namespace ScxmlEditor { @@ -126,7 +126,7 @@ private: QPointF calculateTargetFactor(ConnectableItem *item, const QPointF &pos); QPointF sceneTargetPoint(TransitionPoint p); QPointF findIntersectionPoint(ConnectableItem *item, const QLineF &line, const QPointF &defaultPoint); - QVector m_cornerGrabbers; + QList m_cornerGrabbers; CornerGrabberItem *m_selectedCornerGrabber = nullptr; QPolygonF m_cornerPoints; diff --git a/src/plugins/scxmleditor/plugin_interface/undocommands.cpp b/src/plugins/scxmleditor/plugin_interface/undocommands.cpp index 0e4b4d9b02d..23055f4185a 100644 --- a/src/plugins/scxmleditor/plugin_interface/undocommands.cpp +++ b/src/plugins/scxmleditor/plugin_interface/undocommands.cpp @@ -332,7 +332,7 @@ void ChangeFullNameSpaceCommand::makeIdMap(ScxmlTag *tag, QHash children = tag->allChildren(); + const QList children = tag->allChildren(); for (ScxmlTag *child : children) { makeIdMap(child, map, use); } @@ -359,7 +359,7 @@ void ChangeFullNameSpaceCommand::updateNameSpace(ScxmlTag *tag, const QHashsetAttribute(name, map[attr]); } - const QVector children = tag->allChildren(); + const QList children = tag->allChildren(); for (ScxmlTag *child : children) { updateNameSpace(child, map); }