diff options
Diffstat (limited to 'src/plugins/qmldesigner')
197 files changed, 805 insertions, 1024 deletions
diff --git a/src/plugins/qmldesigner/components/componentcore/abstractaction.cpp b/src/plugins/qmldesigner/components/componentcore/abstractaction.cpp index 05e33a2ce7..e4546b5230 100644 --- a/src/plugins/qmldesigner/components/componentcore/abstractaction.cpp +++ b/src/plugins/qmldesigner/components/componentcore/abstractaction.cpp @@ -74,7 +74,7 @@ SelectionContext AbstractAction::selectionContext() const } DefaultAction::DefaultAction(const QString &description) - : QAction(description, 0) + : QAction(description, nullptr) { connect(this, &QAction::triggered, this, &DefaultAction::actionTriggered); } diff --git a/src/plugins/qmldesigner/components/componentcore/actioninterface.h b/src/plugins/qmldesigner/components/componentcore/actioninterface.h index ff6ddadb95..ee120131f7 100644 --- a/src/plugins/qmldesigner/components/componentcore/actioninterface.h +++ b/src/plugins/qmldesigner/components/componentcore/actioninterface.h @@ -52,7 +52,7 @@ public: LowestPriority = ComponentCoreConstants::priorityLast }; - virtual ~ActionInterface() {} + virtual ~ActionInterface() = default; virtual QAction *action() const = 0; virtual QByteArray category() const = 0; diff --git a/src/plugins/qmldesigner/components/componentcore/addimagesdialog.cpp b/src/plugins/qmldesigner/components/componentcore/addimagesdialog.cpp index 5f69750e8a..10a992ae1b 100644 --- a/src/plugins/qmldesigner/components/componentcore/addimagesdialog.cpp +++ b/src/plugins/qmldesigner/components/componentcore/addimagesdialog.cpp @@ -39,7 +39,7 @@ static QTableWidget* createFilesTable(const QStringList &fileNames) { - QTableWidget *table = new QTableWidget(0, 2); + auto table = new QTableWidget(0, 2); table->setSelectionMode(QAbstractItemView::NoSelection); QStringList labels({ @@ -55,7 +55,7 @@ static QTableWidget* createFilesTable(const QStringList &fileNames) const QString toolTip = QDir::toNativeSeparators(filePath); const QString fileName = QFileInfo(filePath).fileName(); const qint64 size = QFileInfo(filePath).size() / 1024; - QTableWidgetItem *fileNameItem = new QTableWidgetItem(fileName); + auto fileNameItem = new QTableWidgetItem(fileName); fileNameItem->setToolTip(toolTip); fileNameItem->setFlags(fileNameItem->flags() ^ Qt::ItemIsEditable); QTableWidgetItem *sizeItem = new QTableWidgetItem(QString::number(size) + " KB"); @@ -74,7 +74,7 @@ static QTableWidget* createFilesTable(const QStringList &fileNames) QComboBox *createDirectoryComboBox(const QString &defaultDirectory) { - QComboBox *comboBox = new QComboBox; + auto comboBox = new QComboBox; comboBox->addItem(defaultDirectory); comboBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); @@ -99,7 +99,7 @@ QString AddImagesDialog::getDirectory(const QStringList &fileNames, const QStrin dialog->setWindowTitle(QCoreApplication::translate("AddImageToResources","Add Resources")); QTableWidget *table = createFilesTable(fileNames); table->setParent(dialog); - QGridLayout *mainLayout = new QGridLayout(dialog); + auto mainLayout = new QGridLayout(dialog); mainLayout->addWidget(table, 0, 0, 1, 4); QComboBox *directoryComboBox = createDirectoryComboBox(defaultDirectory); diff --git a/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp b/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp index 41901e6e9d..fa77acccb9 100644 --- a/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp +++ b/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp @@ -61,7 +61,7 @@ const char disbledTooltip[] = QT_TRANSLATE_NOOP("ChangeStyleWidgetAction", QWidget *ChangeStyleWidgetAction::createWidget(QWidget *parent) { - QComboBox *comboBox = new QComboBox(parent); + auto comboBox = new QComboBox(parent); comboBox->setToolTip(tr(enabledTooltip)); comboBox->addItem("Default"); comboBox->addItem("Fusion"); diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index 6aa201020d..6bc247d143 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -71,7 +71,7 @@ DesignerActionManagerView *DesignerActionManager::view() DesignerActionToolBar *DesignerActionManager::createToolBar(QWidget *parent) const { - DesignerActionToolBar *toolBar = new DesignerActionToolBar(parent); + auto toolBar = new DesignerActionToolBar(parent); QList<ActionInterface* > categories = Utils::filtered(designerActions(), [](ActionInterface *action) { return action->type() == ActionInterface::ContextMenu; @@ -149,13 +149,13 @@ QGraphicsWidget *DesignerActionManager::createFormEditorToolBar(QGraphicsItem *p QGraphicsWidget *toolbar = new QGraphicsWidget(parent); - QGraphicsLinearLayout *layout = new QGraphicsLinearLayout; + auto layout = new QGraphicsLinearLayout; layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing(0); toolbar->setLayout(layout); for (ActionInterface *action : actions) { - FormEditorToolButton *button = new FormEditorToolButton(action->action(), toolbar); + auto button = new FormEditorToolButton(action->action(), toolbar); layout->addItem(button); } @@ -1036,9 +1036,7 @@ DesignerActionManager::DesignerActionManager(DesignerActionManagerView *designer { } -DesignerActionManager::~DesignerActionManager() -{ -} +DesignerActionManager::~DesignerActionManager() = default; DesignerActionToolBar::DesignerActionToolBar(QWidget *parentWidget) : Utils::StyledBar(parentWidget), m_toolBar(new QToolBar("ActionToolBar", this)) @@ -1048,7 +1046,7 @@ DesignerActionToolBar::DesignerActionToolBar(QWidget *parentWidget) : Utils::Sty m_toolBar->setMovable(true); m_toolBar->setOrientation(Qt::Horizontal); - QHBoxLayout *horizontalLayout = new QHBoxLayout(this); + auto horizontalLayout = new QHBoxLayout(this); horizontalLayout->setMargin(0); horizontalLayout->setSpacing(0); @@ -1066,7 +1064,7 @@ void DesignerActionToolBar::registerAction(ActionInterface *action) void DesignerActionToolBar::addSeparator() { - QAction *separatorAction = new QAction(m_toolBar); + auto separatorAction = new QAction(m_toolBar); separatorAction->setSeparator(true); m_toolBar->addAction(separatorAction); } diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h index b84bbb71af..7997ef07e2 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h @@ -42,7 +42,7 @@ namespace QmlDesigner { class DesignerActionManagerView; -typedef std::function<bool (const QStringList &filenames, const QString &defaulTargetDirectory)> AddResourceOperation; +using AddResourceOperation = std::function<bool (const QStringList&, const QString&)>; struct AddResourceHandler { diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanagerview.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanagerview.cpp index 4e97cb75ca..dcdf960cf4 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanagerview.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanagerview.cpp @@ -32,7 +32,7 @@ namespace QmlDesigner { DesignerActionManagerView::DesignerActionManagerView() - : AbstractView(0), + : AbstractView(nullptr), m_designerActionManager(this), m_isInRewriterTransaction(false), m_setupContextDirty(false) diff --git a/src/plugins/qmldesigner/components/componentcore/findimplementation.cpp b/src/plugins/qmldesigner/components/componentcore/findimplementation.cpp index 74cab1e0a5..6ddd66f727 100644 --- a/src/plugins/qmldesigner/components/componentcore/findimplementation.cpp +++ b/src/plugins/qmldesigner/components/componentcore/findimplementation.cpp @@ -42,7 +42,7 @@ using namespace QmlJS; class FindImplementationVisitor: protected AST::Visitor { public: - typedef QList<AST::SourceLocation> Results; + using Results = QList<AST::SourceLocation>; FindImplementationVisitor(Document::Ptr doc, const ContextPtr &context) : m_document(doc) @@ -248,9 +248,7 @@ QString matchingLine(unsigned position, const QString &source) } //namespace -FindImplementation::FindImplementation() -{ -} +FindImplementation::FindImplementation() = default; QList<QmlJSEditor::FindReferences::Usage> FindImplementation::run(const QString &fileName, const QString &typeName, diff --git a/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.h b/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.h index 4acc4291a6..ba7d5991e9 100644 --- a/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.h +++ b/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.h @@ -46,7 +46,7 @@ public: const QList<ModelNode> &modelNodeList); static void setSizeAsPreferredSize(const QList<ModelNode> &modelNodeList); private: - typedef std::function<bool(const ModelNode &node1, const ModelNode &node2)> LessThan; + using LessThan = std::function<bool (const ModelNode&, const ModelNode&)>; LayoutInGridLayout(const SelectionContext &selectionContext); void doIt(); diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp index de2733893a..415127cb52 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp @@ -91,7 +91,7 @@ void populateMenu(QSet<ActionInterface* > &actionInterfaces, void ModelNodeContextMenu::execute(const QPoint &position, bool selectionMenuBool) { - QMenu* mainMenu = new QMenu(); + auto mainMenu = new QMenu(); m_selectionContext.setShowSelectionTools(selectionMenuBool); m_selectionContext.setScenePosition(m_scenePos); diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h index 79f344d9b5..6d9f904149 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h +++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h @@ -41,8 +41,8 @@ namespace QmlDesigner { -typedef std::function<bool (const SelectionContext &context)> SelectionContextPredicate; -typedef std::function<void (const SelectionContext &context)> SelectionContextOperation; +using SelectionContextPredicate = std::function<bool (const SelectionContext&)>; +using SelectionContextOperation = std::function<void (const SelectionContext&)>; namespace SelectionContextFunctors { diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index bc43ca6515..c40de1ea56 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -444,7 +444,7 @@ void anchorsReset(const SelectionContext &selectionState) } } -typedef std::function<bool(const ModelNode &node1, const ModelNode &node2)> LessThan; +using LessThan = std::function<bool (const ModelNode &, const ModelNode&)>; bool compareByX(const ModelNode &node1, const ModelNode &node2) { @@ -588,9 +588,9 @@ static QString toUpper(const QString signal) static void addSignal(const QString &typeName, const QString &itemId, const QString &signalName, bool isRootModelNode) { QScopedPointer<Model> model(Model::create("Item", 2, 0)); - RewriterView rewriterView(RewriterView::Amend, 0); + RewriterView rewriterView(RewriterView::Amend, nullptr); - TextEditor::TextEditorWidget *textEdit = qobject_cast<TextEditor::TextEditorWidget*> + auto textEdit = qobject_cast<TextEditor::TextEditorWidget*> (Core::EditorManager::currentEditor()->widget()); BaseTextEditModifier modifier(textEdit); @@ -699,7 +699,7 @@ void addSignalHandlerOrGotoImplementation(const SelectionContext &selectionState Core::EditorManager::openEditorAt(usages.constFirst().path, usages.constFirst().line, usages.constFirst().col); if (!signalNames.isEmpty()) { - AddSignalHandlerDialog *dialog = new AddSignalHandlerDialog(Core::ICore::dialogParent()); + auto dialog = new AddSignalHandlerDialog(Core::ICore::dialogParent()); dialog->setSignals(signalNames); AddSignalHandlerDialog::connect(dialog, &AddSignalHandlerDialog::signalSelected, [=] { diff --git a/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp b/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp index b0aae5d911..e18a472241 100644 --- a/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp +++ b/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp @@ -71,7 +71,7 @@ void ZoomAction::setZoomLevel(double zoomLevel) QWidget *ZoomAction::createWidget(QWidget *parent) { - QComboBox *comboBox = new QComboBox(parent); + auto comboBox = new QComboBox(parent); if (m_comboBoxModel.isNull()) { m_comboBoxModel = comboBox->model(); diff --git a/src/plugins/qmldesigner/components/debugview/debugview.cpp b/src/plugins/qmldesigner/components/debugview/debugview.cpp index 59afd1172f..60f4fc6283 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.cpp +++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp @@ -298,7 +298,7 @@ void DebugView::rewriterEndTransaction() WidgetInfo DebugView::widgetInfo() { - return createWidgetInfo(m_debugViewWidget.data(), 0, QStringLiteral("DebugView"), WidgetInfo::LeftPane, 0, tr("Debug View")); + return createWidgetInfo(m_debugViewWidget.data(), nullptr, QStringLiteral("DebugView"), WidgetInfo::LeftPane, 0, tr("Debug View")); } bool DebugView::hasWidget() const @@ -316,7 +316,7 @@ void DebugView::instancePropertyChanged(const QList<QPair<ModelNode, PropertyNam QString string; message.setString(&string); - typedef QPair<ModelNode, PropertyName> Pair; + using Pair = QPair<ModelNode, PropertyName>; foreach (const Pair &pair, propertyList) { message << pair.first; diff --git a/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp b/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp index 05741879d8..61f15a88f5 100644 --- a/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp @@ -30,7 +30,7 @@ namespace QmlDesigner { AbstractCustomTool::AbstractCustomTool() - : AbstractFormEditorTool(0) + : AbstractFormEditorTool(nullptr) { } diff --git a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp index e4f76d5858..a76406dd31 100644 --- a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp @@ -42,11 +42,7 @@ AbstractFormEditorTool::AbstractFormEditorTool(FormEditorView *editorView) : m_v { } - -AbstractFormEditorTool::~AbstractFormEditorTool() -{ - -} +AbstractFormEditorTool::~AbstractFormEditorTool() = default; FormEditorView* AbstractFormEditorTool::view() const { @@ -79,7 +75,7 @@ QList<FormEditorItem *> AbstractFormEditorTool::toFormEditorItemList(const QList QList<FormEditorItem *> formEditorItemList; foreach (QGraphicsItem *graphicsItem, itemList) { - FormEditorItem *formEditorItem = qgraphicsitem_cast<FormEditorItem*>(graphicsItem); + auto formEditorItem = qgraphicsitem_cast<FormEditorItem*>(graphicsItem); if (formEditorItem) formEditorItemList.append(formEditorItem); } @@ -90,13 +86,13 @@ QList<FormEditorItem *> AbstractFormEditorTool::toFormEditorItemList(const QList bool AbstractFormEditorTool::topItemIsMovable(const QList<QGraphicsItem*> & itemList) { QGraphicsItem *firstSelectableItem = topMovableGraphicsItem(itemList); - if (firstSelectableItem == 0) + if (firstSelectableItem == nullptr) return false; FormEditorItem *formEditorItem = FormEditorItem::fromQGraphicsItem(firstSelectableItem); QList<ModelNode> selectedNodes = view()->selectedModelNodes(); - if (formEditorItem != 0 + if (formEditorItem != nullptr && selectedNodes.contains(formEditorItem->qmlItemNode())) return true; @@ -170,7 +166,7 @@ QGraphicsItem *AbstractFormEditorTool::topMovableGraphicsItem(const QList<QGraph return item; } - return 0; + return nullptr; } FormEditorItem *AbstractFormEditorTool::topMovableFormEditorItem(const QList<QGraphicsItem*> &itemList, bool selectOnlyContentItems) @@ -186,12 +182,12 @@ FormEditorItem *AbstractFormEditorTool::topMovableFormEditorItem(const QList<QGr return formEditorItem; } - return 0; + return nullptr; } FormEditorItem* AbstractFormEditorTool::nearestFormEditorItem(const QPointF &point, const QList<QGraphicsItem*> & itemList) { - FormEditorItem* nearestItem = 0; + FormEditorItem* nearestItem = nullptr; foreach (QGraphicsItem *item, itemList) { FormEditorItem *formEditorItem = FormEditorItem::fromQGraphicsItem(item); @@ -345,7 +341,7 @@ FormEditorItem *AbstractFormEditorTool::containerFormEditorItem(const QList<QGra return formEditorItem; } - return 0; + return nullptr; } void AbstractFormEditorTool::clear() diff --git a/src/plugins/qmldesigner/components/formeditor/anchorindicator.cpp b/src/plugins/qmldesigner/components/formeditor/anchorindicator.cpp index 6cd4be56f8..81bd86e1f6 100644 --- a/src/plugins/qmldesigner/components/formeditor/anchorindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/anchorindicator.cpp @@ -37,9 +37,7 @@ AnchorIndicator::AnchorIndicator(LayerItem *layerItem) { } -AnchorIndicator::AnchorIndicator() -{ -} +AnchorIndicator::AnchorIndicator() = default; AnchorIndicator::~AnchorIndicator() { diff --git a/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp b/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp index f763aa9b5a..356fbf4f32 100644 --- a/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp +++ b/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp @@ -55,7 +55,7 @@ QIcon iconForColor(const QColor &color) { QWidget *BackgroundAction::createWidget(QWidget *parent) { - QComboBox *comboBox = new QComboBox(parent); + auto comboBox = new QComboBox(parent); comboBox->setFixedWidth(42); for (int i = 0; i < colors().count(); ++i) { diff --git a/src/plugins/qmldesigner/components/formeditor/bindingindicator.cpp b/src/plugins/qmldesigner/components/formeditor/bindingindicator.cpp index 766458ec59..709f197d5b 100644 --- a/src/plugins/qmldesigner/components/formeditor/bindingindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/bindingindicator.cpp @@ -36,9 +36,7 @@ BindingIndicator::BindingIndicator(LayerItem *layerItem) { } -BindingIndicator::BindingIndicator() -{ -} +BindingIndicator::BindingIndicator() = default; BindingIndicator::~BindingIndicator() { diff --git a/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp b/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp index ef24dea8a3..26c1390217 100644 --- a/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp @@ -37,9 +37,7 @@ ContentNotEditableIndicator::ContentNotEditableIndicator(LayerItem *layerItem) } -ContentNotEditableIndicator::ContentNotEditableIndicator() -{ -} +ContentNotEditableIndicator::ContentNotEditableIndicator() = default; ContentNotEditableIndicator::~ContentNotEditableIndicator() { @@ -92,7 +90,7 @@ void ContentNotEditableIndicator::addAddiationEntries(const QList<FormEditorItem if (modelNode.metaInfo().isValid() && modelNode.metaInfo().isSubclassOf("QtQuick.Loader")) { if (!m_entryList.contains(EntryPair(formEditorItem, 0))) { - QGraphicsRectItem *indicatorShape = new QGraphicsRectItem(m_layerItem); + auto indicatorShape = new QGraphicsRectItem(m_layerItem); QPen linePen; linePen.setCosmetic(true); linePen.setColor(QColor(0xa0, 0xa0, 0xa0)); diff --git a/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.h b/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.h index beb57fae4d..c07f86b625 100644 --- a/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.h +++ b/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.h @@ -35,7 +35,7 @@ namespace QmlDesigner { class ContentNotEditableIndicator { public: - typedef QPair<FormEditorItem*, QGraphicsRectItem *> EntryPair; + using EntryPair = QPair<FormEditorItem*, QGraphicsRectItem *>; ContentNotEditableIndicator(LayerItem *layerItem); ContentNotEditableIndicator(); diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index 64c10e06a3..2629250ee7 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -52,10 +52,7 @@ DragTool::DragTool(FormEditorView *editorView) { } - -DragTool::~DragTool() -{ -} +DragTool::~DragTool() = default; void DragTool::clear() { diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp index c51918047e..dfb5cdd956 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp @@ -67,7 +67,7 @@ bool FormEditorGraphicsView::eventFilter(QObject *watched, QEvent *event) stopPanning(event); } if (event->type() == QEvent::MouseMove) { - QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event); + auto mouseEvent = static_cast<QMouseEvent*>(event); if (!m_panningStartPosition.isNull()) { horizontalScrollBar()->setValue(horizontalScrollBar()->value() - (mouseEvent->x() - m_panningStartPosition.x())); @@ -112,8 +112,8 @@ void FormEditorGraphicsView::mouseReleaseEvent(QMouseEvent *event) bool isTextInputItem(QGraphicsItem* item) { if (item && item->isWidget()) { - QGraphicsWidget *graphicsWidget = static_cast<QGraphicsWidget *>(item); - QGraphicsProxyWidget * textInputProxyWidget = qobject_cast<QGraphicsProxyWidget *>(graphicsWidget); + auto graphicsWidget = static_cast<QGraphicsWidget *>(item); + auto textInputProxyWidget = qobject_cast<QGraphicsProxyWidget *>(graphicsWidget); if (textInputProxyWidget && textInputProxyWidget->widget() && ( strcmp(textInputProxyWidget->widget()->metaObject()->className(), "QLineEdit") == 0 || strcmp(textInputProxyWidget->widget()->metaObject()->className(), "QTextEdit") == 0)) { diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp index c8e7ed1fa2..045aec9007 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp @@ -86,7 +86,7 @@ void FormEditorScene::resetScene() FormEditorItem* FormEditorScene::itemForQmlItemNode(const QmlItemNode &qmlItemNode) const { - QTC_ASSERT(qmlItemNode.isValid(), return 0); + QTC_ASSERT(qmlItemNode.isValid(), return nullptr); return m_qmlItemNodeItemHash.value(qmlItemNode); } @@ -140,7 +140,7 @@ FormEditorItem* FormEditorScene::calulateNewParent(FormEditorItem *formEditorIte } } - return 0; + return nullptr; } void FormEditorScene::synchronizeTransformation(FormEditorItem *item) @@ -182,7 +182,7 @@ void FormEditorScene::synchronizeOtherProperty(FormEditorItem *item, const QByte FormEditorItem *FormEditorScene::addFormEditorItem(const QmlItemNode &qmlItemNode) { - FormEditorItem *formEditorItem = new FormEditorItem(qmlItemNode, this); + auto formEditorItem = new FormEditorItem(qmlItemNode, this); Q_ASSERT(!m_qmlItemNodeItemHash.contains(qmlItemNode)); m_qmlItemNodeItemHash.insert(qmlItemNode, formEditorItem); @@ -382,7 +382,7 @@ void FormEditorScene::hoverLeaveEvent(QGraphicsSceneHoverEvent * /*event*/) void FormEditorScene::reparentItem(const QmlItemNode &node, const QmlItemNode &newParent) { if (FormEditorItem *item = itemForQmlItemNode(node)) { - item->setParentItem(0); + item->setParentItem(nullptr); if (newParent.isValid()) { if (FormEditorItem *parentItem = itemForQmlItemNode(newParent)) item->setParentItem(parentItem); @@ -407,7 +407,7 @@ void FormEditorScene::clearFormEditorItems() const QList<FormEditorItem*> formEditorItems = Utils::filtered(formEditorItemsTransformed, [](FormEditorItem *item) { return item; }); foreach (FormEditorItem *item, formEditorItems) - item->setParentItem(0); + item->setParentItem(nullptr); foreach (FormEditorItem *item, formEditorItems) delete item; diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index cd19255683..5330c34052 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -155,7 +155,7 @@ void FormEditorView::createFormEditorWidget() m_currentTool = m_selectionTool.get(); - Internal::FormEditorContext *formEditorContext = new Internal::FormEditorContext(m_formEditorWidget.data()); + auto formEditorContext = new Internal::FormEditorContext(m_formEditorWidget.data()); Core::ICore::addContextObject(formEditorContext); connect(formEditorWidget()->zoomAction(), &ZoomAction::zoomLevelChanged, [this]() { @@ -168,7 +168,7 @@ void FormEditorView::createFormEditorWidget() void FormEditorView::temporaryBlockView() { formEditorWidget()->graphicsView()->setUpdatesEnabled(false); - static QTimer *timer = new QTimer(qApp); + static auto timer = new QTimer(qApp); timer->setSingleShot(true); timer->start(1000); @@ -277,7 +277,7 @@ WidgetInfo FormEditorView::widgetInfo() if (!m_formEditorWidget) createFormEditorWidget(); - return createWidgetInfo(m_formEditorWidget.data(), 0, "FormEditor", WidgetInfo::CentralPane, 0, tr("Form Editor"), DesignerWidgetFlags::IgnoreErrors); + return createWidgetInfo(m_formEditorWidget.data(), nullptr, "FormEditor", WidgetInfo::CentralPane, 0, tr("Form Editor"), DesignerWidgetFlags::IgnoreErrors); } FormEditorWidget *FormEditorView::formEditorWidget() @@ -395,7 +395,7 @@ void FormEditorView::changeToCustomTool() { if (hasSelectedModelNodes()) { int handlingRank = 0; - AbstractCustomTool *selectedCustomTool = 0; + AbstractCustomTool *selectedCustomTool = nullptr; const ModelNode selectedModelNode = selectedModelNodes().constFirst(); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index 059261c3a2..4bc952dd8c 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -61,7 +61,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) { setStyleSheet(Theme::replaceCssColors(QString::fromUtf8(Utils::FileReader::fetchQrc(QLatin1String(":/qmldesigner/formeditorstylesheet.css"))))); - QVBoxLayout *fillLayout = new QVBoxLayout(this); + auto fillLayout = new QVBoxLayout(this); fillLayout->setMargin(0); fillLayout->setSpacing(0); setLayout(fillLayout); @@ -70,7 +70,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) m_toolActionGroup = new QActionGroup(this); - QActionGroup *layoutActionGroup = new QActionGroup(this); + auto layoutActionGroup = new QActionGroup(this); layoutActionGroup->setExclusive(true); m_noSnappingAction = layoutActionGroup->addAction(tr("No snapping (T).")); @@ -98,7 +98,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) addActions(layoutActionGroup->actions()); upperActions.append(layoutActionGroup->actions()); - QAction *separatorAction = new QAction(this); + auto separatorAction = new QAction(this); separatorAction->setSeparator(true); addAction(separatorAction); upperActions.append(separatorAction); diff --git a/src/plugins/qmldesigner/components/formeditor/layeritem.cpp b/src/plugins/qmldesigner/components/formeditor/layeritem.cpp index 77b6b37a5a..fc56379f31 100644 --- a/src/plugins/qmldesigner/components/formeditor/layeritem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/layeritem.cpp @@ -39,9 +39,7 @@ LayerItem::LayerItem(FormEditorScene* scene) setAcceptedMouseButtons(Qt::NoButton); } -LayerItem::~LayerItem() -{ -} +LayerItem::~LayerItem() = default; void LayerItem::paint(QPainter * /*painter*/, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/) { diff --git a/src/plugins/qmldesigner/components/formeditor/lineeditaction.cpp b/src/plugins/qmldesigner/components/formeditor/lineeditaction.cpp index 4e07f3519e..5f9e7f571b 100644 --- a/src/plugins/qmldesigner/components/formeditor/lineeditaction.cpp +++ b/src/plugins/qmldesigner/components/formeditor/lineeditaction.cpp @@ -48,7 +48,7 @@ void LineEditAction::clearLineEditText() QWidget *LineEditAction::createWidget(QWidget *parent) { - QLineEdit *lineEdit = new QLineEdit(parent); + auto lineEdit = new QLineEdit(parent); lineEdit->setPlaceholderText(m_placeHolderText); lineEdit->setFixedWidth(100); diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.cpp b/src/plugins/qmldesigner/components/formeditor/movetool.cpp index 4b6a21694b..75bce105a4 100644 --- a/src/plugins/qmldesigner/components/formeditor/movetool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/movetool.cpp @@ -51,10 +51,7 @@ MoveTool::MoveTool(FormEditorView *editorView) m_selectionIndicator.setCursor(Qt::SizeAllCursor); } -MoveTool::~MoveTool() -{ - -} +MoveTool::~MoveTool() = default; void MoveTool::clear() { @@ -316,7 +313,7 @@ bool MoveTool::isAncestorOfAllItems(FormEditorItem* maybeAncestorItem, FormEditorItem* MoveTool::ancestorIfOtherItemsAreChild(const QList<FormEditorItem*> &itemList) { if (itemList.isEmpty()) - return 0; + return nullptr; foreach (FormEditorItem* item, itemList) @@ -325,7 +322,7 @@ FormEditorItem* MoveTool::ancestorIfOtherItemsAreChild(const QList<FormEditorIte return item; } - return 0; + return nullptr; } void MoveTool::updateMoveManipulator() @@ -369,13 +366,13 @@ QList<FormEditorItem*> MoveTool::movingItems(const QList<FormEditorItem*> &selec FormEditorItem* ancestorItem = ancestorIfOtherItemsAreChild(filteredItemList); - if (ancestorItem != 0 && ancestorItem->qmlItemNode().isRootNode()) { + if (ancestorItem != nullptr && ancestorItem->qmlItemNode().isRootNode()) { // view()->changeToSelectionTool(); return QList<FormEditorItem*>(); } - if (ancestorItem != 0 && ancestorItem->parentItem() != 0) { + if (ancestorItem != nullptr && ancestorItem->parentItem() != nullptr) { QList<FormEditorItem*> ancestorItemList; ancestorItemList.append(ancestorItem); return ancestorItemList; diff --git a/src/plugins/qmldesigner/components/formeditor/numberseriesaction.cpp b/src/plugins/qmldesigner/components/formeditor/numberseriesaction.cpp index ae651f99f1..0ce0a995ba 100644 --- a/src/plugins/qmldesigner/components/formeditor/numberseriesaction.cpp +++ b/src/plugins/qmldesigner/components/formeditor/numberseriesaction.cpp @@ -42,7 +42,7 @@ void NumberSeriesAction::addEntry(const QString &text, const QVariant &value) if (m_comboBoxModel.isNull()) m_comboBoxModel = new QStandardItemModel(this); - QStandardItem *newItem = new QStandardItem(text); + auto newItem = new QStandardItem(text); newItem->setData(value); m_comboBoxModel->appendRow(newItem); } @@ -54,7 +54,7 @@ QVariant NumberSeriesAction::currentValue() const QWidget *NumberSeriesAction::createWidget(QWidget *parent) { - QComboBox *comboBox = new QComboBox(parent); + auto comboBox = new QComboBox(parent); comboBox->setModel(m_comboBoxModel.data()); diff --git a/src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp b/src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp index 63930defed..7e026fcd68 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp @@ -58,30 +58,19 @@ public: ResizeControllerData::ResizeControllerData(LayerItem *layerItem, FormEditorItem *formEditorItem) : layerItem(layerItem), formEditorItem(formEditorItem), - topLeftItem(0), - topRightItem(0), - bottomLeftItem(0), - bottomRightItem(0), - topItem(0), - leftItem(0), - rightItem(0), - bottomItem(0) + topLeftItem(nullptr), + topRightItem(nullptr), + bottomLeftItem(nullptr), + bottomRightItem(nullptr), + topItem(nullptr), + leftItem(nullptr), + rightItem(nullptr), + bottomItem(nullptr) { } -ResizeControllerData::ResizeControllerData(const ResizeControllerData &other) - : layerItem(other.layerItem), - formEditorItem(other.formEditorItem), - topLeftItem(other.topLeftItem), - topRightItem(other.topRightItem), - bottomLeftItem(other.bottomLeftItem), - bottomRightItem(other.bottomRightItem), - topItem(other.topItem), - leftItem(other.leftItem), - rightItem(other.rightItem), - bottomItem(other.bottomItem) -{} +ResizeControllerData::ResizeControllerData(const ResizeControllerData &other) = default; ResizeControllerData::~ResizeControllerData() { @@ -100,7 +89,7 @@ ResizeControllerData::~ResizeControllerData() ResizeController::ResizeController() - : m_data(new ResizeControllerData(0, 0)) + : m_data(new ResizeControllerData(nullptr, nullptr)) { } @@ -149,20 +138,14 @@ ResizeController::ResizeController(LayerItem *layerItem, FormEditorItem *formEdi updatePosition(); } -ResizeController::ResizeController(const ResizeController &other) - : m_data(other.m_data) -{ - -} +ResizeController::ResizeController(const ResizeController &other) = default; ResizeController::ResizeController(const WeakResizeController &resizeController) : m_data(resizeController.m_data.toStrongRef()) { } -ResizeController::~ResizeController() -{ -} +ResizeController::~ResizeController() = default; ResizeController &ResizeController::operator =(const ResizeController &other) { @@ -310,24 +293,16 @@ WeakResizeController ResizeController::toWeakResizeController() const return WeakResizeController(*this); } -WeakResizeController::WeakResizeController() -{ - -} +WeakResizeController::WeakResizeController() = default; -WeakResizeController::WeakResizeController(const WeakResizeController &resizeController) - : m_data(resizeController.m_data) -{ -} +WeakResizeController::WeakResizeController(const WeakResizeController &resizeController) = default; WeakResizeController::WeakResizeController(const ResizeController &resizeController) : m_data(resizeController.m_data.toWeakRef()) { } -WeakResizeController::~WeakResizeController() -{ -} +WeakResizeController::~WeakResizeController() = default; WeakResizeController &WeakResizeController::operator =(const WeakResizeController &other) { diff --git a/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp b/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp index d40e4067f9..bc17616f6a 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp @@ -38,9 +38,7 @@ ResizeHandleItem::ResizeHandleItem(QGraphicsItem *parent, const ResizeController setAcceptedMouseButtons(Qt::NoButton); } -ResizeHandleItem::~ResizeHandleItem() -{ -} +ResizeHandleItem::~ResizeHandleItem() = default; void ResizeHandleItem::setHandlePosition(const QPointF & globalPosition, const QPointF & itemSpacePosition) { diff --git a/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp index d5f197997f..2c21e1952c 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp @@ -42,7 +42,7 @@ ResizeManipulator::ResizeManipulator(LayerItem *layerItem, FormEditorView *view) m_beginRightMargin(0.0), m_beginBottomMargin(0.0), m_layerItem(layerItem), - m_resizeHandle(0), + m_resizeHandle(nullptr), m_isActive(false) { } @@ -65,7 +65,7 @@ void ResizeManipulator::setHandle(ResizeHandleItem *resizeHandle) void ResizeManipulator::removeHandle() { m_resizeController = ResizeController(); - m_resizeHandle = 0; + m_resizeHandle = nullptr; } void ResizeManipulator::begin(const QPointF &/*beginPoint*/) diff --git a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp index 96b960867c..8b4e5c552a 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp @@ -46,10 +46,7 @@ ResizeTool::ResizeTool(FormEditorView *editorView) { } - -ResizeTool::~ResizeTool() -{ -} +ResizeTool::~ResizeTool() = default; void ResizeTool::mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) diff --git a/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp index b2969ed810..05d13e29e7 100644 --- a/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp @@ -32,7 +32,7 @@ namespace QmlDesigner { RubberBandSelectionManipulator::RubberBandSelectionManipulator(LayerItem *layerItem, FormEditorView *editorView) : m_selectionRectangleElement(layerItem), m_editorView(editorView), - m_beginFormEditorItem(0), + m_beginFormEditorItem(nullptr), m_isActive(false) { m_selectionRectangleElement.hide(); diff --git a/src/plugins/qmldesigner/components/formeditor/scalemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/scalemanipulator.cpp index 7dd8077c92..4cfd9ca35b 100644 --- a/src/plugins/qmldesigner/components/formeditor/scalemanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/scalemanipulator.cpp @@ -34,8 +34,6 @@ ScaleManipulator::ScaleManipulator(LayerItem *layerItem, FormEditorItem *formEdi { } -ScaleManipulator::~ScaleManipulator() -{ -} +ScaleManipulator::~ScaleManipulator() = default; } diff --git a/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp b/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp index d76e51977c..73f0032b64 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp @@ -98,7 +98,7 @@ void SelectionIndicator::setItems(const QList<FormEditorItem*> &itemList) if (!item->qmlItemNode().isValid()) continue; - QGraphicsPolygonItem *newSelectionIndicatorGraphicsItem = new QGraphicsPolygonItem(m_layerItem.data()); + auto newSelectionIndicatorGraphicsItem = new QGraphicsPolygonItem(m_layerItem.data()); m_indicatorShapeHash.insert(item, newSelectionIndicatorGraphicsItem); newSelectionIndicatorGraphicsItem->setPolygon(boundingRectInLayerItemSpaceForItem(item, m_layerItem.data())); newSelectionIndicatorGraphicsItem->setFlag(QGraphicsItem::ItemIsSelectable, false); diff --git a/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp b/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp index 9aa2aaea3f..e74f43c4f7 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp +++ b/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp @@ -64,7 +64,7 @@ void SelectionRectangle::show() void SelectionRectangle::hide() { - m_controlShape->setParentItem(0); + m_controlShape->setParentItem(nullptr); m_controlShape->hide(); } diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp index 52bcae4ff5..c9dd841157 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp @@ -54,10 +54,7 @@ SelectionTool::SelectionTool(FormEditorView *editorView) m_selectionIndicator.setCursor(Qt::ArrowCursor); } - -SelectionTool::~SelectionTool() -{ -} +SelectionTool::~SelectionTool() = default; void SelectionTool::mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) diff --git a/src/plugins/qmldesigner/components/formeditor/snapper.cpp b/src/plugins/qmldesigner/components/formeditor/snapper.cpp index 4cf2209774..f62ddf85e3 100644 --- a/src/plugins/qmldesigner/components/formeditor/snapper.cpp +++ b/src/plugins/qmldesigner/components/formeditor/snapper.cpp @@ -38,8 +38,8 @@ namespace QmlDesigner { Snapper::Snapper() - : m_containerFormEditorItem(0), - m_transformtionSpaceFormEditorItem(0), + : m_containerFormEditorItem(nullptr), + m_transformtionSpaceFormEditorItem(nullptr), m_snappingDistance(5.0) { } @@ -321,7 +321,7 @@ QList<QLineF> Snapper::findSnappingLines(const SnapLineMap &snappingLineMap, lowerLimit, upperLimit, snappingLineIterator.value().first); - if (boundingRects != 0) + if (boundingRects != nullptr) boundingRects->append(snappingLineIterator.value().first); } } @@ -363,7 +363,7 @@ QList<QLineF> Snapper::findSnappingOffsetLines(const SnapLineMap &snappingOffset lowerLimit, upperLimit, formEditorItemRect); - if (boundingRects != 0) + if (boundingRects != nullptr) boundingRects->append(snappingOffsetIterator.value().first); } } @@ -715,7 +715,7 @@ QList<QGraphicsItem*> Snapper::generateSnappingLines(const QList<QRectF> &boundi foreach (const QLineF &line, lineList) { QLineF lineInTransformationSpace = transform.map(line); - QGraphicsLineItem * lineItem = new QGraphicsLineItem(lineInTransformationSpace, layerItem); + auto lineItem = new QGraphicsLineItem(lineInTransformationSpace, layerItem); lineItem->setZValue(40); QPen linePen; linePen.setCosmetic(true); diff --git a/src/plugins/qmldesigner/components/formeditor/snappinglinecreator.h b/src/plugins/qmldesigner/components/formeditor/snappinglinecreator.h index fb7d43e26c..aba0a52444 100644 --- a/src/plugins/qmldesigner/components/formeditor/snappinglinecreator.h +++ b/src/plugins/qmldesigner/components/formeditor/snappinglinecreator.h @@ -31,8 +31,8 @@ namespace QmlDesigner { class FormEditorItem; -typedef QMultiMap<double, QPair<QRectF, FormEditorItem*> > SnapLineMap; -typedef QMapIterator<double, QPair<QRectF, FormEditorItem*> > SnapLineMapIterator; +using SnapLineMap = QMultiMap<double, QPair<QRectF, FormEditorItem*> >; +using SnapLineMapIterator = QMapIterator<double, QPair<QRectF, FormEditorItem*> >; class FormEditorItem; diff --git a/src/plugins/qmldesigner/components/formeditor/toolbox.cpp b/src/plugins/qmldesigner/components/formeditor/toolbox.cpp index 9b343ec7d7..3c64139748 100644 --- a/src/plugins/qmldesigner/components/formeditor/toolbox.cpp +++ b/src/plugins/qmldesigner/components/formeditor/toolbox.cpp @@ -42,11 +42,11 @@ ToolBox::ToolBox(QWidget *parentWidget) m_leftToolBar->setMovable(true); m_leftToolBar->setOrientation(Qt::Horizontal); - QHBoxLayout *horizontalLayout = new QHBoxLayout(this); + auto horizontalLayout = new QHBoxLayout(this); horizontalLayout->setMargin(0); horizontalLayout->setSpacing(0); - QToolBar *stretchToolbar = new QToolBar(this); + auto stretchToolbar = new QToolBar(this); m_leftToolBar->setProperty("panelwidget", true); m_leftToolBar->setProperty("panelwidget_singlerow", false); diff --git a/src/plugins/qmldesigner/components/importmanager/importlabel.cpp b/src/plugins/qmldesigner/components/importmanager/importlabel.cpp index d0e61d3702..cd19246009 100644 --- a/src/plugins/qmldesigner/components/importmanager/importlabel.cpp +++ b/src/plugins/qmldesigner/components/importmanager/importlabel.cpp @@ -35,7 +35,7 @@ namespace QmlDesigner { ImportLabel::ImportLabel(QWidget *parent) : QWidget(parent) { - QHBoxLayout *layout = new QHBoxLayout(this); + auto layout = new QHBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); diff --git a/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp b/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp index 94b1277a1c..6e1c6a5015 100644 --- a/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp +++ b/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp @@ -33,15 +33,12 @@ namespace QmlDesigner { ImportManagerView::ImportManagerView(QObject *parent) : AbstractView(parent), - m_importsWidget(0) + m_importsWidget(nullptr) { } -ImportManagerView::~ImportManagerView() -{ - -} +ImportManagerView::~ImportManagerView() = default; bool ImportManagerView::hasWidget() const { @@ -50,7 +47,7 @@ bool ImportManagerView::hasWidget() const WidgetInfo ImportManagerView::widgetInfo() { - if (m_importsWidget == 0) { + if (m_importsWidget == nullptr) { m_importsWidget = new ImportsWidget; connect(m_importsWidget.data(), &ImportsWidget::removeImport, this, &ImportManagerView::removeImport); connect(m_importsWidget.data(), &ImportsWidget::addImport, this, &ImportManagerView::addImport); @@ -59,7 +56,7 @@ WidgetInfo ImportManagerView::widgetInfo() m_importsWidget->setImports(model()->imports()); } - return createWidgetInfo(m_importsWidget, 0, QLatin1String("ImportManager"), WidgetInfo::LeftPane, 1); + return createWidgetInfo(m_importsWidget, nullptr, QLatin1String("ImportManager"), WidgetInfo::LeftPane, 1); } void ImportManagerView::modelAttached(Model *model) diff --git a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp index f9fe8540a1..0d2218a42b 100644 --- a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp +++ b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp @@ -124,7 +124,7 @@ void ImportsWidget::setImports(const QList<Import> &imports) Utils::sort(sortedImports, importLess); foreach (const Import &import, sortedImports) { - ImportLabel *importLabel = new ImportLabel(this); + auto importLabel = new ImportLabel(this); importLabel->setImport(import); m_importLabels.append(importLabel); connect(importLabel, &ImportLabel::removeImport, this, &ImportsWidget::removeImport); @@ -138,7 +138,7 @@ void ImportsWidget::updateLayout() { delete layout(); - QVBoxLayout *layout = new QVBoxLayout(this); + auto layout = new QVBoxLayout(this); layout->setSpacing(0); layout->addWidget(m_addImportComboBox); diff --git a/src/plugins/qmldesigner/components/integration/componentaction.cpp b/src/plugins/qmldesigner/components/integration/componentaction.cpp index 59226d78d3..daedbe8d7d 100644 --- a/src/plugins/qmldesigner/components/integration/componentaction.cpp +++ b/src/plugins/qmldesigner/components/integration/componentaction.cpp @@ -48,7 +48,7 @@ void ComponentAction::setCurrentIndex(int index) QWidget *ComponentAction::createWidget(QWidget *parent) { - QComboBox *comboBox = new QComboBox(parent); + auto comboBox = new QComboBox(parent); comboBox->setMinimumWidth(120); comboBox->setToolTip(tr("Edit sub components defined in this file.")); comboBox->setModel(m_componentView->standardItemModel()); diff --git a/src/plugins/qmldesigner/components/integration/componentview.cpp b/src/plugins/qmldesigner/components/integration/componentview.cpp index e31b59d911..06aa47c7a5 100644 --- a/src/plugins/qmldesigner/components/integration/componentview.cpp +++ b/src/plugins/qmldesigner/components/integration/componentview.cpp @@ -203,7 +203,7 @@ void ComponentView::searchForComponentAndAddToList(const ModelNode &node) if (!hasEntryForNode(node)) { QString description = descriptionForNode(node); - QStandardItem *item = new QStandardItem(description); + auto item = new QStandardItem(description); item->setData(QVariant::fromValue(node.internalId()), ModelNodeRole); item->setEditable(false); removeSingleNodeFromList(node); //remove node if already present diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index d4fd3b0147..01ede20d09 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -77,13 +77,11 @@ DesignDocument::DesignDocument(QObject *parent) : m_subComponentManager(new SubComponentManager(m_documentModel.data(), this)), m_rewriterView (new RewriterView(RewriterView::Amend, m_documentModel.data())), m_documentLoaded(false), - m_currentKit(0) + m_currentKit(nullptr) { } -DesignDocument::~DesignDocument() -{ -} +DesignDocument::~DesignDocument() = default; Model *DesignDocument::currentModel() const { @@ -590,7 +588,7 @@ QPlainTextEdit *DesignDocument::plainTextEdit() const if (editor()) return qobject_cast<QPlainTextEdit*>(editor()->widget()); - return 0; + return nullptr; } ModelNode DesignDocument::rootModelNode() const @@ -622,7 +620,7 @@ static inline Kit *getActiveKit(DesignDocument *designDocument) currentProject = ProjectExplorer::ProjectTree::currentProject(); if (!currentProject) - return 0; + return nullptr; QObject::connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged, @@ -641,10 +639,10 @@ static inline Kit *getActiveKit(DesignDocument *designDocument) Target *target = currentProject->activeTarget(); if (!target) - return 0; + return nullptr; if (!target->kit() || !target->kit()->isValid()) - return 0; + return nullptr; QObject::connect(target, &Target::kitChanged, designDocument, &DesignDocument::updateActiveQtVersion, Qt::UniqueConnection); diff --git a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp index ef4e900d0f..1e3ce5c795 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp @@ -49,9 +49,7 @@ DesignDocumentView::DesignDocumentView(QObject *parent) { } -DesignDocumentView::~DesignDocumentView() -{ -} +DesignDocumentView::~DesignDocumentView() = default; ModelNode DesignDocumentView::insertModel(const ModelNode &modelNode) { @@ -81,7 +79,7 @@ void DesignDocumentView::toClipboard() const { QClipboard *clipboard = QApplication::clipboard(); - QMimeData *data = new QMimeData; + auto data = new QMimeData; data->setText(toText()); QStringList imports; @@ -121,7 +119,7 @@ QString DesignDocumentView::toText() const textEdit.setPlainText(imports + QStringLiteral("Item {\n}\n")); NotIndentingTextEditModifier modifier(&textEdit); - QScopedPointer<RewriterView> rewriterView(new RewriterView(RewriterView::Amend, 0)); + QScopedPointer<RewriterView> rewriterView(new RewriterView(RewriterView::Amend, nullptr)); rewriterView->setCheckSemanticErrors(false); rewriterView->setTextModifier(&modifier); outputModel->setRewriterView(rewriterView.data()); @@ -149,7 +147,7 @@ void DesignDocumentView::fromText(QString text) textEdit.setPlainText(imports + text); NotIndentingTextEditModifier modifier(&textEdit); - QScopedPointer<RewriterView> rewriterView(new RewriterView(RewriterView::Amend, 0)); + QScopedPointer<RewriterView> rewriterView(new RewriterView(RewriterView::Amend, nullptr)); rewriterView->setCheckSemanticErrors(false); rewriterView->setTextModifier(&modifier); inputModel->setRewriterView(rewriterView.data()); @@ -172,7 +170,7 @@ static Model *currentModel() if (document) return document->currentModel(); - return 0; + return nullptr; } Model *DesignDocumentView::pasteToModel() diff --git a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp index d74aeaebbb..a1921f493d 100644 --- a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp +++ b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp @@ -35,9 +35,7 @@ UtilityPanelController::UtilityPanelController(QObject* parent): { } -UtilityPanelController::~UtilityPanelController() -{ -} +UtilityPanelController::~UtilityPanelController() = default; QWidget* UtilityPanelController::widget() { diff --git a/src/plugins/qmldesigner/components/itemlibrary/customfilesystemmodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/customfilesystemmodel.cpp index 45ff279512..5c5081fd7c 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/customfilesystemmodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/customfilesystemmodel.cpp @@ -41,11 +41,9 @@ namespace QmlDesigner { class ItemLibraryFileIconProvider : public QFileIconProvider { public: - ItemLibraryFileIconProvider() - { - } + ItemLibraryFileIconProvider() = default; - QIcon icon( const QFileInfo & info ) const + QIcon icon( const QFileInfo & info ) const override { QIcon icon; diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp index 827c07e8f4..d67631531c 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp @@ -33,9 +33,7 @@ ItemLibraryItem::ItemLibraryItem(QObject *parent) { } -ItemLibraryItem::~ItemLibraryItem() -{ -} +ItemLibraryItem::~ItemLibraryItem() = default; QString ItemLibraryItem::itemName() const { diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp index 15dec3a6e9..ed36dd4a04 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp @@ -88,11 +88,11 @@ QVariant ItemLibraryModel::data(const QModelIndex &index, int role) const if (m_roleNames.contains(role)) { QVariant value = m_sections.at(index.row())->property(m_roleNames.value(role)); - ItemLibrarySectionModel* model = qobject_cast<ItemLibrarySectionModel *>(value.value<QObject*>()); + auto model = qobject_cast<ItemLibrarySectionModel *>(value.value<QObject*>()); if (model) return QVariant::fromValue(model); - ItemLibraryModel* model2 = qobject_cast<ItemLibraryModel *>(value.value<QObject*>()); + auto model2 = qobject_cast<ItemLibraryModel *>(value.value<QObject*>()); if (model2) return QVariant::fromValue(model2); @@ -192,13 +192,13 @@ void ItemLibraryModel::update(ItemLibraryInfo *itemLibraryInfo, Model *model) qCInfo(itemlibraryPopulate) << "Adding:" << entry.typeName() << "to:" << entry.category(); ItemLibrarySection *sectionModel = sectionByName(itemSectionName); - if (sectionModel == 0) { + if (sectionModel == nullptr) { sectionModel = new ItemLibrarySection(itemSectionName, this); m_sections.append(sectionModel); sectionModel->setSectionExpanded(sectionExapanded(itemSectionName)); } - ItemLibraryItem *item = new ItemLibraryItem(sectionModel); + auto item = new ItemLibraryItem(sectionModel); item->setItemLibraryEntry(entry); sectionModel->addSectionEntry(item); } @@ -212,7 +212,7 @@ void ItemLibraryModel::update(ItemLibraryInfo *itemLibraryInfo, Model *model) QMimeData *ItemLibraryModel::getMimeData(const ItemLibraryEntry &itemLibraryEntry) { - QMimeData *mimeData = new QMimeData(); + auto mimeData = new QMimeData(); QByteArray data; QDataStream stream(&data, QIODevice::WriteOnly); @@ -248,7 +248,7 @@ ItemLibrarySection *ItemLibraryModel::sectionByName(const QString §ionName) return itemLibrarySection; } - return 0; + return nullptr; } void ItemLibraryModel::updateVisibility(bool *changed) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryresourceview.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryresourceview.cpp index 2296d30851..abc70621c9 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryresourceview.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryresourceview.cpp @@ -46,7 +46,7 @@ namespace QmlDesigner { void ItemLibraryResourceView::addSizeAction(QActionGroup *group, const QString &text, int gridSize, int iconSize) { - QAction *action = new QAction(text, group); + auto action = new QAction(text, group); group->addAction(action); action->setCheckable(true); QAction::connect(action, &QAction::triggered, this, [this, gridSize, iconSize]() { @@ -80,7 +80,7 @@ ItemLibraryResourceView::ItemLibraryResourceView(QWidget *parent) : setContextMenuPolicy(Qt::ActionsContextMenu); - QActionGroup *actionGroup = new QActionGroup(this); + auto actionGroup = new QActionGroup(this); actionGroup->setExclusive(true); addSizeAction(actionGroup, tr("Large Icons"), 256, 192); @@ -113,14 +113,14 @@ void ItemLibraryResourceView::startDrag(Qt::DropActions /* supportedActions */) if (!mimeData) return; - CustomFileSystemModel *fileSystemModel = qobject_cast<CustomFileSystemModel*>(model()); + auto fileSystemModel = qobject_cast<CustomFileSystemModel*>(model()); Q_ASSERT(fileSystemModel); QFileInfo fileInfo = fileSystemModel->fileInfo(selectedIndexes().front()); QPixmap pixmap(fileInfo.absoluteFilePath()); if (!pixmap.isNull()) { - QDrag *drag = new QDrag(this); + auto drag = new QDrag(this); drag->setPixmap(QIcon(pixmap).pixmap(128, 128)); - QMimeData *mimeData = new QMimeData; + auto mimeData = new QMimeData; mimeData->setData(QLatin1String("application/vnd.bauhaus.libraryresource"), fileInfo.absoluteFilePath().toUtf8()); drag->setMimeData(mimeData); drag->exec(); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp index 1ed8d16e1e..c18a486fda 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp @@ -57,7 +57,7 @@ QVariant ItemLibrarySectionModel::data(const QModelIndex &index, int role) const if (m_roleNames.contains(role)) { QVariant value = m_itemList.at(index.row())->property(m_roleNames.value(role)); - if (ItemLibrarySectionModel* model = qobject_cast<ItemLibrarySectionModel *>(value.value<QObject*>())) + if (auto model = qobject_cast<ItemLibrarySectionModel *>(value.value<QObject*>())) return QVariant::fromValue(model); return m_itemList.at(index.row())->property(m_roleNames.value(role)); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp index 02b76df176..34955acd87 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp @@ -39,10 +39,7 @@ ItemLibraryView::ItemLibraryView(QObject* parent) } -ItemLibraryView::~ItemLibraryView() -{ - -} +ItemLibraryView::~ItemLibraryView() = default; bool ItemLibraryView::hasWidget() const { @@ -79,7 +76,7 @@ void ItemLibraryView::modelAboutToBeDetached(Model *model) AbstractView::modelAboutToBeDetached(model); - m_widget->setModel(0); + m_widget->setModel(nullptr); } void ItemLibraryView::importsChanged(const QList<Import> &/*addedImports*/, const QList<Import> &/*removedImports*/) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index 5414554186..889aaa6a36 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -111,7 +111,7 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) : Theme::setupTheme(m_itemViewQuickWidget->engine()); /* other widgets */ - QTabBar *tabBar = new QTabBar(this); + auto tabBar = new QTabBar(this); tabBar->addTab(tr("QML Types", "Title of library QML types view")); tabBar->addTab(tr("Resources", "Title of library resources view")); tabBar->addTab(tr("Imports", "Title of library imports view")); @@ -128,7 +128,7 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) : m_filterLineEdit->setFiltering(true); QWidget *lineEditFrame = new QWidget(this); lineEditFrame->setObjectName(QStringLiteral("itemLibrarySearchInputFrame")); - QGridLayout *lineEditLayout = new QGridLayout(lineEditFrame); + auto lineEditLayout = new QGridLayout(lineEditFrame); lineEditLayout->setMargin(2); lineEditLayout->setSpacing(0); lineEditLayout->addItem(new QSpacerItem(5, 3, QSizePolicy::Fixed, QSizePolicy::Fixed), 0, 0, 1, 3); @@ -145,7 +145,7 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) : spacer->setObjectName(QStringLiteral("itemLibrarySearchInputSpacer")); spacer->setFixedHeight(4); - QGridLayout *layout = new QGridLayout(this); + auto layout = new QGridLayout(this); layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing(0); layout->addWidget(tabBar, 0, 0, 1, 1); @@ -166,7 +166,7 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) : connect(&m_compressionTimer, &QTimer::timeout, this, &ItemLibraryWidget::updateModel); - auto *flowLayout = new Utils::FlowLayout(m_importTagsWidget.data()); + auto flowLayout = new Utils::FlowLayout(m_importTagsWidget.data()); flowLayout->setMargin(4); m_addResourcesWidget->setVisible(false); @@ -291,7 +291,7 @@ void ItemLibraryWidget::setupImportTagWidget() qDeleteAll(m_importTagsWidget->findChildren<QWidget*>("", Qt::FindDirectChildrenOnly)); - auto *flowLayout = m_importTagsWidget->layout(); + auto flowLayout = m_importTagsWidget->layout(); auto createButton = [this](const QString &import) { auto button = new QToolButton(m_importTagsWidget.data()); @@ -342,7 +342,7 @@ void ItemLibraryWidget::startDragAndDrop(QQuickItem *mouseArea, QVariant itemLib m_currentitemLibraryEntry = itemLibraryId.value<ItemLibraryEntry>(); QMimeData *mimeData = m_itemLibraryModel->getMimeData(m_currentitemLibraryEntry); - QDrag *drag = new QDrag(this); + auto drag = new QDrag(this); drag->setPixmap(Utils::StyleHelper::dpiSpecificImageFile( m_currentitemLibraryEntry.libraryEntryIconPath())); diff --git a/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp b/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp index 14a0109d85..089a540b8f 100644 --- a/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp +++ b/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp @@ -205,7 +205,7 @@ static void openContextMenu(const QModelIndex &index, const QPoint &pos) bool NameItemDelegate::editorEvent(QEvent *event, QAbstractItemModel *, const QStyleOptionViewItem &, const QModelIndex &index) { if (event->type() == QEvent::MouseButtonRelease) { - QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event); + auto mouseEvent = static_cast<QMouseEvent *>(event); if (mouseEvent->button() == Qt::RightButton) { openContextMenu(index, mouseEvent->globalPos()); mouseEvent->accept(); @@ -220,7 +220,7 @@ QWidget *NameItemDelegate::createEditor(QWidget *parent, const QModelIndex &index) const { if (!getModelNode(index).isValid()) - return 0; + return nullptr; return new QLineEdit(parent); } @@ -230,7 +230,7 @@ void NameItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const ModelNode node = getModelNode(index); const QString value = node.id(); - QLineEdit *lineEdit = static_cast<QLineEdit*>(editor); + auto lineEdit = static_cast<QLineEdit*>(editor); lineEdit->setText(value); } @@ -259,7 +259,7 @@ static void setId(const QModelIndex &index, const QString &newId) void NameItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const { Q_UNUSED(model); - QLineEdit *lineEdit = static_cast<QLineEdit*>(editor); + auto lineEdit = static_cast<QLineEdit*>(editor); setId(index,lineEdit->text()); lineEdit->clearFocus(); } @@ -268,7 +268,7 @@ void NameItemDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex & /*index*/) const { - QLineEdit *lineEdit = static_cast<QLineEdit*>(editor); + auto lineEdit = static_cast<QLineEdit*>(editor); lineEdit->setGeometry(option.rect); } diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index 14776d40d6..d1f7f41d02 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -176,9 +176,7 @@ NavigatorTreeModel::NavigatorTreeModel(QObject *parent) : QAbstractItemModel(par { } -NavigatorTreeModel::~NavigatorTreeModel() -{ -} +NavigatorTreeModel::~NavigatorTreeModel() = default; QVariant NavigatorTreeModel::data(const QModelIndex &index, int role) const { @@ -373,7 +371,7 @@ QStringList NavigatorTreeModel::mimeTypes() const QMimeData *NavigatorTreeModel::mimeData(const QModelIndexList &modelIndexList) const { - QMimeData *mimeData = new QMimeData(); + auto mimeData = new QMimeData(); QByteArray encodedModelNodeData; QDataStream encodedModelNodeDataStream(&encodedModelNodeData, QIODevice::WriteOnly); diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp index 0e36908964..6b617eaaf5 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp @@ -60,7 +60,7 @@ public: baseStyle()->setParent(parent); } - void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const + void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = nullptr) const override { static QRect mouseOverStateSavedFrameRectangle; if (element == QStyle::PE_PanelItemViewRow) { @@ -98,7 +98,7 @@ public: } } - int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, QStyleHintReturn *returnData = 0) const { + int styleHint(StyleHint hint, const QStyleOption *option = nullptr, const QWidget *widget = nullptr, QStyleHintReturn *returnData = nullptr) const override { if (hint == SH_ItemView_ShowDecorationSelected) return 0; else diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index e94135d0e8..c8fc4e5b54 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -75,7 +75,7 @@ NavigatorView::NavigatorView(QObject* parent) : m_treeModel(new NavigatorTreeModel(this)) { #ifndef QMLDESIGNER_TEST - Internal::NavigatorContext *navigatorContext = new Internal::NavigatorContext(m_widget.data()); + auto navigatorContext = new Internal::NavigatorContext(m_widget.data()); Core::ICore::addContextObject(navigatorContext); #endif @@ -92,7 +92,7 @@ NavigatorView::NavigatorView(QObject* parent) : connect(m_widget.data(), &NavigatorWidget::filterToggled, this, &NavigatorView::filterToggled); #ifndef QMLDESIGNER_TEST - NameItemDelegate *idDelegate = new NameItemDelegate(this); + auto idDelegate = new NameItemDelegate(this); IconCheckboxItemDelegate *showDelegate = new IconCheckboxItemDelegate(this, Utils::Icons::EYE_OPEN_TOOLBAR.icon(), @@ -479,7 +479,7 @@ QTreeView *NavigatorView::treeWidget() const { if (m_widget) return m_widget->treeView(); - return 0; + return nullptr; } NavigatorTreeModel *NavigatorView::treeModel() diff --git a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp index 6201fec182..5d7b1aeaaf 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp @@ -43,9 +43,9 @@ FileResourcesModel::FileResourcesModel(QObject *parent) : void FileResourcesModel::setModelNodeBackend(const QVariant &modelNodeBackend) { - QObject* modelNodeBackendObject = modelNodeBackend.value<QObject*>(); + auto modelNodeBackendObject = modelNodeBackend.value<QObject*>(); - const QmlDesigner::QmlModelNodeProxy *backendObjectCasted = + const auto backendObjectCasted = qobject_cast<const QmlDesigner::QmlModelNodeProxy *>(modelNodeBackendObject); if (backendObjectCasted) diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp index c1aff9dabd..d445fdc104 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp @@ -291,9 +291,9 @@ void GradientModel::setupModel() void GradientModel::setAnchorBackend(const QVariant &anchorBackend) { - QObject* anchorBackendObject = anchorBackend.value<QObject*>(); + auto anchorBackendObject = anchorBackend.value<QObject*>(); - const QmlDesigner::Internal::QmlAnchorBindingProxy *backendCasted = + const auto backendCasted = qobject_cast<const QmlDesigner::Internal::QmlAnchorBindingProxy *>(anchorBackendObject); if (backendCasted) @@ -330,7 +330,7 @@ bool GradientModel::locked() const if (m_locked) return true; - QmlDesigner::PropertyEditorView *view = qobject_cast<QmlDesigner::PropertyEditorView*>(m_itemNode.view()); + auto view = qobject_cast<QmlDesigner::PropertyEditorView*>(m_itemNode.view()); if (view && view->locked()) return true; diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp index 67183e1555..6c602ab4a0 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp @@ -84,9 +84,9 @@ PropertyEditorContextObject::PropertyEditorContextObject(QObject *parent) : QObject(parent), m_isBaseState(false), m_selectionChanged(false), - m_backendValues(0), - m_qmlComponent(0), - m_qmlContext(0) + m_backendValues(nullptr), + m_qmlComponent(nullptr), + m_qmlContext(nullptr) { } @@ -342,7 +342,7 @@ void PropertyEditorContextObject::setSpecificQmlData(const QString &newSpecificQ m_specificQmlData = newSpecificQmlData; delete m_qmlComponent; - m_qmlComponent = 0; + m_qmlComponent = nullptr; emit specificQmlComponentChanged(); emit specificQmlDataChanged(); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index 16c2e5f1b2..872bc84518 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -86,7 +86,7 @@ static QObject *variantToQObject(const QVariant &value) if (value.userType() == QMetaType::QObjectStar || value.userType() > QMetaType::User) return *(QObject **)value.constData(); - return 0; + return nullptr; } namespace QmlDesigner { @@ -109,15 +109,13 @@ PropertyEditorQmlBackend::PropertyEditorQmlBackend(PropertyEditorView *propertyE propertyEditor, &PropertyEditorView::changeValue); } -PropertyEditorQmlBackend::~PropertyEditorQmlBackend() -{ -} +PropertyEditorQmlBackend::~PropertyEditorQmlBackend() = default; void PropertyEditorQmlBackend::setupPropertyEditorValue(const PropertyName &name, PropertyEditorView *propertyEditor, const QString &type) { QmlDesigner::PropertyName propertyName(name); propertyName.replace('.', '_'); - PropertyEditorValue *valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(backendValuesPropertyMap().value(QString::fromUtf8(propertyName)))); + auto valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(backendValuesPropertyMap().value(QString::fromUtf8(propertyName)))); if (!valueObject) { valueObject = new PropertyEditorValue(&backendValuesPropertyMap()); QObject::connect(valueObject, &PropertyEditorValue::valueChanged, &backendValuesPropertyMap(), &DesignerPropertyMap::valueChanged); @@ -186,7 +184,7 @@ void PropertyEditorQmlBackend::createPropertyEditorValue(const QmlObjectNode &qm { PropertyName propertyName(name); propertyName.replace('.', '_'); - PropertyEditorValue *valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(backendValuesPropertyMap().value(QString::fromUtf8(propertyName)))); + auto valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(backendValuesPropertyMap().value(QString::fromUtf8(propertyName)))); if (!valueObject) { valueObject = new PropertyEditorValue(&backendValuesPropertyMap()); QObject::connect(valueObject, &PropertyEditorValue::valueChanged, &backendValuesPropertyMap(), &DesignerPropertyMap::valueChanged); @@ -220,7 +218,7 @@ void PropertyEditorQmlBackend::setValue(const QmlObjectNode & qmlObjectNode, con { PropertyName propertyName = name; propertyName.replace('.', '_'); - PropertyEditorValue *propertyValue = qobject_cast<PropertyEditorValue*>(variantToQObject(m_backendValuesPropertyMap.value(QString::fromUtf8(propertyName)))); + auto propertyValue = qobject_cast<PropertyEditorValue*>(variantToQObject(m_backendValuesPropertyMap.value(QString::fromUtf8(propertyName)))); if (propertyValue) { propertyValue->setValue(value); @@ -285,7 +283,7 @@ void PropertyEditorQmlBackend::setup(const QmlObjectNode &qmlObjectNode, const Q setupLayoutAttachedProperties(qmlObjectNode, propertyEditor); // className - PropertyEditorValue *valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(m_backendValuesPropertyMap.value(QLatin1String("className")))); + auto valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(m_backendValuesPropertyMap.value(QLatin1String("className")))); if (!valueObject) valueObject = new PropertyEditorValue(&m_backendValuesPropertyMap); valueObject->setName("className"); @@ -366,7 +364,7 @@ void PropertyEditorQmlBackend::initialSetup(const TypeName &typeName, const QUrl foreach (const PropertyName &propertyName, metaInfo.propertyNames()) setupPropertyEditorValue(propertyName, propertyEditor, QString::fromUtf8(metaInfo.propertyTypeName(propertyName))); - PropertyEditorValue *valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(m_backendValuesPropertyMap.value(QLatin1String("className")))); + auto valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(m_backendValuesPropertyMap.value(QLatin1String("className")))); if (!valueObject) valueObject = new PropertyEditorValue(&m_backendValuesPropertyMap); valueObject->setName("className"); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp index f4cc31f56e..7fcae031fc 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp @@ -441,7 +441,7 @@ void PropertyEditorNodeWrapper::changeValue(const QString &propertyName) if (m_modelNode.isValid()) { QmlDesigner::QmlObjectNode qmlObjectNode(m_modelNode); - PropertyEditorValue *valueObject = qvariant_cast<PropertyEditorValue *>(m_valuesPropertyMap.value(QString::fromLatin1(name))); + auto valueObject = qvariant_cast<PropertyEditorValue *>(m_valuesPropertyMap.value(QString::fromLatin1(name))); if (valueObject->value().isValid()) qmlObjectNode.setVariantProperty(name, valueObject->value()); @@ -463,7 +463,7 @@ void PropertyEditorNodeWrapper::setup() foreach (const QmlDesigner::PropertyName &propertyName, m_modelNode.metaInfo().propertyNames()) { if (qmlObjectNode.isValid()) { - PropertyEditorValue *valueObject = new PropertyEditorValue(&m_valuesPropertyMap); + auto valueObject = new PropertyEditorValue(&m_valuesPropertyMap); valueObject->setName(propertyName); valueObject->setValue(qmlObjectNode.instanceValue(propertyName)); connect(valueObject, &PropertyEditorValue::valueChanged, &m_valuesPropertyMap, &QQmlPropertyMap::valueChanged); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp index dc88f342b7..8dd39a607c 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp @@ -70,10 +70,10 @@ static bool propertyIsAttachedLayoutProperty(const PropertyName &propertyName) PropertyEditorView::PropertyEditorView(QWidget *parent) : AbstractView(parent), m_parent(parent), - m_updateShortcut(0), + m_updateShortcut(nullptr), m_timerId(0), m_stackedWidget(new PropertyEditorWidget(parent)), - m_qmlBackEndForCurrentType(0), + m_qmlBackEndForCurrentType(nullptr), m_locked(false), m_setupCompleted(false), m_singleShotTimer(new QTimer(this)) @@ -170,7 +170,7 @@ void PropertyEditorView::changeValue(const QString &name) underscoreName.replace('.', '_'); PropertyEditorValue *value = m_qmlBackEndForCurrentType->propertyValueForName(QString::fromLatin1(underscoreName)); - if (value ==0) + if (value ==nullptr) return; QmlObjectNode qmlObjectNode(m_selectedNode); @@ -381,7 +381,7 @@ void PropertyEditorView::updateSize() { if (!m_qmlBackEndForCurrentType) return; - QWidget* frame = m_qmlBackEndForCurrentType->widget()->findChild<QWidget*>("propertyEditorFrame"); + auto frame = m_qmlBackEndForCurrentType->widget()->findChild<QWidget*>("propertyEditorFrame"); if (frame) frame->resize(m_stackedWidget->size()); } @@ -412,7 +412,7 @@ void PropertyEditorView::timerEvent(QTimerEvent *timerEvent) void PropertyEditorView::resetView() { - if (model() == 0) + if (model() == nullptr) return; m_locked = true; @@ -688,7 +688,7 @@ bool PropertyEditorView::hasWidget() const WidgetInfo PropertyEditorView::widgetInfo() { - return createWidgetInfo(m_stackedWidget, 0, QStringLiteral("Properties"), WidgetInfo::RightPane, 0); + return createWidgetInfo(m_stackedWidget, nullptr, QStringLiteral("Properties"), WidgetInfo::RightPane, 0); } void PropertyEditorView::currentStateChanged(const ModelNode &node) @@ -706,7 +706,7 @@ void PropertyEditorView::instancePropertyChanged(const QList<QPair<ModelNode, Pr return; m_locked = true; - typedef QPair<ModelNode, PropertyName> ModelNodePropertyPair; + using ModelNodePropertyPair = QPair<ModelNode, PropertyName>; foreach (const ModelNodePropertyPair &propertyPair, propertyList) { const ModelNode modelNode = propertyPair.first; const QmlObjectNode qmlObjectNode(modelNode); @@ -762,7 +762,7 @@ void PropertyEditorView::reloadQml() m_stackedWidget->removeWidget(widget); delete widget; } - m_qmlBackEndForCurrentType = 0; + m_qmlBackEndForCurrentType = nullptr; delayedResetView(); } diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp index 31b16e2e2d..ca1f307b93 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp @@ -70,9 +70,7 @@ QmlAnchorBindingProxy::QmlAnchorBindingProxy(QObject *parent) : { } -QmlAnchorBindingProxy::~QmlAnchorBindingProxy() -{ -} +QmlAnchorBindingProxy::~QmlAnchorBindingProxy() = default; void QmlAnchorBindingProxy::setup(const QmlItemNode &fxItemNode) { diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp index 995372bcbe..61cd7a9611 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp @@ -67,7 +67,7 @@ WidgetInfo StatesEditorView::widgetInfo() if (!m_statesEditorWidget) m_statesEditorWidget = new StatesEditorWidget(this, m_statesEditorModel.data()); - return createWidgetInfo(m_statesEditorWidget.data(), 0, QLatin1String("StatesEditor"), WidgetInfo::BottomPane, 0, tr("States")); + return createWidgetInfo(m_statesEditorWidget.data(), nullptr, QLatin1String("StatesEditor"), WidgetInfo::BottomPane, 0, tr("States")); } void StatesEditorView::rootNodeTypeChanged(const QString &/*type*/, int /*majorVersion*/, int /*minorVersion*/) diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp index 83d22c307d..7b6358f251 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp @@ -87,8 +87,8 @@ void StatesEditorWidget::showAddNewStatesButton(bool showAddNewStatesButton) StatesEditorWidget::StatesEditorWidget(StatesEditorView *statesEditorView, StatesEditorModel *statesEditorModel) : QQuickWidget(), m_statesEditorView(statesEditorView), - m_imageProvider(0), - m_qmlSourceUpdateShortcut(0) + m_imageProvider(nullptr), + m_qmlSourceUpdateShortcut(nullptr) { m_imageProvider = new Internal::StatesEditorImageProvider; m_imageProvider->setNodeInstanceView(statesEditorView->nodeInstanceView()); @@ -115,9 +115,7 @@ StatesEditorWidget::StatesEditorWidget(StatesEditorView *statesEditorView, State reloadQmlSource(); } -StatesEditorWidget::~StatesEditorWidget() -{ -} +StatesEditorWidget::~StatesEditorWidget() = default; QString StatesEditorWidget::qmlSourcesPath() { return Core::ICore::resourcePath() + QStringLiteral("/qmldesigner/statesEditorQmlSources"); diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp index 85e42b7d80..462a51dbe7 100644 --- a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp +++ b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp @@ -99,7 +99,7 @@ void TextEditorView::modelAttached(Model *model) AbstractView::modelAttached(model); - TextEditor::BaseTextEditor* textEditor = qobject_cast<TextEditor::BaseTextEditor*>( + auto textEditor = qobject_cast<TextEditor::BaseTextEditor*>( QmlDesignerPlugin::instance()->currentDesignDocument()->textEditor()->duplicate()); Core::Context context = textEditor->context(); @@ -118,7 +118,7 @@ void TextEditorView::modelAboutToBeDetached(Model *model) { AbstractView::modelAboutToBeDetached(model); - m_widget->setTextEditor(0); + m_widget->setTextEditor(nullptr); // in case the user closed it explicit we do not want to do anything with the editor if (TextEditor::BaseTextEditor *textEditor = @@ -149,7 +149,7 @@ void TextEditorView::nodeReparented(const ModelNode &/*node*/, const NodeAbstrac WidgetInfo TextEditorView::widgetInfo() { - return createWidgetInfo(m_widget, 0, "TextEditor", WidgetInfo::CentralPane, 0, tr("Text Editor"), DesignerWidgetFlags::IgnoreErrors); + return createWidgetInfo(m_widget, nullptr, "TextEditor", WidgetInfo::CentralPane, 0, tr("Text Editor"), DesignerWidgetFlags::IgnoreErrors); } void TextEditorView::contextHelpId(const Core::IContext::HelpIdCallback &callback) const diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp b/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp index 4cf464d4e7..117fdb9adc 100644 --- a/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp +++ b/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp @@ -186,7 +186,7 @@ bool TextEditorWidget::eventFilter( QObject *, QEvent *event) QKeySequence(Qt::Key_Down + Qt::CTRL) }; if (event->type() == QEvent::ShortcutOverride) { - QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event); + auto keyEvent = static_cast<QKeyEvent *>(event); if (std::find(overrideKeys.begin(), overrideKeys.end(), keyEvent->key()) != overrideKeys.end()) { keyEvent->accept(); diff --git a/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h b/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h index 93eae8153f..fa57709b99 100644 --- a/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h +++ b/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h @@ -35,14 +35,14 @@ class AddTabDesignerAction : public QObject, public AbstractAction public: AddTabDesignerAction(); - QByteArray category() const; - QByteArray menuId() const; - int priority() const; - Type type() const; + QByteArray category() const override; + QByteArray menuId() const override; + int priority() const override; + Type type() const override; protected: - bool isVisible(const SelectionContext &selectionContext) const; - bool isEnabled(const SelectionContext &selectionContext) const; + bool isVisible(const SelectionContext &selectionContext) const override; + bool isEnabled(const SelectionContext &selectionContext) const override; private: void addNewTab(); diff --git a/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.h b/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.h index 8128985d64..c30e8fccf9 100644 --- a/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.h +++ b/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.h @@ -35,8 +35,8 @@ class AddTabToTabViewDialog : public QDialog Q_OBJECT public: - explicit AddTabToTabViewDialog(QWidget *parent = 0); - ~AddTabToTabViewDialog(); + explicit AddTabToTabViewDialog(QWidget *parent = nullptr); + ~AddTabToTabViewDialog() override; static QString create(const QString &tabName, QWidget *parent); diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.h b/src/plugins/qmldesigner/componentsplugin/componentsplugin.h index 30e0cc5aa1..14892065ae 100644 --- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.h +++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.h @@ -40,10 +40,10 @@ class ComponentsPlugin : public QObject, QmlDesigner::IWidgetPlugin Q_INTERFACES(QmlDesigner::IWidgetPlugin) public: ComponentsPlugin(); - ~ComponentsPlugin() {} + ~ComponentsPlugin() override = default; - QString metaInfo() const; - QString pluginName() const; + QString metaInfo() const override; + QString pluginName() const override; }; diff --git a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp index 956f26c453..7973bf565c 100644 --- a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp +++ b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp @@ -124,7 +124,7 @@ void EnterTabDesignerAction::createActionForTab(const ModelNode &modelNode) if (itemNode.isValid()) { QString what = tr("Step into: %1"). arg(itemNode.instanceValue("title").toString()); - EnterTabAction *selectionAction = new EnterTabAction(what); + auto selectionAction = new EnterTabAction(what); SelectionContext nodeSelectionContext = selectionContext(); nodeSelectionContext.setTargetNode(modelNode); diff --git a/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.cpp b/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.cpp index 751ec18235..ab5c831bae 100644 --- a/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.cpp +++ b/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.cpp @@ -36,7 +36,7 @@ TabViewIndexModel::TabViewIndexModel(QObject *parent) : void TabViewIndexModel::setModelNodeBackend(const QVariant &modelNodeBackend) { - QObject* modelNodeBackendObject = modelNodeBackend.value<QObject*>(); + auto modelNodeBackendObject = modelNodeBackend.value<QObject*>(); if (modelNodeBackendObject) setModelNode(modelNodeBackendObject->property("modelNode").value<QmlDesigner::ModelNode>()); diff --git a/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.h b/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.h index e10f46a085..9443f09d55 100644 --- a/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.h +++ b/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.h @@ -37,7 +37,7 @@ class TabViewIndexModel : public QObject Q_PROPERTY(QStringList tabViewIndexModel READ tabViewIndexModel NOTIFY modelNodeBackendChanged) public: - explicit TabViewIndexModel(QObject *parent = 0); + explicit TabViewIndexModel(QObject *parent = nullptr); void setModelNodeBackend(const QVariant &modelNodeBackend); void setModelNode(const QmlDesigner::ModelNode &modelNode); diff --git a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp index e106c2fe93..b0482ddc97 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp @@ -126,9 +126,7 @@ if (s_shouldAssert) Q_ASSERT_X(false, _function, QString(QStringLiteral("%1:%2 - %3")).arg(m_file).arg(m_line).arg(m_function).toUtf8()); } -Exception::~Exception() -{ -} +Exception::~Exception() = default; /*! Returns the unmangled backtrace of this exception as a string. diff --git a/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp index 898ce22bcb..94e1cbaa0f 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp @@ -45,10 +45,10 @@ AddArrayMemberVisitor::AddArrayMemberVisitor(TextModifier &modifier, void AddArrayMemberVisitor::findArrayBindingAndInsert(const QString &propertyName, QmlJS::AST::UiObjectMemberList *ast) { for (QmlJS::AST::UiObjectMemberList *iter = ast; iter; iter = iter->next) { - if (QmlJS::AST::UiArrayBinding *arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(iter->member)) { + if (auto arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(iter->member)) { if (toString(arrayBinding->qualifiedId) == propertyName) insertInto(arrayBinding); - } else if (QmlJS::AST::UiObjectBinding *objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(iter->member)) { + } else if (auto objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(iter->member)) { if (toString(objectBinding->qualifiedId) == propertyName && willConvertObjectBindingIntoArrayBinding()) convertAndAdd(objectBinding); } @@ -80,7 +80,7 @@ bool AddArrayMemberVisitor::visit(QmlJS::AST::UiObjectDefinition *ast) // FIXME: duplicate code in the QmlJS::Rewriter class, remove this void AddArrayMemberVisitor::insertInto(QmlJS::AST::UiArrayBinding *arrayBinding) { - QmlJS::AST::UiObjectMember *lastMember = 0; + QmlJS::AST::UiObjectMember *lastMember = nullptr; for (QmlJS::AST::UiArrayMemberList *iter = arrayBinding->members; iter; iter = iter->next) if (iter->member) lastMember = iter->member; diff --git a/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.h b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.h index d414e24664..3498068fbc 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.h @@ -45,8 +45,8 @@ public: { m_convertObjectBindingIntoArrayBinding = convertObjectBindingIntoArrayBinding; } protected: - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); + bool visit(QmlJS::AST::UiObjectBinding *ast) override; + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; private: void findArrayBindingAndInsert(const QString &propertyName, QmlJS::AST::UiObjectMemberList *ast); diff --git a/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.h index 2b869cbc50..dc1dd66e36 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.h @@ -39,8 +39,8 @@ public: const PropertyNameList &propertyOrder); protected: - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); + bool visit(QmlJS::AST::UiObjectBinding *ast) override; + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; private: void insertInto(QmlJS::AST::UiObjectInitializer *ast); diff --git a/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp index 7628c6b828..70e2f8463e 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp @@ -83,7 +83,7 @@ void AddPropertyVisitor::addInMembers(QmlJS::AST::UiObjectInitializer *initializ QmlJS::AST::SourceLocation startOfNextMember; unsigned depth; - if (insertAfter == 0 || insertAfter->member == 0) { + if (insertAfter == nullptr || insertAfter->member == nullptr) { // insert as first member endOfPreviousMember = initializer->lbraceToken; @@ -108,7 +108,7 @@ void AddPropertyVisitor::addInMembers(QmlJS::AST::UiObjectInitializer *initializ bool needsTrailingSemicolon = false; if (isOneLiner) { - if (insertAfter == 0) { // we're inserting after an lbrace + if (insertAfter == nullptr) { // we're inserting after an lbrace if (initializer->members) { // we're inserting before a member (and not the rbrace) needsTrailingSemicolon = m_propertyType == QmlRefactoring::ScriptBinding; } diff --git a/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.h index 9da136d82c..f6f92de125 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.h @@ -44,8 +44,8 @@ public: const TypeName &dynamicTypeName); protected: - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; + bool visit(QmlJS::AST::UiObjectBinding *ast) override; private: void addInMembers(QmlJS::AST::UiObjectInitializer *initializer); diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp index f5b5a42e30..a35ff98ef4 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp @@ -70,7 +70,7 @@ bool ChangeImportsVisitor::remove(QmlJS::AST::UiProgram *ast, const Import &impo return false; for (QmlJS::AST::UiHeaderItemList *iter = ast->headers; iter; iter = iter->next) { - QmlJS::AST::UiImport *iterImport = QmlJS::AST::cast<QmlJS::AST::UiImport *>(iter->headerItem); + auto iterImport = QmlJS::AST::cast<QmlJS::AST::UiImport *>(iter->headerItem); if (equals(iterImport, import)) { int start = iterImport->firstSourceLocation().begin(); int end = iterImport->lastSourceLocation().end(); diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.h b/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.h index 474f83b944..9c25c35c5c 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.h @@ -38,8 +38,8 @@ public: const QString &newType); protected: - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; + bool visit(QmlJS::AST::UiObjectBinding *ast) override; private: void replaceType(QmlJS::AST::UiQualifiedId *typeId); diff --git a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp index eadd48dc7f..b6ed184f9d 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp @@ -113,7 +113,7 @@ void ChangePropertyVisitor::replaceInMembers(UiObjectInitializer *initializer, break; // for grouped properties: } else if (!prefix.isEmpty()) { - if (UiObjectDefinition *def = cast<UiObjectDefinition *>(member)) { + if (auto def = cast<UiObjectDefinition *>(member)) { if (toString(def->qualifiedTypeNameId) == prefix) replaceInMembers(def->initializer, suffix); } @@ -127,16 +127,16 @@ void ChangePropertyVisitor::replaceMemberValue(UiObjectMember *propertyMember, b QString replacement = m_value; int startOffset = -1; int endOffset = -1; - if (UiObjectBinding *objectBinding = AST::cast<UiObjectBinding *>(propertyMember)) { + if (auto objectBinding = AST::cast<UiObjectBinding *>(propertyMember)) { startOffset = objectBinding->qualifiedTypeNameId->identifierToken.offset; endOffset = objectBinding->initializer->rbraceToken.end(); - } else if (UiScriptBinding *scriptBinding = AST::cast<UiScriptBinding *>(propertyMember)) { + } else if (auto scriptBinding = AST::cast<UiScriptBinding *>(propertyMember)) { startOffset = scriptBinding->statement->firstSourceLocation().offset; endOffset = scriptBinding->statement->lastSourceLocation().end(); - } else if (UiArrayBinding *arrayBinding = AST::cast<UiArrayBinding *>(propertyMember)) { + } else if (auto arrayBinding = AST::cast<UiArrayBinding *>(propertyMember)) { startOffset = arrayBinding->lbracketToken.offset; endOffset = arrayBinding->rbracketToken.end(); - } else if (UiPublicMember *publicMember = AST::cast<UiPublicMember*>(propertyMember)) { + } else if (auto publicMember = AST::cast<UiPublicMember*>(propertyMember)) { if (publicMember->statement) { startOffset = publicMember->statement->firstSourceLocation().offset; if (publicMember->semicolonToken.isValid()) @@ -165,13 +165,13 @@ void ChangePropertyVisitor::replaceMemberValue(UiObjectMember *propertyMember, b bool ChangePropertyVisitor::isMatchingPropertyMember(const QString &propName, UiObjectMember *member) { - if (UiObjectBinding *objectBinding = AST::cast<UiObjectBinding *>(member)) + if (auto objectBinding = AST::cast<UiObjectBinding *>(member)) return propName == toString(objectBinding->qualifiedId); - else if (UiScriptBinding *scriptBinding = AST::cast<UiScriptBinding *>(member)) + else if (auto scriptBinding = AST::cast<UiScriptBinding *>(member)) return propName == toString(scriptBinding->qualifiedId); - else if (UiArrayBinding *arrayBinding = AST::cast<UiArrayBinding *>(member)) + else if (auto arrayBinding = AST::cast<UiArrayBinding *>(member)) return propName == toString(arrayBinding->qualifiedId); - else if (UiPublicMember *publicMember = AST::cast<UiPublicMember *>(member)) + else if (auto publicMember = AST::cast<UiPublicMember *>(member)) return propName == publicMember->name; else return false; @@ -192,7 +192,7 @@ void ChangePropertyVisitor::insertIntoArray(QmlJS::AST::UiArrayBinding *ast) if (!ast) return; - UiObjectMember *lastMember = 0; + UiObjectMember *lastMember = nullptr; for (UiArrayMemberList *iter = ast->members; iter; iter = iter->next) { lastMember = iter->member; } diff --git a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.h index f97eea0a37..d4a9c50a9a 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.h @@ -41,8 +41,8 @@ public: QmlRefactoring::PropertyType propertyType); protected: - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; + bool visit(QmlJS::AST::UiObjectBinding *ast) override; private: void replaceInMembers(QmlJS::AST::UiObjectInitializer *initializer, diff --git a/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp b/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp index dec17c5e1b..76ecb59f30 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp @@ -54,7 +54,7 @@ FirstDefinitionFinder::FirstDefinitionFinder(const QString &text): qint32 FirstDefinitionFinder::operator()(quint32 offset) { m_offset = offset; - m_firstObjectDefinition = 0; + m_firstObjectDefinition = nullptr; QmlJS::AST::Node::accept(m_doc->qmlProgram(), this); @@ -70,7 +70,7 @@ void FirstDefinitionFinder::extractFirstObjectDefinition(QmlJS::AST::UiObjectIni return; for (QmlJS::AST::UiObjectMemberList *iter = ast->members; iter; iter = iter->next) { - if (QmlJS::AST::UiObjectDefinition *def = QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition*>(iter->member)) + if (auto def = QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition*>(iter->member)) m_firstObjectDefinition = def; } } diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp index 0ec53a7452..3be5de5bc9 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp @@ -53,8 +53,8 @@ MoveObjectBeforeObjectVisitor::MoveObjectBeforeObjectVisitor(TextModifier &modif bool MoveObjectBeforeObjectVisitor::operator ()(QmlJS::AST::UiProgram *ast) { - movingObject = 0; - beforeObject = 0; + movingObject = nullptr; + beforeObject = nullptr; movingObjectParents.clear(); QMLRewriter::operator ()(ast); @@ -102,14 +102,14 @@ void MoveObjectBeforeObjectVisitor::doMove() TextModifier::MoveInfo moveInfo; QmlJS::AST::Node *parent = movingObjectParent(); - QmlJS::AST::UiArrayMemberList *arrayMember = 0, *otherArrayMember = 0; + QmlJS::AST::UiArrayMemberList *arrayMember = nullptr, *otherArrayMember = nullptr; QString separator; if (!inDefaultProperty) { - QmlJS::AST::UiArrayBinding *initializer = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(parent); + auto initializer = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(parent); Q_ASSERT(initializer); - otherArrayMember = 0; + otherArrayMember = nullptr; for (QmlJS::AST::UiArrayMemberList *cur = initializer->members; cur; cur = cur->next) { if (cur->member == movingObject) { arrayMember = cur; @@ -166,7 +166,7 @@ QmlJS::AST::Node *MoveObjectBeforeObjectVisitor::movingObjectParent() const if (movingObjectParents.size() > 1) return movingObjectParents.at(movingObjectParents.size() - 2); else - return 0; + return nullptr; } QmlJS::AST::SourceLocation MoveObjectBeforeObjectVisitor::lastParentLocation() const @@ -174,9 +174,9 @@ QmlJS::AST::SourceLocation MoveObjectBeforeObjectVisitor::lastParentLocation() c dump(movingObjectParents); QmlJS::AST::Node *parent = movingObjectParent(); - if (QmlJS::AST::UiObjectInitializer *initializer = QmlJS::AST::cast<QmlJS::AST::UiObjectInitializer*>(parent)) + if (auto initializer = QmlJS::AST::cast<QmlJS::AST::UiObjectInitializer*>(parent)) return initializer->rbraceToken; - else if (QmlJS::AST::UiArrayBinding *initializer = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(parent)) + else if (auto initializer = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(parent)) return initializer->rbracketToken; else return QmlJS::AST::SourceLocation(); diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h index 7b5f39d175..922d9fe40a 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h @@ -43,17 +43,17 @@ public: quint32 beforeObjectLocation, bool inDefaultProperty); - bool operator ()(QmlJS::AST::UiProgram *ast); + bool operator ()(QmlJS::AST::UiProgram *ast) override; protected: - virtual bool preVisit(QmlJS::AST::Node *ast); - virtual void postVisit(QmlJS::AST::Node *ast); + bool preVisit(QmlJS::AST::Node *ast) override; + void postVisit(QmlJS::AST::Node *ast) override; - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; private: bool foundEverything() const - { return movingObject != 0 && !movingObjectParents.isEmpty() && (toEnd || beforeObject != 0); } + { return movingObject != nullptr && !movingObjectParents.isEmpty() && (toEnd || beforeObject != nullptr); } void doMove(); diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp index 949c89cda0..e0e820ac8f 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp @@ -100,7 +100,7 @@ private: for (UiObjectMemberList *iter = ast->members; iter; iter = iter->next) { UiObjectMember *member = iter->member; - if (UiArrayBinding *arrayBinding = cast<UiArrayBinding*>(member)) { + if (auto arrayBinding = cast<UiArrayBinding*>(member)) { if (toString(arrayBinding->qualifiedId) == QString::fromUtf8(targetPropertyName)) { appendToArray(arrayBinding); @@ -128,7 +128,7 @@ private: void appendToArray(UiArrayBinding *ast) { - UiObjectMember *lastMember = 0; + UiObjectMember *lastMember = nullptr; for (UiArrayMemberList *iter = ast->members; iter; iter = iter->next) { if (iter->member) @@ -179,7 +179,7 @@ bool MoveObjectVisitor::visit(UiArrayBinding *ast) if (didRewriting()) return false; - UiArrayMemberList *currentMember = 0; + UiArrayMemberList *currentMember = nullptr; for (UiArrayMemberList *it = ast->members; it; it = it->next) { if (it->member->firstSourceLocation().offset == objectLocation) { diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h index cc6d44825d..b3b8b1ab1c 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h @@ -40,12 +40,12 @@ public: quint32 targetParentObjectLocation, const PropertyNameList &propertyOrder); - bool operator ()(QmlJS::AST::UiProgram *ast); + bool operator ()(QmlJS::AST::UiProgram *ast) override; protected: - virtual bool visit(QmlJS::AST::UiArrayBinding *ast); - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); + bool visit(QmlJS::AST::UiArrayBinding *ast) override; + bool visit(QmlJS::AST::UiObjectBinding *ast) override; + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; private: void doMove(const TextModifier::MoveInfo &moveInfo); diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp index 6247f98697..b5388afc59 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp @@ -153,7 +153,7 @@ QString QMLRewriter::removeIndentation(const QString &text, unsigned depth) QmlJS::AST::SourceLocation QMLRewriter::calculateLocation(QmlJS::AST::UiQualifiedId *id) { - Q_ASSERT(id != 0); + Q_ASSERT(id != nullptr); const QmlJS::AST::SourceLocation startLocation = id->identifierToken; @@ -169,7 +169,7 @@ QmlJS::AST::SourceLocation QMLRewriter::calculateLocation(QmlJS::AST::UiQualifie bool QMLRewriter::isMissingSemicolon(QmlJS::AST::UiObjectMember *member) { - QmlJS::AST::UiScriptBinding *binding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding *>(member); + auto binding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding *>(member); if (binding) return isMissingSemicolon(binding->statement); else @@ -178,14 +178,14 @@ bool QMLRewriter::isMissingSemicolon(QmlJS::AST::UiObjectMember *member) bool QMLRewriter::isMissingSemicolon(QmlJS::AST::Statement *stmt) { - if (QmlJS::AST::ExpressionStatement *eStmt = QmlJS::AST::cast<QmlJS::AST::ExpressionStatement *>(stmt)) { + if (auto eStmt = QmlJS::AST::cast<QmlJS::AST::ExpressionStatement *>(stmt)) { return !eStmt->semicolonToken.isValid(); - } else if (QmlJS::AST::IfStatement *iStmt = QmlJS::AST::cast<QmlJS::AST::IfStatement *>(stmt)) { + } else if (auto iStmt = QmlJS::AST::cast<QmlJS::AST::IfStatement *>(stmt)) { if (iStmt->elseToken.isValid()) return isMissingSemicolon(iStmt->ko); else return isMissingSemicolon(iStmt->ok); - } else if (QmlJS::AST::DebuggerStatement *dStmt = QmlJS::AST::cast<QmlJS::AST::DebuggerStatement *>(stmt)) { + } else if (auto dStmt = QmlJS::AST::cast<QmlJS::AST::DebuggerStatement *>(stmt)) { return !dStmt->semicolonToken.isValid(); } else { return false; @@ -263,8 +263,8 @@ QmlJS::AST::UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(QmlJS::AS { const int objectDefinitionInsertionPoint = propertyOrder.indexOf(PropertyName()); // XXX ???? - QmlJS::AST::UiObjectMemberList *lastObjectDef = 0; - QmlJS::AST::UiObjectMemberList *lastNonObjectDef = 0; + QmlJS::AST::UiObjectMemberList *lastObjectDef = nullptr; + QmlJS::AST::UiObjectMemberList *lastNonObjectDef = nullptr; for (QmlJS::AST::UiObjectMemberList *iter = members; iter; iter = iter->next) { QmlJS::AST::UiObjectMember *member = iter->member; @@ -272,11 +272,11 @@ QmlJS::AST::UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(QmlJS::AS if (QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition*>(member)) lastObjectDef = iter; - else if (QmlJS::AST::UiArrayBinding *arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(member)) + else if (auto arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(member)) idx = propertyOrder.indexOf(toString(arrayBinding->qualifiedId).toUtf8()); - else if (QmlJS::AST::UiObjectBinding *objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(member)) + else if (auto objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(member)) idx = propertyOrder.indexOf(toString(objectBinding->qualifiedId).toUtf8()); - else if (QmlJS::AST::UiScriptBinding *scriptBinding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding*>(member)) + else if (auto scriptBinding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding*>(member)) idx = propertyOrder.indexOf(toString(scriptBinding->qualifiedId).toUtf8()); else if (QmlJS::AST::cast<QmlJS::AST::UiPublicMember*>(member)) idx = propertyOrder.indexOf("property"); @@ -297,20 +297,20 @@ QmlJS::AST::UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(QmlJS::AS const QmlDesigner::PropertyNameList &propertyOrder) { if (!members) - return 0; // empty members + return nullptr; // empty members QHash<QString, QmlJS::AST::UiObjectMemberList *> orderedMembers; for (QmlJS::AST::UiObjectMemberList *iter = members; iter; iter = iter->next) { QmlJS::AST::UiObjectMember *member = iter->member; - if (QmlJS::AST::UiArrayBinding *arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(member)) + if (auto arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(member)) orderedMembers[toString(arrayBinding->qualifiedId)] = iter; - else if (QmlJS::AST::UiObjectBinding *objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(member)) + else if (auto objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(member)) orderedMembers[toString(objectBinding->qualifiedId)] = iter; else if (QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition*>(member)) orderedMembers[QString::null] = iter; - else if (QmlJS::AST::UiScriptBinding *scriptBinding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding*>(member)) + else if (auto scriptBinding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding*>(member)) orderedMembers[toString(scriptBinding->qualifiedId)] = iter; else if (QmlJS::AST::cast<QmlJS::AST::UiPublicMember*>(member)) orderedMembers[QStringLiteral("property")] = iter; @@ -325,11 +325,11 @@ QmlJS::AST::UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(QmlJS::AS for (; idx > 0; --idx) { const QString prop = QString::fromLatin1(propertyOrder.at(idx - 1)); QmlJS::AST::UiObjectMemberList *candidate = orderedMembers.value(prop, 0); - if (candidate != 0) + if (candidate != nullptr) return candidate; } - return 0; + return nullptr; } void QMLRewriter::dump(const ASTPath &path) diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h index af54ba8c13..062710ef4c 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h +++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h @@ -39,7 +39,7 @@ namespace Internal { class QMLRewriter: protected QmlJS::AST::Visitor { public: - typedef QStack<QmlJS::AST::Node *> ASTPath; + using ASTPath = QStack<QmlJS::AST::Node *>; public: QMLRewriter(QmlDesigner::TextModifier &textModifier); diff --git a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp index 20b0e4342b..a61acd0254 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp @@ -81,7 +81,7 @@ void RemovePropertyVisitor::removeFrom(QmlJS::AST::UiObjectInitializer *ast) removeMember(member); // check for grouped properties: } else if (!prefix.isEmpty()) { - if (QmlJS::AST::UiObjectDefinition *def = QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition *>(member)) { + if (auto def = QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition *>(member)) { if (toString(def->qualifiedTypeNameId) == prefix) removeGroupedProperty(def); } @@ -98,7 +98,7 @@ void RemovePropertyVisitor::removeGroupedProperty(QmlJS::AST::UiObjectDefinition const QString propName = propertyName.mid(dotIdx + 1); - QmlJS::AST::UiObjectMember *wanted = 0; + QmlJS::AST::UiObjectMember *wanted = nullptr; unsigned memberCount = 0; for (QmlJS::AST::UiObjectMemberList *it = ast->initializer->members; it; it = it->next) { ++memberCount; @@ -131,13 +131,13 @@ void RemovePropertyVisitor::removeMember(QmlJS::AST::UiObjectMember *member) // FIXME: duplicate code in the QmlJS::Rewriter class, remove this bool RemovePropertyVisitor::memberNameMatchesPropertyName(const QString &propertyName, QmlJS::AST::UiObjectMember *ast) { - if (QmlJS::AST::UiPublicMember *publicMember = QmlJS::AST::cast<QmlJS::AST::UiPublicMember*>(ast)) + if (auto publicMember = QmlJS::AST::cast<QmlJS::AST::UiPublicMember*>(ast)) return publicMember->name == propertyName; - else if (QmlJS::AST::UiObjectBinding *objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(ast)) + else if (auto objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(ast)) return toString(objectBinding->qualifiedId) == propertyName; - else if (QmlJS::AST::UiScriptBinding *scriptBinding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding*>(ast)) + else if (auto scriptBinding = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding*>(ast)) return toString(scriptBinding->qualifiedId) == propertyName; - else if (QmlJS::AST::UiArrayBinding *arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(ast)) + else if (auto arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(ast)) return toString(arrayBinding->qualifiedId) == propertyName; else return false; diff --git a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.h index 7eb8b53fd9..61d5f86241 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.h @@ -40,8 +40,8 @@ public: const QString &name); protected: - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); + bool visit(QmlJS::AST::UiObjectBinding *ast) override; + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; private: void removeFrom(QmlJS::AST::UiObjectInitializer *ast); diff --git a/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp index 06fb1b3087..a7036b25c7 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp @@ -95,7 +95,7 @@ QmlJS::AST::UiArrayBinding *RemoveUIObjectMemberVisitor::containingArray() const return QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(parents[parents.size() - 3]); } - return 0; + return nullptr; } // FIXME: duplicate code in the QmlJS::Rewriter class, remove this @@ -104,7 +104,7 @@ void RemoveUIObjectMemberVisitor::extendToLeadingOrTrailingComma(QmlJS::AST::UiA int &start, int &end) const { - QmlJS::AST::UiArrayMemberList *currentMember = 0; + QmlJS::AST::UiArrayMemberList *currentMember = nullptr; for (QmlJS::AST::UiArrayMemberList *it = parentArray->members; it; it = it->next) { if (it->member == ast) { currentMember = it; diff --git a/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.h b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.h index 6fc4d1d0b3..6f92e927ce 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.h @@ -39,15 +39,15 @@ public: quint32 objectLocation); protected: - virtual bool preVisit(QmlJS::AST::Node *ast); - virtual void postVisit(QmlJS::AST::Node *); + bool preVisit(QmlJS::AST::Node *ast) override; + void postVisit(QmlJS::AST::Node *) override; - virtual bool visit(QmlJS::AST::UiPublicMember *ast); - virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); - virtual bool visit(QmlJS::AST::UiSourceElement *ast); - virtual bool visit(QmlJS::AST::UiObjectBinding *ast); - virtual bool visit(QmlJS::AST::UiScriptBinding *ast); - virtual bool visit(QmlJS::AST::UiArrayBinding *ast); + bool visit(QmlJS::AST::UiPublicMember *ast) override; + bool visit(QmlJS::AST::UiObjectDefinition *ast) override; + bool visit(QmlJS::AST::UiSourceElement *ast) override; + bool visit(QmlJS::AST::UiObjectBinding *ast) override; + bool visit(QmlJS::AST::UiScriptBinding *ast) override; + bool visit(QmlJS::AST::UiArrayBinding *ast) override; private: bool visitObjectMember(QmlJS::AST::UiObjectMember *ast); diff --git a/src/plugins/qmldesigner/designercore/include/abstractproperty.h b/src/plugins/qmldesigner/designercore/include/abstractproperty.h index 65f3f666be..75cb024ccd 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractproperty.h +++ b/src/plugins/qmldesigner/designercore/include/abstractproperty.h @@ -38,9 +38,9 @@ namespace QmlDesigner { class InternalNode; class InternalProperty; - typedef QSharedPointer<InternalNode> InternalNodePointer; - typedef QSharedPointer<InternalProperty> InternalPropertyPointer; - typedef QWeakPointer<InternalNode> InternalNodeWeakPointer; + using InternalNodePointer = QSharedPointer<InternalNode>; + using InternalPropertyPointer = QSharedPointer<InternalProperty>; + using InternalNodeWeakPointer = QWeakPointer<InternalNode>; } class Model; diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h index 610d137acc..4eb4f05666 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractview.h +++ b/src/plugins/qmldesigner/designercore/include/abstractview.h @@ -47,8 +47,8 @@ QT_END_NAMESPACE namespace QmlDesigner { namespace Internal { class InternalNode; - typedef QSharedPointer<InternalNode> InternalNodePointer; - typedef QWeakPointer<InternalNode> InternalNodeWeakPointer; + using InternalNodePointer = QSharedPointer<InternalNode>; + using InternalNodeWeakPointer = QWeakPointer<InternalNode>; } } @@ -69,13 +69,11 @@ class WidgetInfo { public: class ToolBarWidgetFactoryInterface { public: - ToolBarWidgetFactoryInterface() - {} + ToolBarWidgetFactoryInterface() = default; virtual QList<QToolButton*> createToolBarWidgets() = 0; - virtual ~ToolBarWidgetFactoryInterface() - {} + virtual ~ToolBarWidgetFactoryInterface() = default; }; template <class T> diff --git a/src/plugins/qmldesigner/designercore/include/forwardview.h b/src/plugins/qmldesigner/designercore/include/forwardview.h index d317bec793..8d4406b6d2 100644 --- a/src/plugins/qmldesigner/designercore/include/forwardview.h +++ b/src/plugins/qmldesigner/designercore/include/forwardview.h @@ -40,37 +40,37 @@ template <class ViewType> class ForwardView : public AbstractView { public: - typedef QPointer<ForwardView> Pointer; - typedef typename ViewType::Pointer ViewTypePointer; + using Pointer = QPointer<ForwardView<ViewType> >; + using ViewTypePointer = typename ViewType::Pointer; ForwardView(QObject *parent); - void modelAttached(Model *model); - void modelAboutToBeDetached(Model *model); - - void nodeCreated(const ModelNode &createdNode); - void nodeAboutToBeRemoved(const ModelNode &removedNode); - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange); - void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange); - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId); - void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList); - void propertiesRemoved(const QList<AbstractProperty>& propertyList); - void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange); - void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange); - void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange); - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion); + void modelAttached(Model *model) override; + void modelAboutToBeDetached(Model *model) override; + + void nodeCreated(const ModelNode &createdNode) override; + void nodeAboutToBeRemoved(const ModelNode &removedNode) override; + void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) override; + void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) override; + void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override; + void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) override; + void propertiesRemoved(const QList<AbstractProperty>& propertyList) override; + void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) override; + void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) override; + void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) override; + void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override; void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, - const QList<ModelNode> &lastSelectedNodeList); + const QList<ModelNode> &lastSelectedNodeList) override; - void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl); + void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) override; - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex); - void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports); + void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) override; + void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) override; - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data); + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList); + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) override; protected: void appendView(ViewType *view); diff --git a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h index 9cca2ceb7e..aed724e50f 100644 --- a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h +++ b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h @@ -71,7 +71,7 @@ public: ItemLibraryEntry(const ItemLibraryEntry &other); ItemLibraryEntry& operator=(const ItemLibraryEntry &other); - typedef QmlDesigner::PropertyContainer Property; + using Property = QmlDesigner::PropertyContainer; QList<Property> properties() const; QHash<QString, QString> hints() const; diff --git a/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h b/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h index f85ad1e144..4b27e104af 100644 --- a/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h +++ b/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h @@ -34,7 +34,7 @@ namespace QmlDesigner { class IWidgetPlugin { public: - virtual ~IWidgetPlugin() {} + virtual ~IWidgetPlugin() = default; virtual QString metaInfo() const = 0; virtual QString pluginName() const = 0; diff --git a/src/plugins/qmldesigner/designercore/include/metainfo.h b/src/plugins/qmldesigner/designercore/include/metainfo.h index 90d94c324a..cc4e8c1ed0 100644 --- a/src/plugins/qmldesigner/designercore/include/metainfo.h +++ b/src/plugins/qmldesigner/designercore/include/metainfo.h @@ -43,7 +43,7 @@ namespace Internal { class MetaInfoPrivate; class ModelPrivate; class SubComponentManagerPrivate; - typedef QSharedPointer<MetaInfoPrivate> MetaInfoPrivatePointer; + using MetaInfoPrivatePointer = QSharedPointer<MetaInfoPrivate>; } QMLDESIGNERCORE_EXPORT bool operator==(const MetaInfo &first, const MetaInfo &second); diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h index 2f07c2a3d3..efa6731d85 100644 --- a/src/plugins/qmldesigner/designercore/include/model.h +++ b/src/plugins/qmldesigner/designercore/include/model.h @@ -59,7 +59,7 @@ class RewriterView; class NodeInstanceView; class TextModifier; -typedef QList<QPair<PropertyName, QVariant> > PropertyListType; +using PropertyListType = QList<QPair<PropertyName, QVariant> >; class QMLDESIGNERCORE_EXPORT Model : public QObject { diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h index 0f07221fab..c48f079204 100644 --- a/src/plugins/qmldesigner/designercore/include/modelnode.h +++ b/src/plugins/qmldesigner/designercore/include/modelnode.h @@ -42,9 +42,9 @@ namespace Internal { class InternalNode; class InternalProperty; - typedef QSharedPointer<InternalNode> InternalNodePointer; - typedef QSharedPointer<InternalProperty> InternalPropertyPointer; - typedef QWeakPointer<InternalNode> InternalNodeWeakPointer; + using InternalNodePointer = QSharedPointer<InternalNode>; + using InternalPropertyPointer = QSharedPointer<InternalProperty>; + using InternalNodeWeakPointer = QWeakPointer<InternalNode>; } class NodeMetaInfo; class AbstractProperty; @@ -60,7 +60,7 @@ class ModelNode; QMLDESIGNERCORE_EXPORT QList<Internal::InternalNodePointer> toInternalNodeList(const QList<ModelNode> &nodeList); -typedef QList<QPair<PropertyName, QVariant> > PropertyListType; +using PropertyListType = QList<QPair<PropertyName, QVariant> >; class QMLDESIGNERCORE_EXPORT ModelNode { diff --git a/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h b/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h index fa0460f771..1386b4265e 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h +++ b/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h @@ -31,7 +31,7 @@ namespace QmlDesigner { namespace Internal { class InternalNodeAbstractProperty; - typedef QSharedPointer<InternalNodeAbstractProperty> InternalNodeAbstractPropertyPointer; + using InternalNodeAbstractPropertyPointer = QSharedPointer<InternalNodeAbstractProperty>; } class QMLDESIGNERCORE_EXPORT NodeAbstractProperty : public AbstractProperty diff --git a/src/plugins/qmldesigner/designercore/include/nodeanchors.h b/src/plugins/qmldesigner/designercore/include/nodeanchors.h index efa20cc1a3..cb791f76c3 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeanchors.h +++ b/src/plugins/qmldesigner/designercore/include/nodeanchors.h @@ -38,11 +38,11 @@ namespace QmlDesigner { namespace Internal { class InternalNode; - typedef QSharedPointer<InternalNode> InternalNodePointer; - typedef QWeakPointer<InternalNode> InternalNodeWeakPointer; + using InternalNodePointer = QSharedPointer<InternalNode>; + using InternalNodeWeakPointer = QWeakPointer<InternalNode>; class InternalNodeState; - typedef QSharedPointer<InternalNodeState> InternalNodeStatePointer; + using InternalNodeStatePointer = QSharedPointer<InternalNodeState>; class TextToModelMerger; } diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h index 12f5430cd6..c0e0b41537 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h +++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h @@ -75,7 +75,7 @@ class QMLDESIGNERCORE_EXPORT NodeInstanceView : public AbstractView, public Node friend class NodeInstance; public: - typedef QWeakPointer<NodeInstanceView> Pointer; + using Pointer = QWeakPointer<NodeInstanceView>; explicit NodeInstanceView(QObject *parent = nullptr, NodeInstanceServerInterface::RunModus runModus = NodeInstanceServerInterface::NormalModus); ~NodeInstanceView() override; diff --git a/src/plugins/qmldesigner/designercore/include/nodelistproperty.h b/src/plugins/qmldesigner/designercore/include/nodelistproperty.h index 94af238bef..dc1967efec 100644 --- a/src/plugins/qmldesigner/designercore/include/nodelistproperty.h +++ b/src/plugins/qmldesigner/designercore/include/nodelistproperty.h @@ -36,7 +36,7 @@ namespace QmlDesigner { namespace Internal { class ModelPrivate; class InternalNodeListProperty; - typedef QSharedPointer<InternalNodeListProperty> InternalNodeListPropertyPointer; + using InternalNodeListPropertyPointer = QSharedPointer<InternalNodeListProperty>; } diff --git a/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h b/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h index 8362c39d44..0872c547c8 100644 --- a/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h +++ b/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h @@ -36,11 +36,11 @@ # define QMLDESIGNERCORE_EXPORT Q_DECL_IMPORT #endif namespace QmlDesigner { -typedef QByteArray PropertyName; -typedef QList<PropertyName> PropertyNameList; -typedef QByteArray TypeName; -typedef QList<PropertyName> PropertyTypeList; -typedef QByteArray IdName; +using PropertyName = QByteArray; +using PropertyNameList = QList<PropertyName>; +using TypeName = QByteArray; +using PropertyTypeList = QList<PropertyName>; +using IdName = QByteArray; enum AnchorLineType { AnchorLineInvalid = 0x0, diff --git a/src/plugins/qmldesigner/designercore/include/textmodifier.h b/src/plugins/qmldesigner/designercore/include/textmodifier.h index 150545e7e8..617d0b9b7b 100644 --- a/src/plugins/qmldesigner/designercore/include/textmodifier.h +++ b/src/plugins/qmldesigner/designercore/include/textmodifier.h @@ -58,7 +58,7 @@ public: }; public: - TextModifier() {} + TextModifier() = default; ~TextModifier() override = 0; virtual void replace(int offset, int length, const QString& replacement) = 0; diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp index 6589ceb875..f857ccf2b3 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp @@ -87,9 +87,7 @@ public: QHash<PropertyName, QPair<PropertyName, qint32> > anchors; }; -NodeInstance::NodeInstance() -{ -} +NodeInstance::NodeInstance() = default; NodeInstance::NodeInstance(ProxyNodeInstanceData *dPointer) : d(dPointer) @@ -98,27 +96,18 @@ NodeInstance::NodeInstance(ProxyNodeInstanceData *dPointer) NodeInstance NodeInstance::create(const ModelNode &node) { - ProxyNodeInstanceData *d = new ProxyNodeInstanceData; + auto d = new ProxyNodeInstanceData; d->modelNode = node; return NodeInstance(d); } -NodeInstance::~NodeInstance() -{ -} +NodeInstance::~NodeInstance() = default; -NodeInstance::NodeInstance(const NodeInstance &other) - : d(other.d) -{ -} +NodeInstance::NodeInstance(const NodeInstance &other) = default; -NodeInstance &NodeInstance::operator=(const NodeInstance &other) -{ - d = other.d; - return *this; -} +NodeInstance &NodeInstance::operator=(const NodeInstance &other) = default; ModelNode NodeInstance::modelNode() const { diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index cadd15c47c..c75c8a6401 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -337,7 +337,7 @@ QString NodeInstanceServerProxy::qrcMappingString() const if (rewriterView) { QString mappingString; - typedef QPair<QString, QString> StringPair; + using StringPair = QPair<QString, QString>; foreach (const StringPair &pair, rewriterView->qrcMapping()) { if (!mappingString.isEmpty()) @@ -406,7 +406,7 @@ void NodeInstanceServerProxy::writeCommand(const QVariant &command) void NodeInstanceServerProxy::processFinished(int exitCode, QProcess::ExitStatus exitStatus) { - QProcess* finishedProcess = qobject_cast<QProcess*>(sender()); + auto finishedProcess = qobject_cast<QProcess*>(sender()); if (finishedProcess) qWarning() << "Process" << (exitStatus == QProcess::CrashExit ? "crashed:" : "finished:") << finishedProcess->arguments() << "exitCode:" << exitCode; else diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index 6c3becde43..6829933cfe 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -121,7 +121,7 @@ NodeInstanceView::~NodeInstanceView() { removeAllInstanceNodeRelationships(); delete nodeInstanceServer(); - m_currentKit = 0; + m_currentKit = nullptr; } //\{ diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index 91533db5c8..8962310ffb 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -144,7 +144,7 @@ bool PuppetCreator::useOnlyFallbackPuppet() const if (!m_kit || !m_kit->isValid()) qWarning() << "Invalid kit for QML puppet"; return m_designerSettings.value(DesignerSettingsKey::USE_ONLY_FALLBACK_PUPPET - ).toBool() || m_kit == 0 || !m_kit->isValid(); + ).toBool() || m_kit == nullptr || !m_kit->isValid(); #else return true; #endif diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp index 4183af4b1f..0d6015e97c 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp @@ -59,10 +59,7 @@ public: // ItemLibraryEntry // -ItemLibraryEntry::ItemLibraryEntry(const ItemLibraryEntry &other) - : m_data(other.m_data) -{ -} +ItemLibraryEntry::ItemLibraryEntry(const ItemLibraryEntry &other) = default; ItemLibraryEntry& ItemLibraryEntry::operator=(const ItemLibraryEntry &other) { @@ -97,9 +94,7 @@ ItemLibraryEntry::ItemLibraryEntry() : m_data(new Internal::ItemLibraryEntryData m_data->name.clear(); } -ItemLibraryEntry::~ItemLibraryEntry() -{ -} +ItemLibraryEntry::~ItemLibraryEntry() = default; QString ItemLibraryEntry::name() const { diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp index aca9535055..14f1982b72 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp @@ -120,10 +120,7 @@ properties. /*! Constructs a copy of \a metaInfo. */ -MetaInfo::MetaInfo(const MetaInfo &metaInfo) : - m_p(metaInfo.m_p) -{ -} +MetaInfo::MetaInfo(const MetaInfo &metaInfo) = default; /*! Creates a meta information object with just the QML types registered statically. @@ -138,19 +135,13 @@ MetaInfo::MetaInfo() : { } -MetaInfo::~MetaInfo() -{ -} +MetaInfo::~MetaInfo() = default; /*! Assigns \a other to this meta information and returns a reference to this meta information. */ -MetaInfo& MetaInfo::operator=(const MetaInfo &other) -{ - m_p = other.m_p; - return *this; -} +MetaInfo& MetaInfo::operator=(const MetaInfo &other) = default; ItemLibraryInfo *MetaInfo::itemLibraryInfo() const { diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 40c9063a1b..a7f151d6e9 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -77,7 +77,7 @@ namespace Internal { using namespace QmlJS; -typedef QPair<PropertyName, TypeName> PropertyInfo; +using PropertyInfo = QPair<PropertyName, TypeName>; QVector<PropertyInfo> getObjectTypes(const ObjectValue *ov, const ContextPtr &context, bool local = false, int rec = 0); @@ -350,7 +350,7 @@ static inline bool isValueType(const QString &type) const CppComponentValue *findQmlPrototype(const ObjectValue *ov, const ContextPtr &context) { if (!ov) - return 0; + return nullptr; const CppComponentValue * qmlValue = value_cast<CppComponentValue>(ov); if (qmlValue) @@ -517,9 +517,9 @@ QVector<PropertyInfo> getObjectTypes(const ObjectValue *objectValue, const Conte class NodeMetaInfoPrivate { public: - typedef QSharedPointer<NodeMetaInfoPrivate> Pointer; + using Pointer = QSharedPointer<NodeMetaInfoPrivate>; NodeMetaInfoPrivate() = default; - ~NodeMetaInfoPrivate() {} + ~NodeMetaInfoPrivate() = default; bool isValid() const; bool isFileComponent() const; @@ -723,7 +723,7 @@ const CppComponentValue *NodeMetaInfoPrivate::getCppComponentValue() const { const QList<TypeName> nameComponents = m_qualfiedTypeName.split('.'); if (nameComponents.size() < 2) - return 0; + return nullptr; const TypeName &type = nameComponents.constLast(); TypeName module; @@ -784,14 +784,14 @@ ContextPtr NodeMetaInfoPrivate::context() const { if (m_model && m_model->rewriterView() && m_model->rewriterView()->scopeChain()) return m_model->rewriterView()->scopeChain()->context(); - return ContextPtr(0); + return ContextPtr(nullptr); } const Document *NodeMetaInfoPrivate::document() const { if (m_model && m_model->rewriterView()) return m_model->rewriterView()->document(); - return 0; + return nullptr; } void NodeMetaInfoPrivate::setupLocalPropertyInfo(const QVector<PropertyInfo> &localPropertyInfos) @@ -963,7 +963,7 @@ QString NodeMetaInfoPrivate::propertyEnumScope(const PropertyName &propertyName) const CppComponentValue *qmlObjectValue = getNearestCppComponentValue(); if (!qmlObjectValue) return QString(); - const CppComponentValue *definedIn = 0; + const CppComponentValue *definedIn = nullptr; qmlObjectValue->getEnum(QString::fromUtf8(propertyType(propertyName)), &definedIn); if (definedIn) { QString nonCppPackage; @@ -1322,14 +1322,9 @@ NodeMetaInfo::NodeMetaInfo(Model *model, TypeName type, int maj, int min) : m_pr } -NodeMetaInfo::~NodeMetaInfo() -{ -} +NodeMetaInfo::~NodeMetaInfo() = default; -NodeMetaInfo::NodeMetaInfo(const NodeMetaInfo &other) - : m_privateData(other.m_privateData) -{ -} +NodeMetaInfo::NodeMetaInfo(const NodeMetaInfo &other) = default; NodeMetaInfo &NodeMetaInfo::operator=(const NodeMetaInfo &other) { diff --git a/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp b/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp index 40a9d75776..c6602a3bc7 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp @@ -79,27 +79,11 @@ AbstractProperty::AbstractProperty(const AbstractProperty &property, AbstractVie } -AbstractProperty::~AbstractProperty() -{ -} +AbstractProperty::~AbstractProperty() = default; -AbstractProperty::AbstractProperty(const AbstractProperty &other) - : m_propertyName(other.m_propertyName), - m_internalNode(other.m_internalNode), - m_model(other.m_model), - m_view(other.m_view) -{ -} +AbstractProperty::AbstractProperty(const AbstractProperty &other) = default; -AbstractProperty& AbstractProperty::operator=(const AbstractProperty &other) -{ - m_propertyName = other.m_propertyName; - m_internalNode = other.m_internalNode; - m_model = other.m_model; - m_view = other.m_view; - - return *this; -} +AbstractProperty& AbstractProperty::operator=(const AbstractProperty &other) = default; Internal::InternalNodePointer AbstractProperty::internalNode() const { diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp index ab7195a940..9c4b768535 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp @@ -68,7 +68,7 @@ AbstractView::~AbstractView() */ void AbstractView::setModel(Model *model) { - Q_ASSERT(model != 0); + Q_ASSERT(model != nullptr); if (model == m_model.data()) return; @@ -525,7 +525,7 @@ NodeInstanceView *AbstractView::nodeInstanceView() const if (model()) return model()->d->nodeInstanceView(); else - return 0; + return nullptr; } RewriterView *AbstractView::rewriterView() const @@ -533,7 +533,7 @@ RewriterView *AbstractView::rewriterView() const if (model()) return model()->d->rewriterView(); else - return 0; + return nullptr; } void AbstractView::resetView() diff --git a/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp index 6204d670b5..17babff675 100644 --- a/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp +++ b/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp @@ -47,7 +47,7 @@ void BaseTextEditModifier::indentLines(int startLine, int endLine) { if (startLine < 0) return; - TextEditor::TextEditorWidget *baseTextEditorWidget = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit()); + auto baseTextEditorWidget = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit()); if (!baseTextEditorWidget) return; @@ -82,7 +82,7 @@ void BaseTextEditModifier::indent(int offset, int length) int BaseTextEditModifier::indentDepth() const { - if (TextEditor::TextEditorWidget *bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) + if (auto bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) return bte->textDocument()->tabSettings().m_indentSize; else return 0; @@ -90,9 +90,8 @@ int BaseTextEditModifier::indentDepth() const bool BaseTextEditModifier::renameId(const QString &oldId, const QString &newId) { - if (TextEditor::TextEditorWidget *bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) { - if (QmlJSEditor::QmlJSEditorDocument *document - = qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(bte->textDocument())) { + if (auto bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) { + if (auto document = qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(bte->textDocument())) { Utils::ChangeSet changeSet; foreach (const QmlJS::AST::SourceLocation &loc, document->semanticInfo().idLocations.value(oldId)) { @@ -108,7 +107,7 @@ bool BaseTextEditModifier::renameId(const QString &oldId, const QString &newId) static QmlJS::AST::UiObjectDefinition *getObjectDefinition(QList<QmlJS::AST::Node *> path, QmlJS::AST::UiQualifiedId *qualifiedId) { - QmlJS::AST::UiObjectDefinition *object = 0; + QmlJS::AST::UiObjectDefinition *object = nullptr; for (int i = path.size() - 1; i >= 0; --i) { auto node = path.at(i); if (auto objDef = QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition *>(node)) { @@ -121,11 +120,11 @@ static QmlJS::AST::UiObjectDefinition *getObjectDefinition(QList<QmlJS::AST::Nod bool BaseTextEditModifier::moveToComponent(int nodeOffset) { - if (TextEditor::TextEditorWidget *bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) { - if (QmlJSEditor::QmlJSEditorDocument *document + if (auto bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) { + if (auto document = qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(bte->textDocument())) { - auto *qualifiedId = QmlJS::AST::cast<QmlJS::AST::UiQualifiedId *>(document->semanticInfo().astNodeAt(nodeOffset)); + auto qualifiedId = QmlJS::AST::cast<QmlJS::AST::UiQualifiedId *>(document->semanticInfo().astNodeAt(nodeOffset)); QList<QmlJS::AST::Node *> path = document->semanticInfo().rangePath(nodeOffset); QmlJS::AST::UiObjectDefinition *object = getObjectDefinition(path, qualifiedId); @@ -141,8 +140,8 @@ bool BaseTextEditModifier::moveToComponent(int nodeOffset) QStringList BaseTextEditModifier::autoComplete(QTextDocument *textDocument, int position, bool explicitComplete) { - if (TextEditor::TextEditorWidget *bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) - if (QmlJSEditor::QmlJSEditorDocument *document + if (auto bte = qobject_cast<TextEditor::TextEditorWidget*>(plainTextEdit())) + if (auto document = qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(bte->textDocument())) return QmlJSEditor::qmlJSAutoComplete(textDocument, position, diff --git a/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp index fe8ebe1729..ebd3c7c709 100644 --- a/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp @@ -43,9 +43,7 @@ bool compareBindingProperties(const QmlDesigner::BindingProperty &bindingPropert return true; } -BindingProperty::BindingProperty() -{ -} +BindingProperty::BindingProperty() = default; BindingProperty::BindingProperty(const BindingProperty &property, AbstractView *view) : AbstractProperty(property.name(), property.internalNode(), property.model(), view) diff --git a/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp b/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp index f104842995..1d500b8496 100644 --- a/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp +++ b/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp @@ -39,9 +39,7 @@ ComponentTextModifier::ComponentTextModifier(TextModifier *originalModifier, int connect(m_originalModifier, &TextModifier::moved, this, &TextModifier::moved); } -ComponentTextModifier::~ComponentTextModifier() -{ -} +ComponentTextModifier::~ComponentTextModifier() = default; void ComponentTextModifier::replace(int offset, int length, const QString& replacement) { diff --git a/src/plugins/qmldesigner/designercore/model/import.cpp b/src/plugins/qmldesigner/designercore/model/import.cpp index 0ea54ef983..7b9c2c56c4 100644 --- a/src/plugins/qmldesigner/designercore/model/import.cpp +++ b/src/plugins/qmldesigner/designercore/model/import.cpp @@ -29,9 +29,7 @@ namespace QmlDesigner { -Import::Import() -{ -} +Import::Import() = default; Import Import::createLibraryImport(const QString &url, const QString &version, const QString &alias, const QStringList &importPaths) { diff --git a/src/plugins/qmldesigner/designercore/model/internalbindingproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalbindingproperty.cpp index df054b152f..4853c8a626 100644 --- a/src/plugins/qmldesigner/designercore/model/internalbindingproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalbindingproperty.cpp @@ -36,7 +36,7 @@ InternalBindingProperty::InternalBindingProperty(const PropertyName &name, const InternalBindingProperty::Pointer InternalBindingProperty::create(const PropertyName &name, const InternalNodePointer &propertyOwner) { - InternalBindingProperty *newPointer(new InternalBindingProperty(name, propertyOwner)); + auto newPointer(new InternalBindingProperty(name, propertyOwner)); InternalBindingProperty::Pointer smartPointer(newPointer); newPointer->setInternalWeakPointer(smartPointer); diff --git a/src/plugins/qmldesigner/designercore/model/internalbindingproperty.h b/src/plugins/qmldesigner/designercore/model/internalbindingproperty.h index 5cb82205fa..c1d772b9ac 100644 --- a/src/plugins/qmldesigner/designercore/model/internalbindingproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalbindingproperty.h @@ -33,11 +33,11 @@ namespace Internal { class InternalBindingProperty : public InternalProperty { public: - typedef QSharedPointer<InternalBindingProperty> Pointer; + using Pointer = QSharedPointer<InternalBindingProperty>; static Pointer create(const PropertyName &name, const InternalNodePointer &propertyOwner); - bool isValid() const; + bool isValid() const override; QString expression() const; void setExpression(const QString &expression); @@ -45,7 +45,7 @@ public: void setDynamicExpression(const TypeName &type, const QString &expression); - bool isBindingProperty() const; + bool isBindingProperty() const override; protected: InternalBindingProperty(const PropertyName &name, const InternalNodePointer &propertyOwner); diff --git a/src/plugins/qmldesigner/designercore/model/internalnode.cpp b/src/plugins/qmldesigner/designercore/model/internalnode.cpp index 7e11ab6c3f..1f8b622765 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalnode.cpp @@ -61,7 +61,7 @@ InternalNode::InternalNode(const TypeName &typeName,int majorVersion, int minorV InternalNode::Pointer InternalNode::create(const TypeName &type,int majorVersion, int minorVersion, qint32 internalId) { - InternalNode *newPointer(new InternalNode(type, majorVersion, minorVersion, internalId)); + auto newPointer(new InternalNode(type, majorVersion, minorVersion, internalId)); InternalNode::Pointer smartPointer(newPointer); newPointer->setInternalWeakPointer(smartPointer); diff --git a/src/plugins/qmldesigner/designercore/model/internalnode_p.h b/src/plugins/qmldesigner/designercore/model/internalnode_p.h index 0997c5a4ff..f31039ffc2 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnode_p.h +++ b/src/plugins/qmldesigner/designercore/model/internalnode_p.h @@ -45,16 +45,16 @@ namespace Internal { class InternalProperty; class InternalNode; -typedef QSharedPointer<InternalNode> InternalNodePointer; -typedef QSharedPointer<InternalProperty> InternalPropertyPointer; -typedef QWeakPointer<InternalNode> InternalNodeWeakPointer; +using InternalNodePointer = QSharedPointer<InternalNode>; +using InternalPropertyPointer = QSharedPointer<InternalProperty>; +using InternalNodeWeakPointer = QWeakPointer<InternalNode>; class InternalNode { friend class InternalProperty; public: - typedef QSharedPointer<InternalNode> Pointer; - typedef QWeakPointer<InternalNode> WeakPointer; + using Pointer = QSharedPointer<InternalNode>; + using WeakPointer = QWeakPointer<InternalNode>; explicit InternalNode(); diff --git a/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h b/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h index 0ea7d49eff..ee80cc42da 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h @@ -36,10 +36,10 @@ class InternalNodeAbstractProperty : public InternalProperty friend class InternalNode; public: - typedef QSharedPointer<InternalNodeAbstractProperty> Pointer; - typedef QWeakPointer<InternalNodeAbstractProperty> WeakPointer; + using Pointer = QSharedPointer<InternalNodeAbstractProperty>; + using WeakPointer = QWeakPointer<InternalNodeAbstractProperty>; - bool isNodeAbstractProperty() const; + bool isNodeAbstractProperty() const override; virtual QList<InternalNodePointer> allSubNodes() const = 0; virtual QList<InternalNodePointer> directSubNodes() const = 0; @@ -48,7 +48,7 @@ public: virtual int count() const = 0; virtual int indexOf(const InternalNodePointer &node) const = 0; - virtual bool isValid() const; + bool isValid() const override; using InternalProperty::remove; // keep the virtual remove(...) function around diff --git a/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp index 5d4103b5d8..51f6b3421b 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp @@ -37,7 +37,7 @@ InternalNodeListProperty::InternalNodeListProperty(const PropertyName &name, con InternalNodeListProperty::Pointer InternalNodeListProperty::create(const PropertyName &name, const InternalNodePointer &propertyOwner) { - InternalNodeListProperty *newPointer(new InternalNodeListProperty(name, propertyOwner)); + auto newPointer(new InternalNodeListProperty(name, propertyOwner)); InternalProperty::Pointer smartPointer(newPointer); newPointer->setInternalWeakPointer(smartPointer.toWeakRef()); diff --git a/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.h b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.h index d58e44d08c..b50a144491 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.h @@ -36,28 +36,28 @@ namespace Internal { class InternalNodeListProperty : public InternalNodeAbstractProperty { public: - typedef QSharedPointer<InternalNodeListProperty> Pointer; + using Pointer = QSharedPointer<InternalNodeListProperty>; static Pointer create(const PropertyName &name, const InternalNodePointer &propertyOwner); - bool isValid() const; + bool isValid() const override; - bool isEmpty() const; - int count() const; - int indexOf(const InternalNodePointer &node) const; + bool isEmpty() const override; + int count() const override; + int indexOf(const InternalNodePointer &node) const override; InternalNodePointer at(int index) const; - bool isNodeListProperty() const; + bool isNodeListProperty() const override; - QList<InternalNodePointer> allSubNodes() const; - QList<InternalNodePointer> directSubNodes() const; + QList<InternalNodePointer> allSubNodes() const override; + QList<InternalNodePointer> directSubNodes() const override; const QList<InternalNodePointer> &nodeList() const; void slide(int from, int to); protected: InternalNodeListProperty(const PropertyName &name, const InternalNodePointer &propertyOwner); - void add(const InternalNodePointer &node); - void remove(const InternalNodePointer &node); + void add(const InternalNodePointer &node) override; + void remove(const InternalNodePointer &node) override; private: QList<InternalNodePointer> m_nodeList; diff --git a/src/plugins/qmldesigner/designercore/model/internalnodeproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalnodeproperty.cpp index c2daf83680..7965561344 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodeproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalnodeproperty.cpp @@ -36,7 +36,7 @@ InternalNodeProperty::InternalNodeProperty(const PropertyName &name, const Inter InternalNodeProperty::Pointer InternalNodeProperty::create(const PropertyName &name, const InternalNode::Pointer &propertyOwner) { - InternalNodeProperty *newPointer = new InternalNodeProperty(name, propertyOwner); + auto newPointer = new InternalNodeProperty(name, propertyOwner); InternalNodeProperty::Pointer smartPointer(newPointer); newPointer->setInternalWeakPointer(smartPointer); diff --git a/src/plugins/qmldesigner/designercore/model/internalnodeproperty.h b/src/plugins/qmldesigner/designercore/model/internalnodeproperty.h index 7da520b011..a7bfe58300 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodeproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalnodeproperty.h @@ -33,26 +33,26 @@ namespace Internal { class InternalNodeProperty : public InternalNodeAbstractProperty { public: - typedef QSharedPointer<InternalNodeProperty> Pointer; + using Pointer = QSharedPointer<InternalNodeProperty>; static Pointer create(const PropertyName &name, const InternalNodePointer &propertyOwner); - bool isValid() const; - bool isEmpty() const; - int count() const; - int indexOf(const InternalNodePointer &node) const; - bool isNodeProperty() const; + bool isValid() const override; + bool isEmpty() const override; + int count() const override; + int indexOf(const InternalNodePointer &node) const override; + bool isNodeProperty() const override; - QList<InternalNodePointer> allSubNodes() const; - QList<InternalNodePointer> directSubNodes() const; + QList<InternalNodePointer> allSubNodes() const override; + QList<InternalNodePointer> directSubNodes() const override; InternalNodePointer node() const; protected: InternalNodeProperty(const PropertyName &name, const InternalNodePointer &node); - void add(const InternalNodePointer &node); - void remove(const InternalNodePointer &node); + void add(const InternalNodePointer &node) override; + void remove(const InternalNodePointer &node) override; private: InternalNodePointer m_node; diff --git a/src/plugins/qmldesigner/designercore/model/internalproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalproperty.cpp index e439435fde..df2e2a2275 100644 --- a/src/plugins/qmldesigner/designercore/model/internalproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalproperty.cpp @@ -36,13 +36,9 @@ namespace QmlDesigner { namespace Internal { // Creates invalid InternalProperty -InternalProperty::InternalProperty() -{ -} +InternalProperty::InternalProperty() = default; -InternalProperty::~InternalProperty() -{ -} +InternalProperty::~InternalProperty() = default; InternalProperty::InternalProperty(const PropertyName &name, const InternalNode::Pointer &propertyOwner) : m_name(name), diff --git a/src/plugins/qmldesigner/designercore/model/internalproperty.h b/src/plugins/qmldesigner/designercore/model/internalproperty.h index df6896bf9a..a8eb5b940c 100644 --- a/src/plugins/qmldesigner/designercore/model/internalproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalproperty.h @@ -42,15 +42,14 @@ class InternalNodeProperty; class InternalNodeAbstractProperty; class InternalNode; -typedef QSharedPointer<InternalNode> InternalNodePointer; -typedef QWeakPointer<InternalNode> InternalNodeWeakPointer; +using InternalNodePointer = QSharedPointer<InternalNode>; +using InternalNodeWeakPointer = QWeakPointer<InternalNode>; class QMLDESIGNERCORE_EXPORT InternalProperty { public: - typedef QSharedPointer<InternalProperty> Pointer; - typedef QWeakPointer<InternalProperty> WeakPointer; - + using Pointer = QSharedPointer<InternalProperty>; + using WeakPointer = QWeakPointer<InternalProperty>; InternalProperty(); virtual ~InternalProperty(); diff --git a/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.cpp index c4c7e91131..08ce26a4c8 100644 --- a/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.cpp @@ -36,7 +36,7 @@ InternalSignalHandlerProperty::InternalSignalHandlerProperty(const PropertyName InternalSignalHandlerProperty::Pointer InternalSignalHandlerProperty::create(const PropertyName &name, const InternalNodePointer &propertyOwner) { - InternalSignalHandlerProperty *newPointer(new InternalSignalHandlerProperty(name, propertyOwner)); + auto newPointer(new InternalSignalHandlerProperty(name, propertyOwner)); InternalSignalHandlerProperty::Pointer smartPointer(newPointer); newPointer->setInternalWeakPointer(smartPointer); diff --git a/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.h b/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.h index c0875f7e5b..9ecf424a54 100644 --- a/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.h @@ -33,16 +33,16 @@ namespace Internal { class InternalSignalHandlerProperty : public InternalProperty { public: - typedef QSharedPointer<InternalSignalHandlerProperty> Pointer; + using Pointer = QSharedPointer<InternalSignalHandlerProperty>; static Pointer create(const PropertyName &name, const InternalNodePointer &propertyOwner); - bool isValid() const; + bool isValid() const override; QString source() const; void setSource(const QString &source); - bool isSignalHandlerProperty() const; + bool isSignalHandlerProperty() const override; protected: InternalSignalHandlerProperty(const PropertyName &name, const InternalNodePointer &propertyOwner); diff --git a/src/plugins/qmldesigner/designercore/model/internalvariantproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalvariantproperty.cpp index ac02030b50..3354a6312d 100644 --- a/src/plugins/qmldesigner/designercore/model/internalvariantproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalvariantproperty.cpp @@ -35,7 +35,7 @@ InternalVariantProperty::InternalVariantProperty(const PropertyName &name, const InternalVariantProperty::Pointer InternalVariantProperty::create(const PropertyName &name, const InternalNodePointer &propertyOwner) { - InternalVariantProperty *newPointer(new InternalVariantProperty(name, propertyOwner)); + auto newPointer(new InternalVariantProperty(name, propertyOwner)); InternalVariantProperty::Pointer smartPointer(newPointer); newPointer->setInternalWeakPointer(smartPointer); diff --git a/src/plugins/qmldesigner/designercore/model/internalvariantproperty.h b/src/plugins/qmldesigner/designercore/model/internalvariantproperty.h index 6edfe7a492..481770d15e 100644 --- a/src/plugins/qmldesigner/designercore/model/internalvariantproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalvariantproperty.h @@ -33,18 +33,18 @@ namespace Internal { class InternalVariantProperty : public InternalProperty { public: - typedef QSharedPointer<InternalVariantProperty> Pointer; + using Pointer = QSharedPointer<InternalVariantProperty>; static Pointer create(const PropertyName &name, const InternalNodePointer &propertyOwner); - bool isValid() const; + bool isValid() const override; QVariant value() const; void setValue(const QVariant &value); void setDynamicValue(const TypeName &type, const QVariant &value); - bool isVariantProperty() const; + bool isVariantProperty() const override; protected: InternalVariantProperty(const PropertyName &name, const InternalNodePointer &propertyOwner); diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp index 5f5798b01e..f8cb347ba6 100644 --- a/src/plugins/qmldesigner/designercore/model/model.cpp +++ b/src/plugins/qmldesigner/designercore/model/model.cpp @@ -113,7 +113,7 @@ void ModelPrivate::detachAllViews() Model *ModelPrivate::create(const TypeName &type, int major, int minor, Model *metaInfoPropxyModel) { - Model *model = new Model; + auto model = new Model; model->d->m_metaInfoProxyModel = metaInfoPropxyModel; model->d->rootNode()->setType(type); @@ -229,7 +229,7 @@ InternalNode::Pointer ModelPrivate::createNode(const TypeName &typeName, InternalNode::Pointer newInternalNodePointer = InternalNode::create(typeName, majorVersion, minorVersion, internalId); newInternalNodePointer->setNodeSourceType(nodeSourceType); - typedef QPair<PropertyName, QVariant> PropertyPair; + using PropertyPair = QPair<PropertyName, QVariant>; foreach (const PropertyPair &propertyPair, propertyList) { newInternalNodePointer->addVariantProperty(propertyPair.first); @@ -368,7 +368,7 @@ void ModelPrivate::notifyAuxiliaryDataChanged(const InternalNodePointer &interna } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode node(internalNode, model(), view.data()); view->auxiliaryDataChanged(node, name, data); @@ -399,7 +399,7 @@ void ModelPrivate::notifyNodeSourceChanged(const InternalNodePointer &internalNo } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode node(internalNode, model(), view.data()); view->nodeSourceChanged(node, newNodeSource); @@ -431,7 +431,7 @@ void ModelPrivate::notifyRootNodeTypeChanged(const QString &type, int majorVersi nodeInstanceView()->rootNodeTypeChanged(type, majorVersion, minorVersion); foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->rootNodeTypeChanged(type, majorVersion, minorVersion); } @@ -444,9 +444,9 @@ void ModelPrivate::notifyInstancePropertyChange(const QList<QPair<ModelNode, Pro { // no need to notify the rewriter or the instance view - typedef QPair<ModelNode, PropertyName> ModelNodePropertyPair; + using ModelNodePropertyPair = QPair<ModelNode, PropertyName>; foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); QList<QPair<ModelNode, PropertyName> > adaptedPropertyList; foreach (const ModelNodePropertyPair &propertyPair, propertyPairList) { @@ -464,7 +464,7 @@ void ModelPrivate::notifyInstanceErrorChange(const QVector<qint32> &instanceIds) QVector<ModelNode> errorNodeList; foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); foreach (qint32 instanceId, instanceIds) errorNodeList.append(ModelNode(model()->d->nodeForInternalId(instanceId), model(), view)); view->instanceErrorChanged(errorNodeList); @@ -487,7 +487,7 @@ void ModelPrivate::notifyInstancesCompleted(const QVector<ModelNode> &nodeVector } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->instancesCompleted(toModelNodeVector(internalVector, view.data())); } @@ -525,7 +525,7 @@ void ModelPrivate::notifyInstancesInformationsChange(const QMultiHash<ModelNode, } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->instanceInformationsChanged(convertModelNodeInformationHash(informationChangeHash, view.data())); } @@ -552,7 +552,7 @@ void ModelPrivate::notifyInstancesRenderImageChanged(const QVector<ModelNode> &n } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->instancesRenderImageChanged(toModelNodeVector(internalVector, view.data())); } @@ -579,7 +579,7 @@ void ModelPrivate::notifyInstancesPreviewImageChanged(const QVector<ModelNode> & } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->instancesPreviewImageChanged(toModelNodeVector(internalVector, view.data())); } @@ -606,7 +606,7 @@ void ModelPrivate::notifyInstancesChildrenChanged(const QVector<ModelNode> &node } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->instancesChildrenChanged(toModelNodeVector(internalVector, view.data())); } @@ -633,7 +633,7 @@ void ModelPrivate::notifyCurrentStateChanged(const ModelNode &node) } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->currentStateChanged(ModelNode(node.internalNode(), model(), view.data())); } @@ -660,7 +660,7 @@ void ModelPrivate::notifyCurrentTimelineChanged(const ModelNode &node) } for (const QPointer<AbstractView> &view : m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->currentTimelineChanged(ModelNode(node.internalNode(), model(), view.data())); } @@ -685,7 +685,7 @@ void ModelPrivate::notifyRewriterBeginTransaction() } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->rewriterBeginTransaction(); } @@ -710,7 +710,7 @@ void ModelPrivate::notifyRewriterEndTransaction() } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->rewriterEndTransaction(); } @@ -738,7 +738,7 @@ void ModelPrivate::notifyInstanceToken(const QString &token, int number, const Q } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->instancesToken(token, number, toModelNodeVector(internalVector, view.data())); } @@ -765,7 +765,7 @@ void ModelPrivate::notifyCustomNotification(const AbstractView *senderView, cons } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->customNotification(senderView, identifier, toModelNodeList(internalList, view.data()), data); } @@ -809,7 +809,7 @@ void ModelPrivate::notifyPropertiesRemoved(const QList<PropertyPair> &propertyPa foreach (const QPointer<AbstractView> &view, m_viewList) { QList<AbstractProperty> propertyList; - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); foreach (const PropertyPair &propertyPair, propertyPairList) { AbstractProperty newProperty(propertyPair.second, propertyPair.first, model(), view.data()); propertyList.append(newProperty); @@ -844,7 +844,7 @@ void ModelPrivate::notifyPropertiesAboutToBeRemoved(const QList<InternalProperty foreach (const QPointer<AbstractView> &view, m_viewList) { QList<AbstractProperty> propertyList; - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); foreach (const InternalProperty::Pointer &property, internalPropertyList) { AbstractProperty newProperty(property->name(), property->propertyOwner(), model(), view.data()); propertyList.append(newProperty); @@ -932,7 +932,7 @@ void ModelPrivate::notifyNodeCreated(const InternalNode::Pointer &newInternalNod } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode createdNode(newInternalNodePointer, model(), view.data()); view->nodeCreated(createdNode); } @@ -957,7 +957,7 @@ void ModelPrivate::notifyNodeAboutToBeRemoved(const InternalNode::Pointer &inter } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode modelNode(internalNodePointer, model(), view.data()); view->nodeAboutToBeRemoved(modelNode); } @@ -997,7 +997,7 @@ void ModelPrivate::notifyNodeRemoved(const InternalNodePointer &internalNodePoin } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode modelNode(internalNodePointer, model(), view.data()); NodeAbstractProperty parentProperty(parentPropertyName, parentNodePointer, model(), view.data()); view->nodeRemoved(modelNode, parentProperty, propertyChange); @@ -1024,7 +1024,7 @@ void ModelPrivate::notifyNodeTypeChanged(const InternalNodePointer &internalNode } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode modelNode(internalNodePointer, model(), view.data()); view->nodeTypeChanged(modelNode, type, majorVersion, minorVersion); } @@ -1055,7 +1055,7 @@ void ModelPrivate::notifyNodeIdChanged(const InternalNode::Pointer& internalNode } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode modelNode(internalNodePointer, model(), view.data()); view->nodeIdChanged(modelNode, newId, oldId); } @@ -1089,7 +1089,7 @@ void ModelPrivate::notifyBindingPropertiesChanged(const QList<InternalBindingPro } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); QList<BindingProperty> propertyList; foreach (const InternalBindingPropertyPointer &bindingProperty, internalPropertyList) { propertyList.append(BindingProperty(bindingProperty->name(), bindingProperty->propertyOwner(), model(), view.data())); @@ -1130,7 +1130,7 @@ void ModelPrivate::notifySignalHandlerPropertiesChanged(const QVector<InternalSi } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); QVector<SignalHandlerProperty> propertyList; foreach (const InternalSignalHandlerPropertyPointer &signalHandlerProperty, internalPropertyList) { propertyList.append(SignalHandlerProperty(signalHandlerProperty->name(), signalHandlerProperty->propertyOwner(), model(), view.data())); @@ -1172,7 +1172,7 @@ void ModelPrivate::notifyScriptFunctionsChanged(const InternalNodePointer &inter } foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); ModelNode node(internalNodePointer, model(), view.data()); view->scriptFunctionsChanged(node, scriptFunctionList); @@ -1210,7 +1210,7 @@ void ModelPrivate::notifyVariantPropertiesChanged(const InternalNodePointer &int foreach (const QPointer<AbstractView> &view, m_viewList) { QList<VariantProperty> propertyList; - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); foreach (const PropertyName &propertyName, propertyNameList) { VariantProperty property(propertyName, internalNodePointer, model(), view.data()); propertyList.append(property); @@ -1470,7 +1470,7 @@ void ModelPrivate::changeSelectedNodes(const QList<InternalNode::Pointer> &newSe const QList<InternalNode::Pointer> &oldSelectedNodeList) { foreach (const QPointer<AbstractView> &view, m_viewList) { - Q_ASSERT(view != 0); + Q_ASSERT(view != nullptr); view->selectedNodesChanged(toModelNodeList(newSelectedNodeList, view.data()), toModelNodeList(oldSelectedNodeList, view.data())); } } @@ -2094,7 +2094,7 @@ The view is informed that it has been registered within the model by a call to A void Model::attachView(AbstractView *view) { // Internal::WriteLocker locker(d); - RewriterView *castedRewriterView = qobject_cast<RewriterView*>(view); + auto castedRewriterView = qobject_cast<RewriterView*>(view); if (castedRewriterView) { if (rewriterView() == castedRewriterView) return; @@ -2103,7 +2103,7 @@ void Model::attachView(AbstractView *view) return; } - NodeInstanceView *nodeInstanceView = qobject_cast<NodeInstanceView*>(view); + auto nodeInstanceView = qobject_cast<NodeInstanceView*>(view); if (nodeInstanceView) return; @@ -2123,11 +2123,11 @@ void Model::detachView(AbstractView *view, ViewNotification emitDetachNotify) // Internal::WriteLocker locker(d); bool emitNotify = (emitDetachNotify == NotifyView); - RewriterView *rewriterView = qobject_cast<RewriterView*>(view); + auto rewriterView = qobject_cast<RewriterView*>(view); if (rewriterView) return; - NodeInstanceView *nodeInstanceView = qobject_cast<NodeInstanceView*>(view); + auto nodeInstanceView = qobject_cast<NodeInstanceView*>(view); if (nodeInstanceView) return; diff --git a/src/plugins/qmldesigner/designercore/model/model_p.h b/src/plugins/qmldesigner/designercore/model/model_p.h index 08c6507630..dd29d25e51 100644 --- a/src/plugins/qmldesigner/designercore/model/model_p.h +++ b/src/plugins/qmldesigner/designercore/model/model_p.h @@ -56,15 +56,14 @@ class InternalVariantProperty; class InternalNodeAbstractProperty; class InternalNodeListProperty; -typedef QSharedPointer<InternalNode> InternalNodePointer; -typedef QSharedPointer<InternalProperty> InternalPropertyPointer; -typedef QSharedPointer<InternalBindingProperty> InternalBindingPropertyPointer; -typedef QSharedPointer<InternalSignalHandlerProperty> InternalSignalHandlerPropertyPointer; -typedef QSharedPointer<InternalVariantProperty> InternalVariantPropertyPointer; -typedef QSharedPointer<InternalNodeAbstractProperty> InternalNodeAbstractPropertyPointer; -typedef QSharedPointer<InternalNodeListProperty> InternalNodeListPropertyPointer; -typedef QPair<InternalNodePointer, PropertyName> PropertyPair; - +using InternalNodePointer = QSharedPointer<InternalNode>; +using InternalPropertyPointer = QSharedPointer<InternalProperty>; +using InternalBindingPropertyPointer = QSharedPointer<InternalBindingProperty>; +using InternalSignalHandlerPropertyPointer = QSharedPointer<InternalSignalHandlerProperty>; +using InternalVariantPropertyPointer = QSharedPointer<InternalVariantProperty>; +using InternalNodeAbstractPropertyPointer = QSharedPointer<InternalNodeAbstractProperty>; +using InternalNodeListPropertyPointer = QSharedPointer<InternalNodeListProperty>; +using PropertyPair = QPair<InternalNodePointer, PropertyName>; class ModelPrivate; @@ -88,7 +87,7 @@ class ModelPrivate : public QObject { public: ModelPrivate(Model *model); - ~ModelPrivate(); + ~ModelPrivate() override; static Model *create(const TypeName &type, int major, int minor, Model *metaInfoPropxyModel); diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp index 7a80390d85..e6610102b7 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp @@ -103,27 +103,13 @@ ModelNode::ModelNode(): } -ModelNode::ModelNode(const ModelNode &other): - m_internalNode(other.m_internalNode), - m_model(other.m_model), - m_view(other.m_view) -{ -} +ModelNode::ModelNode(const ModelNode &other) = default; -ModelNode& ModelNode::operator=(const ModelNode &other) -{ - this->m_model = other.m_model; - this->m_internalNode = other.m_internalNode; - this->m_view = other.m_view; - - return *this; -} +ModelNode& ModelNode::operator=(const ModelNode &other) = default; /*! \brief does nothing */ -ModelNode::~ModelNode() -{ -} +ModelNode::~ModelNode() = default; /*! \brief returns the name of node which is a short cut to a property like objectName \return name of the node diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h index 582a78542f..98dd7c7a90 100644 --- a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h +++ b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h @@ -36,7 +36,7 @@ namespace Internal { class ModelToTextMerger { - typedef AbstractView::PropertyChangeFlags PropertyChangeFlags; + using PropertyChangeFlags = AbstractView::PropertyChangeFlags; public: ModelToTextMerger(RewriterView *reWriterView); diff --git a/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp b/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp index 27b5a5c746..b9c1fb7075 100644 --- a/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp @@ -35,9 +35,7 @@ namespace QmlDesigner { -NodeAbstractProperty::NodeAbstractProperty() -{ -} +NodeAbstractProperty::NodeAbstractProperty() = default; NodeAbstractProperty::NodeAbstractProperty(const NodeAbstractProperty &property, AbstractView *view) : AbstractProperty(property.name(), property.internalNode(), property.model(), view) diff --git a/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp b/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp index d4735160c5..84864e5e51 100644 --- a/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp @@ -36,8 +36,7 @@ namespace QmlDesigner { -NodeListProperty::NodeListProperty() -{} +NodeListProperty::NodeListProperty() = default; NodeListProperty::NodeListProperty(const NodeListProperty &property, AbstractView *view) : NodeAbstractProperty(property.name(), property.internalNode(), property.model(), view) diff --git a/src/plugins/qmldesigner/designercore/model/nodeproperty.cpp b/src/plugins/qmldesigner/designercore/model/nodeproperty.cpp index 2d262c2ab6..d33af251d1 100644 --- a/src/plugins/qmldesigner/designercore/model/nodeproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/nodeproperty.cpp @@ -33,9 +33,7 @@ namespace QmlDesigner { -NodeProperty::NodeProperty() -{ -} +NodeProperty::NodeProperty() = default; NodeProperty::NodeProperty(const PropertyName &propertyName, const Internal::InternalNodePointer &internalNode, Model* model, AbstractView *view) : NodeAbstractProperty(propertyName, internalNode, model, view) diff --git a/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp index f6aa4caf1c..f87dc73a2c 100644 --- a/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp +++ b/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp @@ -36,7 +36,7 @@ using namespace Utils; using namespace QmlDesigner; PlainTextEditModifier::PlainTextEditModifier(QPlainTextEdit *textEdit): - m_changeSet(0), + m_changeSet(nullptr), m_textEdit(textEdit), m_changeSignalsEnabled(true), m_pendingChangeSignal(false), @@ -48,9 +48,7 @@ PlainTextEditModifier::PlainTextEditModifier(QPlainTextEdit *textEdit): this, &PlainTextEditModifier::textEditChanged); } -PlainTextEditModifier::~PlainTextEditModifier() -{ -} +PlainTextEditModifier::~PlainTextEditModifier() = default; void PlainTextEditModifier::replace(int offset, int length, const QString &replacement) { @@ -135,7 +133,7 @@ void PlainTextEditModifier::commitGroup() if (m_changeSet) { runRewriting(m_changeSet); delete m_changeSet; - m_changeSet = 0; + m_changeSet = nullptr; } textCursor().endEditBlock(); diff --git a/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp b/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp index e2b80bae0f..ae62b4d0e6 100644 --- a/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp +++ b/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp @@ -35,9 +35,7 @@ using namespace QmlDesigner::Internal; // Creates invalid PropertyContainer -PropertyContainer::PropertyContainer() -{ -} +PropertyContainer::PropertyContainer() = default; PropertyContainer::PropertyContainer(const PropertyName &name, const QString &type, const QVariant &value) : m_name(name), m_type(type), m_value(value) diff --git a/src/plugins/qmldesigner/designercore/model/propertynode.cpp b/src/plugins/qmldesigner/designercore/model/propertynode.cpp index 5d1f502c24..d616c0ac70 100644 --- a/src/plugins/qmldesigner/designercore/model/propertynode.cpp +++ b/src/plugins/qmldesigner/designercore/model/propertynode.cpp @@ -27,8 +27,6 @@ namespace QmlDesigner { -PropertyNode::PropertyNode() -{ -} +PropertyNode::PropertyNode() = default; } // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index f05826945c..0805a437ef 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -69,7 +69,7 @@ static QmlItemNode createQmlItemNodeFromSource(AbstractView *view, const QString textEdit.setPlainText(source); NotIndentingTextEditModifier modifier(&textEdit); - QScopedPointer<RewriterView> rewriterView(new RewriterView(RewriterView::Amend, 0)); + QScopedPointer<RewriterView> rewriterView(new RewriterView(RewriterView::Amend, nullptr)); rewriterView->setCheckSemanticErrors(false); rewriterView->setTextModifier(&modifier); inputModel->setRewriterView(rewriterView.data()); @@ -113,7 +113,7 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibrary int minorVersion = metaInfo.minorVersion(); int majorVersion = metaInfo.majorVersion(); - typedef QPair<PropertyName, QString> PropertyBindingEntry; + using PropertyBindingEntry = QPair<PropertyName, QString>; QList<PropertyBindingEntry> propertyBindingList; if (itemLibraryEntry.qmlSource().isEmpty()) { QList<QPair<PropertyName, QVariant> > propertyPairList; diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp index c63e56a22d..5c02c94676 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp @@ -36,7 +36,7 @@ AbstractView *QmlModelNodeFacade::view() const if (modelNode().isValid()) return modelNode().view(); else - return 0; + return nullptr; } NodeInstanceView *QmlModelNodeFacade::nodeInstanceView(const ModelNode &modelNode) @@ -53,8 +53,7 @@ NodeInstanceView *QmlModelNodeFacade::nodeInstanceView() const QmlModelNodeFacade::QmlModelNodeFacade(const ModelNode &modelNode) : m_modelNode(modelNode) {} -QmlModelNodeFacade::~QmlModelNodeFacade() -{} +QmlModelNodeFacade::~QmlModelNodeFacade() = default; QmlModelNodeFacade::operator ModelNode() const { diff --git a/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp b/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp index 462604e82d..14f18327fe 100644 --- a/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp @@ -40,10 +40,7 @@ namespace QmlDesigner { -QmlTimeline::QmlTimeline() -{ - -} +QmlTimeline::QmlTimeline() = default; QmlTimeline::QmlTimeline(const ModelNode &modelNode) : QmlModelNodeFacade(modelNode) { diff --git a/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframegroup.cpp b/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframegroup.cpp index 86f3815014..9e0b755807 100644 --- a/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframegroup.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframegroup.cpp @@ -38,10 +38,7 @@ namespace QmlDesigner { -QmlTimelineKeyframeGroup::QmlTimelineKeyframeGroup() -{ - -} +QmlTimelineKeyframeGroup::QmlTimelineKeyframeGroup() = default; QmlTimelineKeyframeGroup::QmlTimelineKeyframeGroup(const ModelNode &modelNode) : QmlModelNodeFacade(modelNode) { diff --git a/src/plugins/qmldesigner/designercore/model/rewriteaction.h b/src/plugins/qmldesigner/designercore/model/rewriteaction.h index 4c461e8aea..a4a6a82adc 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriteaction.h +++ b/src/plugins/qmldesigner/designercore/model/rewriteaction.h @@ -50,25 +50,24 @@ public: virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) = 0; virtual QString info() const = 0; - virtual AddImportRewriteAction *asAddImportRewriteAction() { return 0; } - virtual AddPropertyRewriteAction *asAddPropertyRewriteAction() { return 0; } - virtual ChangeIdRewriteAction *asChangeIdRewriteAction() { return 0; } - virtual ChangePropertyRewriteAction *asChangePropertyRewriteAction() { return 0; } - virtual ChangeTypeRewriteAction *asChangeTypeRewriteAction() { return 0; } - virtual RemoveImportRewriteAction * asRemoveImportRewriteAction() { return 0; } - virtual RemoveNodeRewriteAction *asRemoveNodeRewriteAction() { return 0; } - virtual RemovePropertyRewriteAction *asRemovePropertyRewriteAction() { return 0; } - virtual ReparentNodeRewriteAction *asReparentNodeRewriteAction() { return 0; } - virtual MoveNodeRewriteAction *asMoveNodeRewriteAction() { return 0; } - virtual ~RewriteAction() {} + virtual AddImportRewriteAction *asAddImportRewriteAction() { return nullptr; } + virtual AddPropertyRewriteAction *asAddPropertyRewriteAction() { return nullptr; } + virtual ChangeIdRewriteAction *asChangeIdRewriteAction() { return nullptr; } + virtual ChangePropertyRewriteAction *asChangePropertyRewriteAction() { return nullptr; } + virtual ChangeTypeRewriteAction *asChangeTypeRewriteAction() { return nullptr; } + virtual RemoveImportRewriteAction *asRemoveImportRewriteAction() { return nullptr; } + virtual RemoveNodeRewriteAction *asRemoveNodeRewriteAction() { return nullptr; } + virtual RemovePropertyRewriteAction *asRemovePropertyRewriteAction() { return nullptr; } + virtual ReparentNodeRewriteAction *asReparentNodeRewriteAction() { return nullptr; } + virtual MoveNodeRewriteAction *asMoveNodeRewriteAction() { return nullptr; } + virtual ~RewriteAction() = default; protected: - RewriteAction() - {} + RewriteAction() = default; -private: - RewriteAction(const RewriteAction &); - RewriteAction &operator=(const RewriteAction&); +public: + RewriteAction(const RewriteAction&) = delete; + RewriteAction &operator=(const RewriteAction&) = delete; }; class AddPropertyRewriteAction: public RewriteAction @@ -79,10 +78,10 @@ public: m_sheduledInHierarchy(property.isValid() && property.parentModelNode().isInHierarchy()) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual AddPropertyRewriteAction *asAddPropertyRewriteAction() { return this; } + AddPropertyRewriteAction *asAddPropertyRewriteAction() override { return this; } AbstractProperty property() const { return m_property; } @@ -111,10 +110,10 @@ public: m_node(node), m_oldId(oldId), m_newId(newId) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual ChangeIdRewriteAction *asChangeIdRewriteAction() { return this; } + ChangeIdRewriteAction *asChangeIdRewriteAction() override { return this; } ModelNode node() const { return m_node; } @@ -133,10 +132,10 @@ public: m_sheduledInHierarchy(property.isValid() && property.parentModelNode().isInHierarchy()) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual ChangePropertyRewriteAction *asChangePropertyRewriteAction() { return this; } + ChangePropertyRewriteAction *asChangePropertyRewriteAction() override { return this; } AbstractProperty property() const { return m_property; } @@ -165,10 +164,10 @@ public: m_node(node) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual ChangeTypeRewriteAction *asChangeTypeRewriteAction() { return this; } + ChangeTypeRewriteAction *asChangeTypeRewriteAction() override { return this; } ModelNode node() const { return m_node; } @@ -184,10 +183,10 @@ public: m_node(node) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual RemoveNodeRewriteAction *asRemoveNodeRewriteAction() { return this; } + RemoveNodeRewriteAction *asRemoveNodeRewriteAction() override { return this; } ModelNode node() const { return m_node; } @@ -203,10 +202,10 @@ public: m_property(property) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual RemovePropertyRewriteAction *asRemovePropertyRewriteAction() { return this; } + RemovePropertyRewriteAction *asRemovePropertyRewriteAction() override { return this; } AbstractProperty property() const { return m_property; } @@ -222,10 +221,10 @@ public: m_node(node), m_oldParentProperty(oldParentProperty), m_targetProperty(targetProperty), m_propertyType(propertyType) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual ReparentNodeRewriteAction *asReparentNodeRewriteAction() { return this; } + ReparentNodeRewriteAction *asReparentNodeRewriteAction() override { return this; } ModelNode reparentedNode() const { return m_node; } @@ -256,10 +255,10 @@ public: m_movingNode(movingNode), m_newTrailingNode(newTrailingNode) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual MoveNodeRewriteAction *asMoveNodeRewriteAction() { return this; } + MoveNodeRewriteAction *asMoveNodeRewriteAction() override { return this; } private: ModelNode m_movingNode; @@ -273,10 +272,10 @@ public: m_import(import) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual AddImportRewriteAction *asAddImportRewriteAction() { return this; } + AddImportRewriteAction *asAddImportRewriteAction() override { return this; } Import import() const { return m_import; } @@ -291,10 +290,10 @@ public: m_import(import) {} - virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore); - virtual QString info() const; + bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) override; + QString info() const override; - virtual RemoveImportRewriteAction *asRemoveImportRewriteAction() { return this; } + RemoveImportRewriteAction *asRemoveImportRewriteAction() override { return this; } Import import() const { return m_import; } diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp index fef81225f4..6dac375ff7 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp @@ -317,7 +317,7 @@ void RewriteActionCompressor::compressAddEditActions(QList<RewriteAction *> &act QmlTextGenerator gen(m_propertyOrder); foreach (RewriteAction *action, dirtyActions) { - RewriteAction *newAction = 0; + RewriteAction *newAction = nullptr; if (AddPropertyRewriteAction *addAction = action->asAddPropertyRewriteAction()) { newAction = new AddPropertyRewriteAction(addAction->property(), gen(addAction->containedModelNode()), @@ -364,7 +364,7 @@ void RewriteActionCompressor::compressAddReparentActions(QList<RewriteAction *> RewriteAction *previousAction = addedNodes[reparentAction->reparentedNode()]; actionsToRemove.append(previousAction); - RewriteAction *replacementAction = 0; + RewriteAction *replacementAction = nullptr; if (AddPropertyRewriteAction *addAction = previousAction->asAddPropertyRewriteAction()) { replacementAction = new AddPropertyRewriteAction(reparentAction->targetProperty(), addAction->valueText(), diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index ab4dba68df..4ccc6a4ef1 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -70,9 +70,7 @@ RewriterView::RewriterView(DifferenceHandling differenceHandling, QObject *paren connect(&m_amendTimer, &QTimer::timeout, this, &RewriterView::amendQmlText); } -RewriterView::~RewriterView() -{ -} +RewriterView::~RewriterView() = default; Internal::ModelToTextMerger *RewriterView::modelToTextMerger() const { diff --git a/src/plugins/qmldesigner/designercore/model/signalhandlerproperty.cpp b/src/plugins/qmldesigner/designercore/model/signalhandlerproperty.cpp index 3ad9280e7a..e1701a0b71 100644 --- a/src/plugins/qmldesigner/designercore/model/signalhandlerproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/signalhandlerproperty.cpp @@ -33,9 +33,7 @@ #include "model_p.h" namespace QmlDesigner { -SignalHandlerProperty::SignalHandlerProperty() -{ -} +SignalHandlerProperty::SignalHandlerProperty() = default; SignalHandlerProperty::SignalHandlerProperty(const SignalHandlerProperty &property, AbstractView *view) : AbstractProperty(property.name(), property.internalNode(), property.model(), view) diff --git a/src/plugins/qmldesigner/designercore/model/textmodifier.cpp b/src/plugins/qmldesigner/designercore/model/textmodifier.cpp index 9016619f6d..8653f5efd9 100644 --- a/src/plugins/qmldesigner/designercore/model/textmodifier.cpp +++ b/src/plugins/qmldesigner/designercore/model/textmodifier.cpp @@ -31,9 +31,7 @@ using namespace QmlDesigner; -TextModifier::~TextModifier() -{ -} +TextModifier::~TextModifier() = default; int TextModifier::getLineInDocument(QTextDocument *document, int offset) { diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 9066a65d7e..4e6a8ea409 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -197,9 +197,9 @@ static bool isLiteralValue(AST::ExpressionNode *expr) return true; else if (AST::cast<AST::StringLiteral*>(expr)) return true; - else if (AST::UnaryPlusExpression *plusExpr = AST::cast<AST::UnaryPlusExpression*>(expr)) + else if (auto plusExpr = AST::cast<AST::UnaryPlusExpression*>(expr)) return isLiteralValue(plusExpr->expression); - else if (AST::UnaryMinusExpression *minusExpr = AST::cast<AST::UnaryMinusExpression*>(expr)) + else if (auto minusExpr = AST::cast<AST::UnaryMinusExpression*>(expr)) return isLiteralValue(minusExpr->expression); else if (AST::cast<AST::TrueLiteral*>(expr)) return true; @@ -211,7 +211,7 @@ static bool isLiteralValue(AST::ExpressionNode *expr) static bool isLiteralValue(AST::Statement *stmt) { - AST::ExpressionStatement *exprStmt = AST::cast<AST::ExpressionStatement *>(stmt); + auto exprStmt = AST::cast<AST::ExpressionStatement *>(stmt); if (exprStmt) return isLiteralValue(exprStmt->expression); else @@ -368,8 +368,7 @@ public: { } - ~ReadingContext() - {} + ~ReadingContext() = default; Document::Ptr doc() const { return m_doc; } @@ -436,7 +435,8 @@ public: /// When something is changed here, also change Check::checkScopeObjectMember in /// qmljscheck.cpp /// ### Maybe put this into the context as a helper function. - bool lookupProperty(const QString &prefix, const AST::UiQualifiedId *id, const Value **property = 0, const ObjectValue **parentObject = 0, QString *name = 0) + bool lookupProperty(const QString &prefix, const AST::UiQualifiedId *id, const Value **property = nullptr, + const ObjectValue **parentObject = nullptr, QString *name = nullptr) { QList<const ObjectValue *> scopeObjects = m_scopeChain.qmlScopeObjects(); if (scopeObjects.isEmpty()) @@ -472,8 +472,8 @@ public: return false; // global lookup for first part of id - const ObjectValue *objectValue = 0; - const Value *value = 0; + const ObjectValue *objectValue = nullptr; + const Value *value = nullptr; for (int i = scopeObjects.size() - 1; i >= 0; --i) { objectValue = scopeObjects[i]; value = objectValue->lookupMember(propertyName, m_context); @@ -560,8 +560,8 @@ public: { const bool hasQuotes = astValue.trimmed().left(1) == QStringLiteral("\"") && astValue.trimmed().right(1) == QStringLiteral("\""); const QString cleanedValue = fixEscapedUnicodeChar(deEscape(stripQuotes(astValue.trimmed()))); - const Value *property = 0; - const ObjectValue *containingObject = 0; + const Value *property = nullptr; + const ObjectValue *containingObject = nullptr; QString name; if (!lookupProperty(propertyPrefix, propertyId, &property, &containingObject, &name)) { qWarning() << Q_FUNC_INFO << "Unknown property" << propertyPrefix + QLatin1Char('.') + toString(propertyId) @@ -623,13 +623,13 @@ public: return QVariant::fromValue(Enumeration(astValue)); } - AST::ExpressionStatement *eStmt = AST::cast<AST::ExpressionStatement *>(rhs); + auto eStmt = AST::cast<AST::ExpressionStatement *>(rhs); if (!eStmt || !eStmt->expression) return QVariant(); - const ObjectValue *containingObject = 0; + const ObjectValue *containingObject = nullptr; QString name; - if (!lookupProperty(propertyPrefix, propertyId, 0, &containingObject, &name)) + if (!lookupProperty(propertyPrefix, propertyId, nullptr, &containingObject, &name)) return QVariant(); if (containingObject) @@ -639,14 +639,14 @@ public: return QVariant(); const QString lhsPropertyTypeName = lhsCppComponent->propertyType(name); - const ObjectValue *rhsValueObject = 0; + const ObjectValue *rhsValueObject = nullptr; QString rhsValueName; - if (AST::IdentifierExpression *idExp = AST::cast<AST::IdentifierExpression *>(eStmt->expression)) { + if (auto idExp = AST::cast<AST::IdentifierExpression *>(eStmt->expression)) { if (!m_scopeChain.qmlScopeObjects().isEmpty()) rhsValueObject = m_scopeChain.qmlScopeObjects().constLast(); if (!idExp->name.isEmpty()) rhsValueName = idExp->name.toString(); - } else if (AST::FieldMemberExpression *memberExp = AST::cast<AST::FieldMemberExpression *>(eStmt->expression)) { + } else if (auto memberExp = AST::cast<AST::FieldMemberExpression *>(eStmt->expression)) { Evaluate evaluate(&m_scopeChain); const Value *result = evaluate(memberExp->base); rhsValueObject = result->asObjectValue(); @@ -748,7 +748,7 @@ void TextToModelMerger::setupImports(const Document::Ptr &doc, QList<Import> existingImports = m_rewriterView->model()->imports(); for (AST::UiHeaderItemList *iter = doc->qmlProgram()->headers; iter; iter = iter->next) { - AST::UiImport *import = AST::cast<AST::UiImport *>(iter->headerItem); + auto import = AST::cast<AST::UiImport *>(iter->headerItem); if (!import) continue; @@ -1022,7 +1022,7 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH } setupUsedImports(); - AST::UiObjectMember *astRootNode = 0; + AST::UiObjectMember *astRootNode = nullptr; if (AST::UiProgram *program = m_document->qmlProgram()) if (program->members) astRootNode = program->members->member; @@ -1081,7 +1081,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, if (modelNode.isRootNode() && isComponentType(typeName)) { for (AST::UiObjectMemberList *iter = astInitializer->members; iter; iter = iter->next) { - if (AST::UiObjectDefinition *def = AST::cast<AST::UiObjectDefinition *>(iter->member)) { + if (auto def = AST::cast<AST::UiObjectDefinition *>(iter->member)) { syncNode(modelNode, def, context, differenceHandler); return; } @@ -1120,7 +1120,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, if (!member) continue; - if (AST::UiArrayBinding *array = AST::cast<AST::UiArrayBinding *>(member)) { + if (auto array = AST::cast<AST::UiArrayBinding *>(member)) { const QString astPropertyName = toString(array->qualifiedId); if (isPropertyChangesType(typeName) || isConnectionsType(typeName) || context->lookupProperty(QString(), array->qualifiedId)) { AbstractProperty modelProperty = modelNode.property(astPropertyName.toUtf8()); @@ -1135,7 +1135,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, qWarning() << "Skipping invalid array property" << astPropertyName << "for node type" << modelNode.type(); } - } else if (AST::UiObjectDefinition *def = AST::cast<AST::UiObjectDefinition *>(member)) { + } else if (auto def = AST::cast<AST::UiObjectDefinition *>(member)) { const QString &name = def->qualifiedTypeNameId->name.toString(); if (name.isEmpty() || !name.at(0).isUpper()) { QStringList props = syncGroupedProperties(modelNode, @@ -1148,13 +1148,13 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, } else { defaultPropertyItems.append(member); } - } else if (AST::UiObjectBinding *binding = AST::cast<AST::UiObjectBinding *>(member)) { + } else if (auto binding = AST::cast<AST::UiObjectBinding *>(member)) { const QString astPropertyName = toString(binding->qualifiedId); if (binding->hasOnToken) { // skip value sources } else { - const Value *propertyType = 0; - const ObjectValue *containingObject = 0; + const Value *propertyType = nullptr; + const ObjectValue *containingObject = nullptr; QString name; if (context->lookupProperty(QString(), binding->qualifiedId, &propertyType, &containingObject, &name) || isPropertyChangesType(typeName) @@ -1173,9 +1173,9 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, modelPropertyNames.remove(astPropertyName.toUtf8()); } } - } else if (AST::UiScriptBinding *script = AST::cast<AST::UiScriptBinding *>(member)) { + } else if (auto script = AST::cast<AST::UiScriptBinding *>(member)) { modelPropertyNames.remove(syncScriptBinding(modelNode, QString(), script, context, differenceHandler)); - } else if (AST::UiPublicMember *property = AST::cast<AST::UiPublicMember *>(member)) { + } else if (auto property = AST::cast<AST::UiPublicMember *>(member)) { if (property->type == AST::UiPublicMember::Signal) continue; // QML designer doesn't support this yet. @@ -1198,7 +1198,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, AbstractProperty modelProperty = modelNode.property(astName.toUtf8()); if (property->binding) { - if (AST::UiObjectBinding *binding = AST::cast<AST::UiObjectBinding *>(property->binding)) + if (auto binding = AST::cast<AST::UiObjectBinding *>(property->binding)) syncNodeProperty(modelProperty, binding, context, astType, differenceHandler); else qWarning() << "Arrays are not yet supported"; @@ -1251,7 +1251,7 @@ static QVariant parsePropertyExpression(AST::ExpressionNode *expressionNode) { Q_ASSERT(expressionNode); - AST::ArrayLiteral *arrayLiteral = AST::cast<AST::ArrayLiteral *>(expressionNode); + auto arrayLiteral = AST::cast<AST::ArrayLiteral *>(expressionNode); if (arrayLiteral) { QList<QVariant> variantList; @@ -1260,19 +1260,19 @@ static QVariant parsePropertyExpression(AST::ExpressionNode *expressionNode) return variantList; } - AST::StringLiteral *stringLiteral = AST::cast<AST::StringLiteral *>(expressionNode); + auto stringLiteral = AST::cast<AST::StringLiteral *>(expressionNode); if (stringLiteral) return stringLiteral->value.toString(); - AST::TrueLiteral *trueLiteral = AST::cast<AST::TrueLiteral *>(expressionNode); + auto trueLiteral = AST::cast<AST::TrueLiteral *>(expressionNode); if (trueLiteral) return true; - AST::FalseLiteral *falseLiteral = AST::cast<AST::FalseLiteral *>(expressionNode); + auto falseLiteral = AST::cast<AST::FalseLiteral *>(expressionNode); if (falseLiteral) return false; - AST::NumericLiteral *numericLiteral = AST::cast<AST::NumericLiteral *>(expressionNode); + auto numericLiteral = AST::cast<AST::NumericLiteral *>(expressionNode); if (numericLiteral) return numericLiteral->value; @@ -1284,7 +1284,7 @@ QVariant parsePropertyScriptBinding(AST::UiScriptBinding *uiScriptBinding) { Q_ASSERT(uiScriptBinding); - AST::ExpressionStatement *expStmt = AST::cast<AST::ExpressionStatement *>(uiScriptBinding->statement); + auto expStmt = AST::cast<AST::ExpressionStatement *>(uiScriptBinding->statement); if (!expStmt) return QVariant(); @@ -1596,7 +1596,7 @@ QStringList TextToModelMerger::syncGroupedProperties(ModelNode &modelNode, for (AST::UiObjectMemberList *iter = members; iter; iter = iter->next) { AST::UiObjectMember *member = iter->member; - if (AST::UiScriptBinding *script = AST::cast<AST::UiScriptBinding *>(member)) { + if (auto script = AST::cast<AST::UiScriptBinding *>(member)) { const QString prop = QString::fromLatin1(syncScriptBinding(modelNode, name, script, context, differenceHandler)); if (!prop.isEmpty()) props.append(prop); @@ -1881,12 +1881,12 @@ ModelNode ModelAmender::listPropertyMissingModelNode(NodeListProperty &modelProp ReadingContext *context, AST::UiObjectMember *arrayMember) { - AST::UiQualifiedId *astObjectType = 0; - AST::UiObjectInitializer *astInitializer = 0; - if (AST::UiObjectDefinition *def = AST::cast<AST::UiObjectDefinition *>(arrayMember)) { + AST::UiQualifiedId *astObjectType = nullptr; + AST::UiObjectInitializer *astInitializer = nullptr; + if (auto def = AST::cast<AST::UiObjectDefinition *>(arrayMember)) { astObjectType = def->qualifiedTypeNameId; astInitializer = def->initializer; - } else if (AST::UiObjectBinding *bin = AST::cast<AST::UiObjectBinding *>(arrayMember)) { + } else if (auto bin = AST::cast<AST::UiObjectBinding *>(arrayMember)) { astObjectType = bin->qualifiedTypeNameId; astInitializer = bin->initializer; } diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h index 4eebae3b85..82def3927f 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h @@ -167,8 +167,7 @@ public: DifferenceHandler(TextToModelMerger *textToModelMerger): m_merger(textToModelMerger) {} - virtual ~DifferenceHandler() - {} + virtual ~DifferenceHandler() = default; virtual void modelMissesImport(const QmlDesigner::Import &import) = 0; virtual void importAbsentInQMl(const QmlDesigner::Import &import) = 0; @@ -219,48 +218,47 @@ public: ModelValidator(TextToModelMerger *textToModelMerger): DifferenceHandler(textToModelMerger) {} - ~ModelValidator() - {} - - virtual void modelMissesImport(const QmlDesigner::Import &import); - virtual void importAbsentInQMl(const QmlDesigner::Import &import); - virtual void bindingExpressionsDiffer(BindingProperty &modelProperty, - const QString &javascript, - const TypeName &astType); - virtual void shouldBeBindingProperty(AbstractProperty &modelProperty, - const QString &javascript, - const TypeName &astType); - virtual void signalHandlerSourceDiffer(SignalHandlerProperty &modelProperty, - const QString &javascript); - virtual void shouldBeSignalHandlerProperty(AbstractProperty &modelProperty, - const QString &javascript); - virtual void shouldBeNodeListProperty(AbstractProperty &modelProperty, - const QList<QmlJS::AST::UiObjectMember *> arrayMembers, - ReadingContext *context); - virtual void variantValuesDiffer(VariantProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicTypeName); - virtual void shouldBeVariantProperty(AbstractProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicTypeName); - virtual void shouldBeNodeProperty(AbstractProperty &modelProperty, - const TypeName &typeName, - int majorVersion, - int minorVersion, - QmlJS::AST::UiObjectMember *astNode, - const TypeName &dynamicPropertyType, - ReadingContext *context); - - virtual void modelNodeAbsentFromQml(ModelNode &modelNode); - virtual ModelNode listPropertyMissingModelNode(NodeListProperty &modelProperty, - ReadingContext *context, - QmlJS::AST::UiObjectMember *arrayMember); - virtual void typeDiffers(bool isRootNode, - ModelNode &modelNode, - const TypeName &typeName, - int majorVersion, - int minorVersion, - QmlJS::AST::UiObjectMember *astNode, - ReadingContext *context); - virtual void propertyAbsentFromQml(AbstractProperty &modelProperty); - virtual void idsDiffer(ModelNode &modelNode, const QString &qmlId); - virtual bool isValidator() const {return false; } + ~ModelValidator() override = default; + + void modelMissesImport(const QmlDesigner::Import &import) override; + void importAbsentInQMl(const QmlDesigner::Import &import) override; + void bindingExpressionsDiffer(BindingProperty &modelProperty, + const QString &javascript, + const TypeName &astType) override; + void shouldBeBindingProperty(AbstractProperty &modelProperty, + const QString &javascript, + const TypeName &astType) override; + void signalHandlerSourceDiffer(SignalHandlerProperty &modelProperty, + const QString &javascript) override; + void shouldBeSignalHandlerProperty(AbstractProperty &modelProperty, + const QString &javascript) override; + void shouldBeNodeListProperty(AbstractProperty &modelProperty, + const QList<QmlJS::AST::UiObjectMember *> arrayMembers, + ReadingContext *context) override; + void variantValuesDiffer(VariantProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicTypeName) override; + void shouldBeVariantProperty(AbstractProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicTypeName) override; + void shouldBeNodeProperty(AbstractProperty &modelProperty, + const TypeName &typeName, + int majorVersion, + int minorVersion, + QmlJS::AST::UiObjectMember *astNode, + const TypeName &dynamicPropertyType, + ReadingContext *context) override; + + void modelNodeAbsentFromQml(ModelNode &modelNode) override; + ModelNode listPropertyMissingModelNode(NodeListProperty &modelProperty, + ReadingContext *context, + QmlJS::AST::UiObjectMember *arrayMember) override; + void typeDiffers(bool isRootNode, + ModelNode &modelNode, + const TypeName &typeName, + int majorVersion, + int minorVersion, + QmlJS::AST::UiObjectMember *astNode, + ReadingContext *context) override; + void propertyAbsentFromQml(AbstractProperty &modelProperty) override; + void idsDiffer(ModelNode &modelNode, const QString &qmlId) override; + bool isValidator() const override {return false; } }; class ModelAmender: public DifferenceHandler @@ -269,48 +267,47 @@ public: ModelAmender(TextToModelMerger *textToModelMerger): DifferenceHandler(textToModelMerger) {} - ~ModelAmender() - {} - - virtual void modelMissesImport(const QmlDesigner::Import &import); - virtual void importAbsentInQMl(const QmlDesigner::Import &import); - virtual void bindingExpressionsDiffer(BindingProperty &modelProperty, - const QString &javascript, - const TypeName &astType); - virtual void shouldBeBindingProperty(AbstractProperty &modelProperty, - const QString &javascript, - const TypeName &astType); - virtual void signalHandlerSourceDiffer(SignalHandlerProperty &modelProperty, - const QString &javascript); - virtual void shouldBeSignalHandlerProperty(AbstractProperty &modelProperty, - const QString &javascript); - virtual void shouldBeNodeListProperty(AbstractProperty &modelProperty, - const QList<QmlJS::AST::UiObjectMember *> arrayMembers, - ReadingContext *context); - virtual void variantValuesDiffer(VariantProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicType); - virtual void shouldBeVariantProperty(AbstractProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicTypeName); - virtual void shouldBeNodeProperty(AbstractProperty &modelProperty, - const TypeName &typeName, - int majorVersion, - int minorVersion, - QmlJS::AST::UiObjectMember *astNode, - const TypeName &dynamicPropertyType, - ReadingContext *context); - - virtual void modelNodeAbsentFromQml(ModelNode &modelNode); - virtual ModelNode listPropertyMissingModelNode(NodeListProperty &modelProperty, - ReadingContext *context, - QmlJS::AST::UiObjectMember *arrayMember); - virtual void typeDiffers(bool isRootNode, - ModelNode &modelNode, - const TypeName &typeName, - int majorVersion, - int minorVersion, - QmlJS::AST::UiObjectMember *astNode, - ReadingContext *context); - virtual void propertyAbsentFromQml(AbstractProperty &modelProperty); - virtual void idsDiffer(ModelNode &modelNode, const QString &qmlId); - virtual bool isValidator() const {return true; } + ~ModelAmender() override = default; + + void modelMissesImport(const QmlDesigner::Import &import) override; + void importAbsentInQMl(const QmlDesigner::Import &import) override; + void bindingExpressionsDiffer(BindingProperty &modelProperty, + const QString &javascript, + const TypeName &astType) override; + void shouldBeBindingProperty(AbstractProperty &modelProperty, + const QString &javascript, + const TypeName &astType) override; + void signalHandlerSourceDiffer(SignalHandlerProperty &modelProperty, + const QString &javascript) override; + void shouldBeSignalHandlerProperty(AbstractProperty &modelProperty, + const QString &javascript) override; + void shouldBeNodeListProperty(AbstractProperty &modelProperty, + const QList<QmlJS::AST::UiObjectMember *> arrayMembers, + ReadingContext *context) override; + void variantValuesDiffer(VariantProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicType) override; + void shouldBeVariantProperty(AbstractProperty &modelProperty, const QVariant &qmlVariantValue, const TypeName &dynamicTypeName) override; + void shouldBeNodeProperty(AbstractProperty &modelProperty, + const TypeName &typeName, + int majorVersion, + int minorVersion, + QmlJS::AST::UiObjectMember *astNode, + const TypeName &dynamicPropertyType, + ReadingContext *context) override; + + void modelNodeAbsentFromQml(ModelNode &modelNode) override; + ModelNode listPropertyMissingModelNode(NodeListProperty &modelProperty, + ReadingContext *context, + QmlJS::AST::UiObjectMember *arrayMember) override; + void typeDiffers(bool isRootNode, + ModelNode &modelNode, + const TypeName &typeName, + int majorVersion, + int minorVersion, + QmlJS::AST::UiObjectMember *astNode, + ReadingContext *context) override; + void propertyAbsentFromQml(AbstractProperty &modelProperty) override; + void idsDiffer(ModelNode &modelNode, const QString &qmlId) override; + bool isValidator() const override {return true; } }; } //Internal diff --git a/src/plugins/qmldesigner/designercore/model/variantproperty.cpp b/src/plugins/qmldesigner/designercore/model/variantproperty.cpp index dbdf1bb74e..03c4f5acbf 100644 --- a/src/plugins/qmldesigner/designercore/model/variantproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/variantproperty.cpp @@ -35,8 +35,7 @@ namespace QmlDesigner { -VariantProperty::VariantProperty() -{} +VariantProperty::VariantProperty() = default; VariantProperty::VariantProperty(const VariantProperty &property, AbstractView *view) : AbstractProperty(property.name(), property.internalNode(), property.model(), view) diff --git a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp index 9fca067862..800c807dc6 100644 --- a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp +++ b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp @@ -143,7 +143,7 @@ void ViewManager::detachRewriterView() { if (RewriterView *view = currentDesignDocument()->rewriterView()) { view->deactivateTextMofifierChangeSignals(); - currentModel()->setRewriterView(0); + currentModel()->setRewriterView(nullptr); } } @@ -205,7 +205,7 @@ void ViewManager::detachViewsExceptRewriterAndComponetView() if (d->debugView.isAttached()) currentModel()->detachView(&d->debugView); - currentModel()->setNodeInstanceView(0); + currentModel()->setNodeInstanceView(nullptr); } void ViewManager::attachItemLibraryView() diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp index cae792a456..2b3b5c81c5 100644 --- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp +++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp @@ -37,9 +37,7 @@ namespace QmlDesigner { namespace Internal { -WidgetPluginManager::WidgetPluginManager() -{ -} +WidgetPluginManager::WidgetPluginManager() = default; WidgetPluginManager::IWidgetPluginList WidgetPluginManager::instances() { @@ -63,7 +61,7 @@ bool WidgetPluginManager::addPath(const QString &path) QAbstractItemModel *WidgetPluginManager::createModel(QObject *parent) { - QStandardItemModel *model = new QStandardItemModel(parent); + auto model = new QStandardItemModel(parent); const auto end = m_paths.end(); for (auto it = m_paths.begin(); it != end; ++it) model->appendRow(it->createModelItem()); diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h index 2955ef9bfd..854da511c3 100644 --- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h +++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h @@ -49,9 +49,9 @@ namespace Internal { class WidgetPluginManager { Q_DISABLE_COPY(WidgetPluginManager) - typedef QList<WidgetPluginPath> PluginPathList; + using PluginPathList = QList<WidgetPluginPath>; public: - typedef QList<IWidgetPlugin *> IWidgetPluginList; + using IWidgetPluginList = QList<IWidgetPlugin *>; WidgetPluginManager(); diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp index 6904417759..968a2e8bc3 100644 --- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp +++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp @@ -52,11 +52,11 @@ static IWidgetPlugin *instance(WidgetPluginData &p) // Go stale once something fails if (p.failed) - return 0; + return nullptr; // Pull up the plugin, retrieve IPlugin instance. if (!p.instanceGuard) { - p.instance = 0; + p.instance = nullptr; QPluginLoader loader(p.path); if (debug) @@ -68,7 +68,7 @@ static IWidgetPlugin *instance(WidgetPluginData &p) "Failed to create instance of file " "\"%1\": %2").arg(p.path).arg(p.errorMessage); qWarning() << p.errorMessage; - return 0; + return nullptr; } QObject *object = loader.instance(); if (!object) { @@ -77,7 +77,7 @@ static IWidgetPlugin *instance(WidgetPluginData &p) "Failed to create instance of file \"%1\"." ).arg(p.path); qWarning() << p.errorMessage; - return 0; + return nullptr; } IWidgetPlugin *iplugin = qobject_cast<IWidgetPlugin *>(object); if (!iplugin) { @@ -87,7 +87,7 @@ static IWidgetPlugin *instance(WidgetPluginData &p) ).arg(p.path); qWarning() << p.errorMessage; delete object; - return 0; + return nullptr; } p.instanceGuard = object; p.instance = iplugin; @@ -110,7 +110,7 @@ static IWidgetPlugin *instance(WidgetPluginData &p) WidgetPluginData::WidgetPluginData(const QString &p) : path(p), failed(false), - instance(0) + instance(nullptr) { } @@ -187,7 +187,7 @@ QStandardItem *WidgetPluginPath::createModelItem() // If there are failed ones, create a separate "Failed" // category at the end QStandardItem *pathItem = new QStandardItem(m_path.absolutePath()); - QStandardItem *failedCategory = 0; + QStandardItem *failedCategory = nullptr; const auto end = m_plugins.end(); for (auto it = m_plugins.begin(); it != end; ++it) { QStandardItem *pluginItem = new QStandardItem(Utils::FileName::fromString(it->path).fileName()); diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h index 391fe86fe9..13ad38fcd3 100644 --- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h +++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h @@ -66,7 +66,7 @@ struct WidgetPluginData { // IPlugins. class WidgetPluginPath { - typedef QList<IWidgetPlugin *> IWidgetPluginList; + using IWidgetPluginList = QList<IWidgetPlugin *>; public: explicit WidgetPluginPath(const QDir &path); @@ -80,7 +80,7 @@ public: QStandardItem *createModelItem(); private: - typedef QList<WidgetPluginData> PluginDataList; + using PluginDataList = QList<WidgetPluginData>; static QStringList libraryFilePaths(const QDir &dir); void clear(); diff --git a/src/plugins/qmldesigner/designersettings.cpp b/src/plugins/qmldesigner/designersettings.cpp index 7520296c26..d1e8a3a569 100644 --- a/src/plugins/qmldesigner/designersettings.cpp +++ b/src/plugins/qmldesigner/designersettings.cpp @@ -36,9 +36,7 @@ namespace DesignerSettingsGroupKey { const char QML_DESIGNER_SETTINGS_GROUP[] = "Designer"; } -DesignerSettings::DesignerSettings() -{ -} +DesignerSettings::DesignerSettings() = default; void DesignerSettings::restoreValue(QSettings *settings, const QByteArray &key, const QVariant &defaultValue) { diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index 87d37e6d77..49f484583b 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -91,10 +91,7 @@ public: ItemLibrarySideBarItem::ItemLibrarySideBarItem(QWidget *widget, const QString &id) : Core::SideBarItem(widget, id) {} -ItemLibrarySideBarItem::~ItemLibrarySideBarItem() -{ - -} +ItemLibrarySideBarItem::~ItemLibrarySideBarItem() = default; QList<QToolButton *> ItemLibrarySideBarItem::createToolBarWidgets() { @@ -267,7 +264,7 @@ void DesignModeWidget::setup() foreach (Core::INavigationWidgetFactory *factory, factories) { Core::NavigationView navigationView; - navigationView.widget = 0; + navigationView.widget = nullptr; if (factory->id() == "Projects") { navigationView = factory->createWidget(); projectsExplorer = navigationView.widget; @@ -293,7 +290,7 @@ void DesignModeWidget::setup() } } - QToolBar *toolBar = new QToolBar; + auto toolBar = new QToolBar; toolBar->addAction(viewManager().componentViewAction()); toolBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); DesignerActionToolBar *designerToolBar = QmlDesignerPlugin::instance()->viewManager().designerActionManager().createToolBar(m_toolBar); @@ -450,7 +447,7 @@ void DesignModeWidget::addNavigatorHistoryEntry(const Utils::FileName &fileName) static QTabWidget *createWidgetsInTabWidget(const QList<WidgetInfo> &widgetInfos) { - QTabWidget *tabWidget = new QTabWidget; + auto tabWidget = new QTabWidget; foreach (const WidgetInfo &widgetInfo, widgetInfos) tabWidget->addTab(widgetInfo.widget, widgetInfo.tabName); @@ -488,10 +485,10 @@ static QWidget *createbottomSideBarWidget(const QList<WidgetInfo> &widgetInfos) static Core::MiniSplitter *createCentralSplitter(const QList<WidgetInfo> &widgetInfos) { // editor and output panes - Core::MiniSplitter *outputPlaceholderSplitter = new Core::MiniSplitter; + auto outputPlaceholderSplitter = new Core::MiniSplitter; outputPlaceholderSplitter->setOrientation(Qt::Vertical); - SwitchSplitTabWidget *switchSplitTabWidget = new SwitchSplitTabWidget(); + auto switchSplitTabWidget = new SwitchSplitTabWidget(); foreach (const WidgetInfo &widgetInfo, widgetInfos) { if (widgetInfo.placementHint == widgetInfo.CentralPane) @@ -516,7 +513,7 @@ QWidget *DesignModeWidget::createCenterWidget() { QWidget *centerWidget = new QWidget; - QVBoxLayout *horizontalLayout = new QVBoxLayout(centerWidget); + auto horizontalLayout = new QVBoxLayout(centerWidget); horizontalLayout->setMargin(0); horizontalLayout->setSpacing(0); @@ -537,9 +534,9 @@ QWidget *DesignModeWidget::createCenterWidget() QWidget *DesignModeWidget::createCrumbleBarFrame() { - auto *frame = new Utils::StyledBar(this); + auto frame = new Utils::StyledBar(this); frame->setSingleRow(false); - QHBoxLayout *layout = new QHBoxLayout(frame); + auto layout = new QHBoxLayout(frame); layout->setMargin(0); layout->setSpacing(0); layout->addWidget(m_crumbleBar->crumblePath()); diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp index 97b475a0f9..423281b6fd 100644 --- a/src/plugins/qmldesigner/documentmanager.cpp +++ b/src/plugins/qmldesigner/documentmanager.cpp @@ -358,7 +358,7 @@ QStringList DocumentManager::isoIconsQmakeVariableValue(const QString &proPath) return QStringList(); } - QmakeProjectManager::QmakeProFileNode *proNode = dynamic_cast<QmakeProjectManager::QmakeProFileNode*>(parentNode); + auto proNode = dynamic_cast<QmakeProjectManager::QmakeProFileNode*>(parentNode); if (!proNode) { qCWarning(documentManagerLog) << "Parent node for node at" << proPath << "could not be converted to a QmakeProFileNode"; return QStringList(); @@ -381,7 +381,7 @@ bool DocumentManager::setIsoIconsQmakeVariableValue(const QString &proPath, cons return false; } - QmakeProjectManager::QmakeProFileNode *proNode = dynamic_cast<QmakeProjectManager::QmakeProFileNode*>(parentNode); + auto proNode = dynamic_cast<QmakeProjectManager::QmakeProFileNode*>(parentNode); if (!proNode) { qCWarning(documentManagerLog) << "Node for" << proPath << "could not be converted to a QmakeProFileNode"; return false; @@ -407,7 +407,7 @@ void DocumentManager::findPathToIsoProFile(bool *iconResourceFileAlreadyExists, << "(" << node << static_cast<int>(node->nodeType()) << ")"; if (node->nodeType() == ProjectExplorer::NodeType::VirtualFolder && node->displayName() == "Resources") { - ProjectExplorer::VirtualFolderNode *virtualFolderNode = dynamic_cast<ProjectExplorer::VirtualFolderNode*>(node); + auto virtualFolderNode = dynamic_cast<ProjectExplorer::VirtualFolderNode*>(node); for (int subFolderIndex = 0; subFolderIndex < virtualFolderNode->folderNodes().size() && !iconQrcFileNode; ++subFolderIndex) { ProjectExplorer::FolderNode *subFolderNode = virtualFolderNode->folderNodes().at(subFolderIndex); @@ -446,7 +446,7 @@ void DocumentManager::findPathToIsoProFile(bool *iconResourceFileAlreadyExists, *resourceFilePath = projectDirectory + "/" + isoIconsQrcFile; } - *iconResourceFileAlreadyExists = iconQrcFileNode != 0; + *iconResourceFileAlreadyExists = iconQrcFileNode != nullptr; } bool DocumentManager::isoProFileSupportsAddingExistingFiles(const QString &resourceFileProPath) @@ -494,7 +494,7 @@ bool DocumentManager::belongsToQmakeProject() return false; ProjectExplorer::Node *rootNode = project->rootProjectNode(); - QmakeProjectManager::QmakeProFileNode *proNode = dynamic_cast<QmakeProjectManager::QmakeProFileNode*>(rootNode); + auto proNode = dynamic_cast<QmakeProjectManager::QmakeProFileNode*>(rootNode); return proNode; } diff --git a/src/plugins/qmldesigner/documentwarningwidget.cpp b/src/plugins/qmldesigner/documentwarningwidget.cpp index 6afe9b2714..a159e12f86 100644 --- a/src/plugins/qmldesigner/documentwarningwidget.cpp +++ b/src/plugins/qmldesigner/documentwarningwidget.cpp @@ -87,16 +87,16 @@ DocumentWarningWidget::DocumentWarningWidget(QWidget *parent) connect(m_ignoreWarningsCheckBox, &QCheckBox::toggled, this, &DocumentWarningWidget::ignoreCheckBoxToggled); - QVBoxLayout *layout = new QVBoxLayout(this); + auto layout = new QVBoxLayout(this); layout->addWidget(m_headerLabel); - QVBoxLayout *messageLayout = new QVBoxLayout; + auto messageLayout = new QVBoxLayout; messageLayout->setMargin(20); messageLayout->setSpacing(5); messageLayout->addWidget(m_navigateLabel); messageLayout->addWidget(m_messageLabel); layout->addLayout(messageLayout); layout->addWidget(m_ignoreWarningsCheckBox); - QHBoxLayout *buttonLayout = new QHBoxLayout(); + auto buttonLayout = new QHBoxLayout(); buttonLayout->addStretch(); buttonLayout->addWidget(m_continueButton); layout->addLayout(buttonLayout); diff --git a/src/plugins/qmldesigner/qmldesignerextension/colortool/colortool.cpp b/src/plugins/qmldesigner/qmldesignerextension/colortool/colortool.cpp index 7f03543c2c..283cdb901d 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/colortool/colortool.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/colortool/colortool.cpp @@ -53,28 +53,28 @@ class ColorToolAction : public AbstractAction public: ColorToolAction() : AbstractAction(QCoreApplication::translate("ColorToolAction","Edit Color")) {} - QByteArray category() const + QByteArray category() const override { return QByteArray(); } - QByteArray menuId() const + QByteArray menuId() const override { return "ColorTool"; } - int priority() const + int priority() const override { return CustomActionsPriority; } - Type type() const + Type type() const override { return FormEditorAction; } protected: - bool isVisible(const SelectionContext &selectionContext) const + bool isVisible(const SelectionContext &selectionContext) const override { if (selectionContext.singleNodeIsSelected()) return selectionContext.currentSingleSelectedNode().metaInfo().hasProperty("color"); @@ -82,7 +82,7 @@ protected: return false; } - bool isEnabled(const SelectionContext &selectionContext) const + bool isEnabled(const SelectionContext &selectionContext) const override { return isVisible(selectionContext); } @@ -91,16 +91,14 @@ protected: ColorTool::ColorTool() : QObject(), AbstractCustomTool() { - ColorToolAction *colorToolAction = new ColorToolAction; + auto colorToolAction = new ColorToolAction; QmlDesignerPlugin::instance()->designerActionManager().addDesignerAction(colorToolAction); connect(colorToolAction->action(), &QAction::triggered, [=]() { view()->changeCurrentToolTo(this); }); } -ColorTool::~ColorTool() -{ -} +ColorTool::~ColorTool() = default; void ColorTool::clear() { diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/backendmodel.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/backendmodel.cpp index 0d86c4696a..f356788a55 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/backendmodel.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/backendmodel.cpp @@ -79,12 +79,12 @@ void BackendModel::resetModel() if (cppTypeData.isSingleton) { NodeMetaInfo metaInfo = m_connectionView->model()->metaInfo(cppTypeData.typeName.toUtf8()); if (metaInfo.isValid() && !metaInfo.isSubclassOf("QtQuick.Item")) { - QStandardItem *type = new QStandardItem(cppTypeData.typeName); + auto type = new QStandardItem(cppTypeData.typeName); type->setData(cppTypeData.typeName, Qt::UserRole + 1); type->setData(true, Qt::UserRole + 2); type->setEditable(false); - QStandardItem *name = new QStandardItem(cppTypeData.typeName); + auto name = new QStandardItem(cppTypeData.typeName); name->setEditable(false); QStandardItem *singletonItem = new QStandardItem(""); diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.cpp index 9b08e5179c..cd8c92b82c 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.cpp @@ -444,7 +444,7 @@ void BindingModel::handleDataChanged(const QModelIndex &topLeft, const QModelInd void BindingModel::handleException() { - QMessageBox::warning(0, tr("Error"), m_exceptionError); + QMessageBox::warning(nullptr, tr("Error"), m_exceptionError); resetModel(); } diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionmodel.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionmodel.cpp index 7c79334ea2..8cd297890e 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionmodel.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionmodel.cpp @@ -195,7 +195,7 @@ void ConnectionModel::updateSignalName(int rowNumber) connectionNode.removeProperty(signalHandlerProperty.name()); transaction.commit(); //committing in the try block } catch (Exception &e) { //better save then sorry - QMessageBox::warning(0, tr("Error"), e.description()); + QMessageBox::warning(nullptr, tr("Error"), e.description()); } QStandardItem* idItem = item(rowNumber, 0); @@ -220,7 +220,7 @@ void ConnectionModel::updateTargetNode(int rowNumber) connectionNode.bindingProperty("target").setExpression(newTarget); transaction.commit(); //committing in the try block } catch (Exception &e) { //better save then sorry - QMessageBox::warning(0, tr("Error"), e.description()); + QMessageBox::warning(nullptr, tr("Error"), e.description()); } QStandardItem* idItem = item(rowNumber, 0); @@ -278,7 +278,7 @@ void ConnectionModel::addConnection() } transaction.commit(); } catch (Exception &e) { //better save then sorry - QMessageBox::warning(0, tr("Error"), e.description()); + QMessageBox::warning(nullptr, tr("Error"), e.description()); } } } @@ -303,7 +303,7 @@ void ConnectionModel::deleteConnectionByRow(int currentRow) void ConnectionModel::handleException() { - QMessageBox::warning(0, tr("Error"), m_exceptionError); + QMessageBox::warning(nullptr, tr("Error"), m_exceptionError); resetModel(); } diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionview.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionview.cpp index 2e7c9d4f54..2c3d5fb534 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionview.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionview.cpp @@ -52,9 +52,7 @@ ConnectionView::ConnectionView(QObject *parent) : AbstractView(parent), connectionViewWidget()->setBackendModel(m_backendModel); } -ConnectionView::~ConnectionView() -{ -} +ConnectionView::~ConnectionView() = default; void ConnectionView::modelAttached(Model *model) { diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp index 9a92bb0852..1c62cec81b 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp @@ -196,13 +196,13 @@ void ConnectionViewWidget::invalidateButtonStatus() setEnabledAddButton(true); } else if (currentTab() == BindingTab) { emit setEnabledRemoveButton(ui->bindingView->selectionModel()->hasSelection()); - BindingModel *bindingModel = qobject_cast<BindingModel*>(ui->bindingView->model()); + auto bindingModel = qobject_cast<BindingModel*>(ui->bindingView->model()); setEnabledAddButton(bindingModel->connectionView()->model() && bindingModel->connectionView()->selectedModelNodes().count() == 1); } else if (currentTab() == DynamicPropertiesTab) { emit setEnabledRemoveButton(ui->dynamicPropertiesView->selectionModel()->hasSelection()); - DynamicPropertiesModel *dynamicPropertiesModel = qobject_cast<DynamicPropertiesModel*>(ui->dynamicPropertiesView->model()); + auto dynamicPropertiesModel = qobject_cast<DynamicPropertiesModel*>(ui->dynamicPropertiesView->model()); setEnabledAddButton(dynamicPropertiesModel->connectionView()->model() && dynamicPropertiesModel->connectionView()->selectedModelNodes().count() == 1); } else if (currentTab() == BackendTab) { @@ -242,7 +242,7 @@ void ConnectionViewWidget::removeButtonClicked() if (ui->connectionView->selectionModel()->selectedRows().isEmpty()) return; int currentRow = ui->connectionView->selectionModel()->selectedRows().constFirst().row(); - ConnectionModel *connectionModel = qobject_cast<ConnectionModel*>(ui->connectionView->model()); + auto connectionModel = qobject_cast<ConnectionModel*>(ui->connectionView->model()); if (connectionModel) { connectionModel->deleteConnectionByRow(currentRow); } @@ -250,7 +250,7 @@ void ConnectionViewWidget::removeButtonClicked() if (ui->bindingView->selectionModel()->selectedRows().isEmpty()) return; int currentRow = ui->bindingView->selectionModel()->selectedRows().constFirst().row(); - BindingModel *bindingModel = qobject_cast<BindingModel*>(ui->bindingView->model()); + auto bindingModel = qobject_cast<BindingModel*>(ui->bindingView->model()); if (bindingModel) { bindingModel->deleteBindindByRow(currentRow); } @@ -258,12 +258,12 @@ void ConnectionViewWidget::removeButtonClicked() if (ui->dynamicPropertiesView->selectionModel()->selectedRows().isEmpty()) return; int currentRow = ui->dynamicPropertiesView->selectionModel()->selectedRows().constFirst().row(); - DynamicPropertiesModel *dynamicPropertiesModel = qobject_cast<DynamicPropertiesModel*>(ui->dynamicPropertiesView->model()); + auto dynamicPropertiesModel = qobject_cast<DynamicPropertiesModel*>(ui->dynamicPropertiesView->model()); if (dynamicPropertiesModel) dynamicPropertiesModel->deleteDynamicPropertyByRow(currentRow); } else if (currentTab() == BackendTab) { int currentRow = ui->backendView->selectionModel()->selectedRows().constFirst().row(); - BackendModel *backendModel = qobject_cast<BackendModel*>(ui->backendView->model()); + auto backendModel = qobject_cast<BackendModel*>(ui->backendView->model()); if (backendModel) backendModel->deletePropertyByRow(currentRow); } @@ -275,22 +275,22 @@ void ConnectionViewWidget::addButtonClicked() { if (currentTab() == ConnectionTab) { - ConnectionModel *connectionModel = qobject_cast<ConnectionModel*>(ui->connectionView->model()); + auto connectionModel = qobject_cast<ConnectionModel*>(ui->connectionView->model()); if (connectionModel) { connectionModel->addConnection(); } } else if (currentTab() == BindingTab) { - BindingModel *bindingModel = qobject_cast<BindingModel*>(ui->bindingView->model()); + auto bindingModel = qobject_cast<BindingModel*>(ui->bindingView->model()); if (bindingModel) { bindingModel->addBindingForCurrentNode(); } } else if (currentTab() == DynamicPropertiesTab) { - DynamicPropertiesModel *dynamicPropertiesModel = qobject_cast<DynamicPropertiesModel*>(ui->dynamicPropertiesView->model()); + auto dynamicPropertiesModel = qobject_cast<DynamicPropertiesModel*>(ui->dynamicPropertiesView->model()); if (dynamicPropertiesModel) dynamicPropertiesModel->addDynamicPropertyForCurrentNode(); } else if (currentTab() == BackendTab) { - BackendModel *backendModel = qobject_cast<BackendModel*>(ui->backendView->model()); + auto backendModel = qobject_cast<BackendModel*>(ui->backendView->model()); if (backendModel) backendModel->addNewBackend(); } diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.cpp index cf9c5b6f7e..1a9958f916 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.cpp @@ -76,7 +76,7 @@ void PropertiesComboBox::setText(const QString &text) void PropertiesComboBox::disableValidator() { - setValidator(0); + setValidator(nullptr); } ConnectionComboBox::ConnectionComboBox(QWidget *parent) : PropertiesComboBox(parent) @@ -110,8 +110,8 @@ void ConnectionEditorDelegate::paint(QPainter *painter, BindingDelegate::BindingDelegate(QWidget *parent) : ConnectionEditorDelegate(parent) { - static QItemEditorFactory *factory = 0; - if (factory == 0) { + static QItemEditorFactory *factory = nullptr; + if (factory == nullptr) { factory = new QItemEditorFactory; QItemEditorCreatorBase *creator = new QItemEditorCreator<PropertiesComboBox>("text"); @@ -125,7 +125,7 @@ QWidget *BindingDelegate::createEditor(QWidget *parent, const QStyleOptionViewIt { QWidget *widget = QStyledItemDelegate::createEditor(parent, option, index); - const BindingModel *model = qobject_cast<const BindingModel*>(index.model()); + const auto model = qobject_cast<const BindingModel*>(index.model()); if (!model) { qWarning() << "BindingDelegate::createEditor no model"; return widget; @@ -137,7 +137,7 @@ QWidget *BindingDelegate::createEditor(QWidget *parent, const QStyleOptionViewIt model->connectionView()->allModelNodes(); - PropertiesComboBox *bindingComboBox = qobject_cast<PropertiesComboBox*>(widget); + auto bindingComboBox = qobject_cast<PropertiesComboBox*>(widget); if (!bindingComboBox) { qWarning() << "BindingDelegate::createEditor no bindingComboBox"; return widget; @@ -192,7 +192,7 @@ QWidget *DynamicPropertiesDelegate::createEditor(QWidget *parent, const QStyleOp { QWidget *widget = QStyledItemDelegate::createEditor(parent, option, index); - const DynamicPropertiesModel *model = qobject_cast<const DynamicPropertiesModel*>(index.model()); + const auto model = qobject_cast<const DynamicPropertiesModel*>(index.model()); if (!model) { qWarning() << "BindingDelegate::createEditor no model"; return widget; @@ -206,14 +206,14 @@ QWidget *DynamicPropertiesDelegate::createEditor(QWidget *parent, const QStyleOp switch (index.column()) { case DynamicPropertiesModel::TargetModelNodeRow: { - return 0; //no editor + return nullptr; //no editor }; case DynamicPropertiesModel::PropertyNameRow: { return QStyledItemDelegate::createEditor(parent, option, index); }; case DynamicPropertiesModel::PropertyTypeRow: { - PropertiesComboBox *dynamicPropertiesComboBox = new PropertiesComboBox(parent); + auto dynamicPropertiesComboBox = new PropertiesComboBox(parent); connect(dynamicPropertiesComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, [=]() { auto delegate = const_cast<DynamicPropertiesDelegate*>(this); emit delegate->commitData(dynamicPropertiesComboBox); @@ -236,13 +236,13 @@ QWidget *DynamicPropertiesDelegate::createEditor(QWidget *parent, const QStyleOp default: qWarning() << "BindingDelegate::createEditor column" << index.column(); } - return 0; + return nullptr; } ConnectionDelegate::ConnectionDelegate(QWidget *parent) : ConnectionEditorDelegate(parent) { - static QItemEditorFactory *factory = 0; - if (factory == 0) { + static QItemEditorFactory *factory = nullptr; + if (factory == nullptr) { factory = new QItemEditorFactory; QItemEditorCreatorBase *creator = new QItemEditorCreator<ConnectionComboBox>("text"); @@ -257,9 +257,9 @@ QWidget *ConnectionDelegate::createEditor(QWidget *parent, const QStyleOptionVie QWidget *widget = QStyledItemDelegate::createEditor(parent, option, index); - const ConnectionModel *connectionModel = qobject_cast<const ConnectionModel*>(index.model()); + const auto connectionModel = qobject_cast<const ConnectionModel*>(index.model()); - ConnectionComboBox *connectionComboBox = qobject_cast<ConnectionComboBox*>(widget); + auto connectionComboBox = qobject_cast<ConnectionComboBox*>(widget); if (!connectionModel) { qWarning() << "ConnectionDelegate::createEditor no model"; @@ -322,7 +322,7 @@ BackendDelegate::BackendDelegate(QWidget *parent) : ConnectionEditorDelegate(par QWidget *BackendDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const { - const BackendModel *model = qobject_cast<const BackendModel*>(index.model()); + const auto model = qobject_cast<const BackendModel*>(index.model()); model->connectionView()->allModelNodes(); @@ -333,7 +333,7 @@ QWidget *BackendDelegate::createEditor(QWidget *parent, const QStyleOptionViewIt switch (index.column()) { case BackendModel::TypeNameColumn: { - PropertiesComboBox *backendComboBox = new PropertiesComboBox(parent); + auto backendComboBox = new PropertiesComboBox(parent); backendComboBox->addItems(model->possibleCppTypes()); connect(backendComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, [=]() { auto delegate = const_cast<BackendDelegate*>(this); @@ -345,10 +345,10 @@ QWidget *BackendDelegate::createEditor(QWidget *parent, const QStyleOptionViewIt return widget; }; case BackendModel::IsSingletonColumn: { - return 0; //no editor + return nullptr; //no editor }; case BackendModel::IsLocalColumn: { - return 0; //no editor + return nullptr; //no editor }; default: qWarning() << "BackendDelegate::createEditor column" << index.column(); } diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/dynamicpropertiesmodel.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/dynamicpropertiesmodel.cpp index 620cd9bf0f..8d4186a5b5 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/dynamicpropertiesmodel.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/dynamicpropertiesmodel.cpp @@ -475,7 +475,7 @@ void DynamicPropertiesModel::updatePropertyName(int rowNumber) targetNode.removeProperty(bindingProperty.name()); transaction.commit(); //committing in the try block } catch (Exception &e) { //better save then sorry - QMessageBox::warning(0, tr("Error"), e.description()); + QMessageBox::warning(nullptr, tr("Error"), e.description()); } updateCustomData(rowNumber, targetNode.bindingProperty(newName)); @@ -495,7 +495,7 @@ void DynamicPropertiesModel::updatePropertyName(int rowNumber) targetNode.removeProperty(variantProperty.name()); transaction.commit(); //committing in the try block } catch (Exception &e) { //better save then sorry - QMessageBox::warning(0, tr("Error"), e.description()); + QMessageBox::warning(nullptr, tr("Error"), e.description()); } updateCustomData(rowNumber, targetNode.variantProperty(newName)); @@ -525,7 +525,7 @@ void DynamicPropertiesModel::updatePropertyType(int rowNumber) targetNode.bindingProperty(propertyName).setDynamicTypeNameAndExpression(newType, expression); transaction.commit(); //committing in the try block } catch (Exception &e) { //better save then sorry - QMessageBox::warning(0, tr("Error"), e.description()); + QMessageBox::warning(nullptr, tr("Error"), e.description()); } updateCustomData(rowNumber, targetNode.bindingProperty(propertyName)); @@ -549,7 +549,7 @@ void DynamicPropertiesModel::updatePropertyType(int rowNumber) } transaction.commit(); //committing in the try block } catch (Exception &e) { //better save then sorry - QMessageBox::warning(0, tr("Error"), e.description()); + QMessageBox::warning(nullptr, tr("Error"), e.description()); } updateCustomData(rowNumber, targetNode.variantProperty(propertyName)); @@ -683,7 +683,7 @@ void DynamicPropertiesModel::handleDataChanged(const QModelIndex &topLeft, const void DynamicPropertiesModel::handleException() { - QMessageBox::warning(0, tr("Error"), m_exceptionError); + QMessageBox::warning(nullptr, tr("Error"), m_exceptionError); resetModel(); } diff --git a/src/plugins/qmldesigner/qmldesignerextension/pathtool/controlpoint.cpp b/src/plugins/qmldesigner/qmldesignerextension/pathtool/controlpoint.cpp index 0032b237f9..d2a8bf75c3 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/pathtool/controlpoint.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/pathtool/controlpoint.cpp @@ -33,14 +33,9 @@ namespace QmlDesigner { -ControlPoint::ControlPoint() -{ -} +ControlPoint::ControlPoint() = default; -ControlPoint::ControlPoint(const ControlPoint &other) - : d(other.d) -{ -} +ControlPoint::ControlPoint(const ControlPoint &other) = default; ControlPoint::ControlPoint(const QPointF &coordinate) : d(new ControlPointData) @@ -54,9 +49,7 @@ ControlPoint::ControlPoint(double x, double y) d->coordinate = QPointF(x, y); } -ControlPoint::~ControlPoint() -{ -} +ControlPoint::~ControlPoint() = default; ControlPoint &ControlPoint::operator =(const ControlPoint &other) { diff --git a/src/plugins/qmldesigner/qmldesignerextension/pathtool/cubicsegment.cpp b/src/plugins/qmldesigner/qmldesignerextension/pathtool/cubicsegment.cpp index be72a33ee1..0005514339 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/pathtool/cubicsegment.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/pathtool/cubicsegment.cpp @@ -31,9 +31,7 @@ namespace QmlDesigner { -CubicSegment::CubicSegment() -{ -} +CubicSegment::CubicSegment() = default; CubicSegment CubicSegment::create() { diff --git a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.cpp b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.cpp index e6fb45b4b1..c289c900fe 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.cpp @@ -45,7 +45,7 @@ PathItem::PathItem(FormEditorScene* scene) : QGraphicsObject(), m_selectionManipulator(this), m_lastPercent(-1.), - m_formEditorItem(0), + m_formEditorItem(nullptr), m_dontUpdatePath(false) { scene->addItem(this); @@ -54,7 +54,7 @@ PathItem::PathItem(FormEditorScene* scene) PathItem::~PathItem() { - m_formEditorItem = 0; + m_formEditorItem = nullptr; } static ModelNode pathModelNode(FormEditorItem *formEditorItem) @@ -64,7 +64,7 @@ static ModelNode pathModelNode(FormEditorItem *formEditorItem) return modelNode.nodeProperty("path").modelNode(); } -typedef QPair<PropertyName, QVariant> PropertyPair; +using PropertyPair = QPair<PropertyName, QVariant>; void PathItem::writeLinePath(ModelNode pathNode, const CubicSegment &cubicSegment) { @@ -557,7 +557,7 @@ void PathItem::readControlPoints() } } -static CubicSegment getMinimumDistanceSegment(const QPointF &pickPoint, const QList<CubicSegment> &cubicSegments, double maximumDistance, double *t = 0) +static CubicSegment getMinimumDistanceSegment(const QPointF &pickPoint, const QList<CubicSegment> &cubicSegments, double maximumDistance, double *t = nullptr) { CubicSegment minimumDistanceSegment; double actualMinimumDistance = maximumDistance; @@ -610,7 +610,7 @@ void PathItem::openPath() QAction *PathItem::createClosedPathAction(QMenu *contextMenu) const { - QAction *closedPathAction = new QAction(contextMenu); + auto closedPathAction = new QAction(contextMenu); closedPathAction->setCheckable(true); closedPathAction->setChecked(isClosedPath()); closedPathAction->setText(tr("Closed Path")); @@ -638,11 +638,11 @@ void PathItem::createCubicSegmentContextMenu(CubicSegment &cubicSegment, const Q { QMenu contextMenu; - QAction *splitSegmentAction = new QAction(&contextMenu); + auto splitSegmentAction = new QAction(&contextMenu); splitSegmentAction->setText(tr("Split Segment")); contextMenu.addAction(splitSegmentAction); - QAction *straightLinePointAction = new QAction(&contextMenu); + auto straightLinePointAction = new QAction(&contextMenu); straightLinePointAction->setText(tr("Make Curve Segment Straight")); contextMenu.addAction(straightLinePointAction); @@ -672,7 +672,7 @@ void PathItem::createCubicSegmentContextMenu(CubicSegment &cubicSegment, const Q void PathItem::createEditPointContextMenu(const ControlPoint &controlPoint, const QPoint &menuPosition) { QMenu contextMenu; - QAction *removeEditPointAction = new QAction(&contextMenu); + auto removeEditPointAction = new QAction(&contextMenu); removeEditPointAction->setText(tr("Remove Edit Point")); contextMenu.addAction(removeEditPointAction); diff --git a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.h b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.h index d431262b39..93680c2355 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.h +++ b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.h @@ -72,7 +72,7 @@ public: Type = 0xEAAC }; PathItem(FormEditorScene* scene); - ~PathItem(); + ~PathItem() override; int type() const override; void setFormEditorItem(FormEditorItem *formEditorItem); diff --git a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathselectionmanipulator.cpp b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathselectionmanipulator.cpp index 510181258e..6df6976233 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathselectionmanipulator.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathselectionmanipulator.cpp @@ -166,9 +166,7 @@ void PathSelectionManipulator::endMultiSelection() m_isMultiSelecting = false; } -SelectionPoint::SelectionPoint() -{ -} +SelectionPoint::SelectionPoint() = default; SelectionPoint::SelectionPoint(const ControlPoint &controlPoint) : controlPoint(controlPoint) diff --git a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathtool.cpp b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathtool.cpp index 66582f017d..6873c8e62c 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathtool.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathtool.cpp @@ -101,28 +101,28 @@ class PathToolAction : public AbstractAction public: PathToolAction() : AbstractAction(QCoreApplication::translate("PathToolAction","Edit Path")) {} - QByteArray category() const + QByteArray category() const override { return QByteArray(); } - QByteArray menuId() const + QByteArray menuId() const override { return "PathTool"; } - int priority() const + int priority() const override { return CustomActionsPriority; } - Type type() const + Type type() const override { return ContextMenuAction; } protected: - bool isVisible(const SelectionContext &selectionContext) const + bool isVisible(const SelectionContext &selectionContext) const override { if (selectionContext.scenePosition().isNull()) return false; @@ -133,7 +133,7 @@ protected: return false; } - bool isEnabled(const SelectionContext &selectionContext) const + bool isEnabled(const SelectionContext &selectionContext) const override { return isVisible(selectionContext); } @@ -144,7 +144,7 @@ PathTool::PathTool() AbstractCustomTool(), m_pathToolView(this) { - PathToolAction *textToolAction = new PathToolAction; + auto textToolAction = new PathToolAction; QmlDesignerPlugin::instance()->designerActionManager().addDesignerAction(textToolAction); connect(textToolAction->action(), &QAction::triggered, [=]() { if (m_pathToolView.model()) @@ -155,9 +155,7 @@ PathTool::PathTool() } -PathTool::~PathTool() -{ -} +PathTool::~PathTool() = default; void PathTool::clear() { @@ -239,7 +237,7 @@ void PathTool::mouseDoubleClickEvent(const QList<QGraphicsItem*> & /*itemList*/, void PathTool::itemsAboutToRemoved(const QList<FormEditorItem*> &removedItemList) { - if (m_pathItem == 0) + if (m_pathItem == nullptr) return; if (removedItemList.contains(m_pathItem->formEditorItem())) @@ -280,7 +278,7 @@ void PathTool::instancesParentChanged(const QList<FormEditorItem *> & /*itemLis void PathTool::instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) { - typedef QPair<ModelNode, PropertyName> ModelNodePropertyNamePair; + using ModelNodePropertyNamePair = QPair<ModelNode, PropertyName>; foreach (const ModelNodePropertyNamePair &propertyPair, propertyList) { if (propertyPair.first == m_pathItem->formEditorItem()->qmlItemNode().modelNode() && propertyPair.second == "path") diff --git a/src/plugins/qmldesigner/qmldesignerextension/sourcetool/sourcetool.cpp b/src/plugins/qmldesigner/qmldesignerextension/sourcetool/sourcetool.cpp index 9c7f32c1bb..0dad29f3c2 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/sourcetool/sourcetool.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/sourcetool/sourcetool.cpp @@ -79,35 +79,35 @@ public: action()->setIcon(prevIcon.icon()); } - QByteArray category() const + QByteArray category() const override { return QByteArray(); } - QByteArray menuId() const + QByteArray menuId() const override { return "SourceTool"; } - int priority() const + int priority() const override { return CustomActionsPriority; } - Type type() const + Type type() const override { return FormEditorAction; } protected: - bool isVisible(const SelectionContext &selectionContext) const + bool isVisible(const SelectionContext &selectionContext) const override { if (selectionContext.singleNodeIsSelected()) return modelNodeHasUrlSource(selectionContext.currentSingleSelectedNode()); return false; } - bool isEnabled(const SelectionContext &selectionContext) const + bool isEnabled(const SelectionContext &selectionContext) const override { return isVisible(selectionContext); } @@ -117,16 +117,14 @@ protected: SourceTool::SourceTool() : QObject(), AbstractCustomTool() { - SourceToolAction *sourceToolAction = new SourceToolAction; + auto sourceToolAction = new SourceToolAction; QmlDesignerPlugin::instance()->designerActionManager().addDesignerAction(sourceToolAction); connect(sourceToolAction->action(), &QAction::triggered, [=]() { view()->changeCurrentToolTo(this); }); } -SourceTool::~SourceTool() -{ -} +SourceTool::~SourceTool() = default; void SourceTool::clear() { @@ -199,7 +197,7 @@ void SourceTool::selectedItemsChanged(const QList<FormEditorItem*> &itemList) if (openDirectory.isEmpty()) openDirectory = baseDirectory(view()->model()->fileUrl()); - QString fileName = QFileDialog::getOpenFileName(0, + QString fileName = QFileDialog::getOpenFileName(nullptr, tr("Open File"), openDirectory); fileSelected(fileName); diff --git a/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititem.cpp b/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititem.cpp index 0728c8128b..1ce3244cbc 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititem.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititem.cpp @@ -36,14 +36,14 @@ namespace QmlDesigner { TextEditItem::TextEditItem(FormEditorScene* scene) : TextEditItemWidget(scene) - , m_formEditorItem(0) + , m_formEditorItem(nullptr) { connect(lineEdit(), &QLineEdit::returnPressed, this, &TextEditItem::returnPressed); } TextEditItem::~TextEditItem() { - m_formEditorItem = 0; + m_formEditorItem = nullptr; } void TextEditItem::writeTextToProperty() diff --git a/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititem.h b/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititem.h index 4213de9822..5497dadbe1 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititem.h +++ b/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititem.h @@ -36,8 +36,8 @@ class TextEditItem : public TextEditItemWidget Q_OBJECT public: TextEditItem(FormEditorScene* scene); - ~TextEditItem(); - int type() const; + ~TextEditItem() override; + int type() const override; void setFormEditorItem(FormEditorItem *formEditorItem); FormEditorItem *formEditorItem() const; diff --git a/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititemwidget.cpp b/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititemwidget.cpp index e9380a6c71..750589aa9a 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititemwidget.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititemwidget.cpp @@ -43,7 +43,7 @@ TextEditItemWidget::TextEditItemWidget(QGraphicsScene* scene) TextEditItemWidget::~TextEditItemWidget() { - setWidget(0); + setWidget(nullptr); } void TextEditItemWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/) diff --git a/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititemwidget.h b/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititemwidget.h index d0caf3a265..7ff2909919 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititemwidget.h +++ b/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititemwidget.h @@ -40,7 +40,7 @@ class TextEditItemWidget : public QGraphicsProxyWidget Q_OBJECT public: TextEditItemWidget(QGraphicsScene *scene); - ~TextEditItemWidget(); + ~TextEditItemWidget() override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; diff --git a/src/plugins/qmldesigner/qmldesignerextension/texttool/texttool.cpp b/src/plugins/qmldesigner/qmldesignerextension/texttool/texttool.cpp index fcaaba72ce..1d22f2f876 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/texttool/texttool.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/texttool/texttool.cpp @@ -54,28 +54,28 @@ class TextToolAction : public AbstractAction public: TextToolAction() : AbstractAction(QCoreApplication::translate("TextToolAction","Edit Text")) {} - QByteArray category() const + QByteArray category() const override { return QByteArray(); } - QByteArray menuId() const + QByteArray menuId() const override { return "TextTool"; } - int priority() const + int priority() const override { return CustomActionsPriority; } - Type type() const + Type type() const override { return ContextMenuAction; } protected: - bool isVisible(const SelectionContext &selectionContext) const + bool isVisible(const SelectionContext &selectionContext) const override { if (selectionContext.scenePosition().isNull()) return false; @@ -86,7 +86,7 @@ protected: return false; } - bool isEnabled(const SelectionContext &selectionContext) const + bool isEnabled(const SelectionContext &selectionContext) const override { return isVisible(selectionContext); } @@ -95,16 +95,14 @@ protected: TextTool::TextTool() : QObject() , AbstractCustomTool() { - TextToolAction *textToolAction = new TextToolAction; + auto textToolAction = new TextToolAction; QmlDesignerPlugin::instance()->designerActionManager().addDesignerAction(textToolAction); connect(textToolAction->action(), &QAction::triggered, [=]() { view()->changeCurrentToolTo(this); }); } -TextTool::~TextTool() -{ -} +TextTool::~TextTool() = default; void TextTool::clear() { @@ -195,7 +193,7 @@ void TextTool::mouseDoubleClickEvent(const QList<QGraphicsItem*> & /*itemList*/, void TextTool::itemsAboutToRemoved(const QList<FormEditorItem*> &removedItemList) { - if (textItem() == 0) + if (textItem() == nullptr) return; if (removedItemList.contains(textItem()->formEditorItem())) @@ -232,7 +230,7 @@ void TextTool::instancesParentChanged(const QList<FormEditorItem *> & /*itemLis void TextTool::instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) { - typedef QPair<ModelNode, PropertyName> ModelNodePropertyNamePair; + using ModelNodePropertyNamePair = QPair<ModelNode, PropertyName>; foreach (const ModelNodePropertyNamePair &propertyPair, propertyList) { if (propertyPair.first == textItem()->formEditorItem()->qmlItemNode().modelNode() && propertyPair.second == "text") diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp index 2536b0091c..3c3692d8ad 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp @@ -28,11 +28,7 @@ namespace QmlDesigner { - -QtQuickPlugin::QtQuickPlugin() -{ - -} +QtQuickPlugin::QtQuickPlugin() = default; QString QtQuickPlugin::pluginName() const { diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h index 831c8f65e7..eff352a14d 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h @@ -40,10 +40,10 @@ class QtQuickPlugin : public QObject, QmlDesigner::IWidgetPlugin Q_INTERFACES(QmlDesigner::IWidgetPlugin) public: QtQuickPlugin(); - ~QtQuickPlugin() {} + ~QtQuickPlugin() override = default; - QString metaInfo() const; - QString pluginName() const; + QString metaInfo() const override; + QString pluginName() const override; }; diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp index 882e48eb1e..6fb88e5f21 100644 --- a/src/plugins/qmldesigner/settingspage.cpp +++ b/src/plugins/qmldesigner/settingspage.cpp @@ -228,7 +228,7 @@ void SettingsPageWidget::setSettings(const DesignerSettings &settings) } SettingsPage::SettingsPage() : - m_widget(0) + m_widget(nullptr) { setId("B.QmlDesigner"); setDisplayName(tr("Qt Quick Designer")); diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp index 9bb8574b28..7c914f7e08 100644 --- a/src/plugins/qmldesigner/shortcutmanager.cpp +++ b/src/plugins/qmldesigner/shortcutmanager.cpp @@ -365,7 +365,7 @@ DesignDocument *ShortCutManager::currentDesignDocument() const void ShortCutManager::undoAvailable(bool isAvailable) { - DesignDocument *documentController = qobject_cast<DesignDocument*>(sender()); + auto documentController = qobject_cast<DesignDocument*>(sender()); if (currentDesignDocument() && currentDesignDocument() == documentController) { m_undoAction.setEnabled(isAvailable); @@ -374,7 +374,7 @@ void ShortCutManager::undoAvailable(bool isAvailable) void ShortCutManager::redoAvailable(bool isAvailable) { - DesignDocument *documentController = qobject_cast<DesignDocument*>(sender()); + auto documentController = qobject_cast<DesignDocument*>(sender()); if (currentDesignDocument() && currentDesignDocument() == documentController) { m_redoAction.setEnabled(isAvailable); diff --git a/src/plugins/qmldesigner/switchsplittabwidget.cpp b/src/plugins/qmldesigner/switchsplittabwidget.cpp index 7a1c14187c..9d81f3564d 100644 --- a/src/plugins/qmldesigner/switchsplittabwidget.cpp +++ b/src/plugins/qmldesigner/switchsplittabwidget.cpp @@ -77,7 +77,7 @@ SwitchSplitTabWidget::SwitchSplitTabWidget(QWidget *parent) m_tabBarBackground->layout()->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding)); m_tabBarBackground->layout()->addWidget(m_tabBar); - QToolButton *horizontalButton = new QToolButton; + auto horizontalButton = new QToolButton; horizontalButton->setObjectName("centralTabBar"); horizontalButton->setIcon(Utils::Icon({{QLatin1String(":/qmldesigner/images/spliteditorvertically.png"), Utils::Theme::IconsBaseColor}}).icon()); @@ -87,7 +87,7 @@ SwitchSplitTabWidget::SwitchSplitTabWidget(QWidget *parent) updateSplitterSizes(); selectFakeTab(); }); - QToolButton *verticalButton = new QToolButton; + auto verticalButton = new QToolButton; verticalButton->setObjectName("centralTabBar"); verticalButton->setIcon(Utils::Icon({{QLatin1String(":/qmldesigner/images/spliteditorhorizontally.png"), Utils::Theme::IconsBaseColor}}).icon()); |