diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp index 5ffa497c9e5..9201f16d639 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp @@ -269,10 +269,10 @@ void AssetExporter::preprocessQmlFile(const Utils::FilePath &path) textEdit.setPlainText(QString::fromUtf8(reader.data())); NotIndentingTextEditModifier *modifier = new NotIndentingTextEditModifier(&textEdit); modifier->setParent(model.get()); - RewriterView *rewriterView = new RewriterView(QmlDesigner::RewriterView::Validate, model.get()); + auto rewriterView = std::make_unique(QmlDesigner::RewriterView::Validate); rewriterView->setCheckSemanticErrors(false); rewriterView->setTextModifier(modifier); - model->attachView(rewriterView); + model->attachView(rewriterView.get()); rewriterView->restoreAuxiliaryData(); ModelNode rootNode = rewriterView->rootModelNode(); if (!rootNode.isValid()) { diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp index f43217beab4..7d3b18eee43 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp @@ -23,8 +23,8 @@ const int MinRetry = 2; namespace QmlDesigner { -AssetExporterView::AssetExporterView(QObject *parent) : AbstractView(parent), - m_timer(this) +AssetExporterView::AssetExporterView() + : m_timer(this) { m_timer.setInterval(RetryIntervalMs); // We periodically check if file is loaded. diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.h b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.h index b2acfdf39d3..9d5dd365f1b 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.h +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.h @@ -29,7 +29,7 @@ public: Loaded }; - AssetExporterView(QObject *parent = nullptr); + AssetExporterView(); bool loadQmlFile(const Utils::FilePath &path, uint timeoutSecs = 10); bool saveQmlFile(QString *error) const; diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp index a62518e8a1c..1d14ae1adb5 100644 --- a/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp +++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp @@ -43,9 +43,7 @@ public: SynchronousImageCache synchronousFontImageCache{storage, timeStampProvider, fontCollector}; }; -AssetsLibraryView::AssetsLibraryView(QObject *parent) - : AbstractView(parent) -{} +AssetsLibraryView::AssetsLibraryView() {} AssetsLibraryView::~AssetsLibraryView() {} diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.h b/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.h index caaea4961e9..cea3885c78c 100644 --- a/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.h +++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.h @@ -19,7 +19,7 @@ class AssetsLibraryView : public AbstractView Q_OBJECT public: - AssetsLibraryView(QObject* parent = nullptr); + AssetsLibraryView(); ~AssetsLibraryView() override; bool hasWidget() const override; diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanagerview.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanagerview.cpp index abaeb0ba0d9..ba3bdb1c603 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanagerview.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanagerview.cpp @@ -12,10 +12,9 @@ namespace QmlDesigner { DesignerActionManagerView::DesignerActionManagerView() - : AbstractView(nullptr), - m_designerActionManager(this), - m_isInRewriterTransaction(false), - m_setupContextDirty(false) + : m_designerActionManager(this) + , m_isInRewriterTransaction(false) + , m_setupContextDirty(false) { } diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index 1ab3548b994..24590a9c69a 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -581,7 +581,7 @@ static QString toUpper(const QString &signal) static void addSignal(const QString &typeName, const QString &itemId, const QString &signalName, bool isRootModelNode) { auto model = Model::create("Item", 2, 0); - RewriterView rewriterView(RewriterView::Amend, nullptr); + RewriterView rewriterView(RewriterView::Amend); auto textEdit = qobject_cast (Core::EditorManager::currentEditor()->widget()); @@ -1525,7 +1525,7 @@ void styleMerge(const SelectionContext &selectionContext, const QString &templat textEditTemplate.setPlainText(imports + qmlTemplateString); NotIndentingTextEditModifier textModifierTemplate(&textEditTemplate); - QScopedPointer templateRewriterView(new RewriterView(RewriterView::Amend, nullptr)); + QScopedPointer templateRewriterView(new RewriterView(RewriterView::Amend)); templateRewriterView->setTextModifier(&textModifierTemplate); templateModel->attachView(templateRewriterView.data()); templateRewriterView->setCheckSemanticErrors(false); @@ -1544,7 +1544,7 @@ void styleMerge(const SelectionContext &selectionContext, const QString &templat textEditStyle.setPlainText(parentRewriterView->textModifierContent()); NotIndentingTextEditModifier textModifierStyle(&textEditStyle); - QScopedPointer styleRewriterView(new RewriterView(RewriterView::Amend, nullptr)); + QScopedPointer styleRewriterView(new RewriterView(RewriterView::Amend)); styleRewriterView->setTextModifier(&textModifierStyle); styleModel->attachView(styleRewriterView.data()); diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionview.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionview.cpp index dfcf496133f..ad10765c7aa 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionview.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionview.cpp @@ -24,12 +24,12 @@ namespace QmlDesigner { namespace Internal { -ConnectionView::ConnectionView(QObject *parent) : AbstractView(parent), - m_connectionViewWidget(new ConnectionViewWidget()), - m_connectionModel(new ConnectionModel(this)), - m_bindingModel(new BindingModel(this)), - m_dynamicPropertiesModel(new DynamicPropertiesModel(false, this)), - m_backendModel(new BackendModel(this)) +ConnectionView::ConnectionView() + : m_connectionViewWidget(new ConnectionViewWidget()) + , m_connectionModel(new ConnectionModel(this)) + , m_bindingModel(new BindingModel(this)) + , m_dynamicPropertiesModel(new DynamicPropertiesModel(false, this)) + , m_backendModel(new BackendModel(this)) { connectionViewWidget()->setBindingModel(m_bindingModel); connectionViewWidget()->setConnectionModel(m_connectionModel); diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionview.h b/src/plugins/qmldesigner/components/connectioneditor/connectionview.h index 336fdfdc45b..f98dd582b70 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionview.h +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionview.h @@ -28,7 +28,7 @@ class ConnectionView : public AbstractView Q_OBJECT public: - ConnectionView(QObject *parent = nullptr); + ConnectionView(); ~ConnectionView() override; // AbstractView diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp index 28a70f3f79f..0decde20297 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp @@ -21,9 +21,8 @@ namespace QmlDesigner { -CurveEditorView::CurveEditorView([[maybe_unused]] QObject *parent) - : AbstractView(parent) - , m_block(false) +CurveEditorView::CurveEditorView() + : m_block(false) , m_model(new CurveEditorModel()) , m_editor(new CurveEditor(m_model)) { diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.h b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.h index fdab546dc81..0972a2df449 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.h +++ b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.h @@ -16,7 +16,7 @@ class CurveEditorView : public AbstractView Q_OBJECT public: - explicit CurveEditorView(QObject *parent = nullptr); + explicit CurveEditorView(); ~CurveEditorView() override; public: diff --git a/src/plugins/qmldesigner/components/debugview/debugview.cpp b/src/plugins/qmldesigner/components/debugview/debugview.cpp index 547c6f580b8..48ef33ca390 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.cpp +++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp @@ -39,8 +39,8 @@ namespace QmlDesigner { namespace Internal { -DebugView::DebugView(QObject *parent) : AbstractView(parent), - m_debugViewWidget(new DebugViewWidget) +DebugView::DebugView() + : m_debugViewWidget(new DebugViewWidget) { } diff --git a/src/plugins/qmldesigner/components/debugview/debugview.h b/src/plugins/qmldesigner/components/debugview/debugview.h index bdfe0182327..f54828beaf6 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.h +++ b/src/plugins/qmldesigner/components/debugview/debugview.h @@ -17,7 +17,7 @@ class DebugView : public AbstractView Q_OBJECT public: - DebugView(QObject *parent = nullptr); + DebugView(); ~DebugView() override; // AbstractView diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp index 696a574dc0d..54195cf78c5 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp @@ -31,8 +31,7 @@ namespace QmlDesigner { -Edit3DView::Edit3DView(QObject *parent) - : AbstractView(parent) +Edit3DView::Edit3DView() { m_compressionTimer.setInterval(1000); m_compressionTimer.setSingleShot(true); diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.h b/src/plugins/qmldesigner/components/edit3d/edit3dview.h index 94c88ce5a20..2f8aa07e001 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.h +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.h @@ -27,7 +27,7 @@ class QMLDESIGNERCORE_EXPORT Edit3DView : public AbstractView Q_OBJECT public: - Edit3DView(QObject *parent = nullptr); + Edit3DView(); ~Edit3DView() override; WidgetInfo widgetInfo() override; diff --git a/src/plugins/qmldesigner/components/eventlist/eventlist.cpp b/src/plugins/qmldesigner/components/eventlist/eventlist.cpp index 33c64e61103..1745ced4c69 100644 --- a/src/plugins/qmldesigner/components/eventlist/eventlist.cpp +++ b/src/plugins/qmldesigner/components/eventlist/eventlist.cpp @@ -196,7 +196,7 @@ void EventList::initialize(EventListPluginView *parent) } if (!m_eventView) { - m_eventView = std::make_unique(m_model.get()); + m_eventView = std::make_unique(); m_model->attachView(m_eventView.get()); } } diff --git a/src/plugins/qmldesigner/components/eventlist/eventlistdialog.cpp b/src/plugins/qmldesigner/components/eventlist/eventlistdialog.cpp index f8b2446d8f8..0c6c84c3447 100644 --- a/src/plugins/qmldesigner/components/eventlist/eventlistdialog.cpp +++ b/src/plugins/qmldesigner/components/eventlist/eventlistdialog.cpp @@ -75,7 +75,8 @@ void EventListDialog::initialize(EventList &events) Model *model = events.model(); m_modifier->setParent(model); - m_rewriter = new RewriterView(QmlDesigner::RewriterView::Validate, model); + m_rewriter = new RewriterView(QmlDesigner::RewriterView::Validate); + m_rewriter->setParent(model); m_rewriter->setTextModifier(m_modifier); m_rewriter->setCheckSemanticErrors(false); model->attachView(m_rewriter); diff --git a/src/plugins/qmldesigner/components/eventlist/eventlistpluginview.cpp b/src/plugins/qmldesigner/components/eventlist/eventlistpluginview.cpp index 018d1f42dea..e74465f40a1 100644 --- a/src/plugins/qmldesigner/components/eventlist/eventlistpluginview.cpp +++ b/src/plugins/qmldesigner/components/eventlist/eventlistpluginview.cpp @@ -30,9 +30,8 @@ SignalHandlerProperty signalPropertyFromAction(ActionInterface *interface) return SignalHandlerProperty(); } -EventListPluginView::EventListPluginView(QObject* parent) - : AbstractView(parent) - , m_eventlist() +EventListPluginView::EventListPluginView() + : m_eventlist() , m_eventListDialog(nullptr) , m_assigner(nullptr) , m_signalConnector(nullptr) diff --git a/src/plugins/qmldesigner/components/eventlist/eventlistpluginview.h b/src/plugins/qmldesigner/components/eventlist/eventlistpluginview.h index 823d10b2c85..9264503ce90 100644 --- a/src/plugins/qmldesigner/components/eventlist/eventlistpluginview.h +++ b/src/plugins/qmldesigner/components/eventlist/eventlistpluginview.h @@ -16,7 +16,7 @@ class EventListPluginView : public AbstractView Q_OBJECT public: - EventListPluginView(QObject* parent = nullptr); + EventListPluginView(); ~EventListPluginView() override = default; void registerActions(); diff --git a/src/plugins/qmldesigner/components/eventlist/eventlistview.cpp b/src/plugins/qmldesigner/components/eventlist/eventlistview.cpp index f6b3a611c13..58619c854db 100644 --- a/src/plugins/qmldesigner/components/eventlist/eventlistview.cpp +++ b/src/plugins/qmldesigner/components/eventlist/eventlistview.cpp @@ -50,11 +50,9 @@ QStringList EventListModel::connectEvents(const QStringList &eventIds) return out; } - -EventListView::EventListView(QObject *parent) - : AbstractView(parent) - , m_eventlist() - , m_model(new EventListModel(this)) +EventListView::EventListView() + : m_eventlist() + , m_model(std::make_unique()) {} EventListView::~EventListView() {} @@ -78,7 +76,7 @@ void EventListView::nodeReparented(const ModelNode &node, EventListModel *EventListView::eventListModel() const { - return m_model; + return m_model.get(); } void EventListView::addEvent(const Event &event) diff --git a/src/plugins/qmldesigner/components/eventlist/eventlistview.h b/src/plugins/qmldesigner/components/eventlist/eventlistview.h index 1c27f4be32f..8ca045e6afb 100644 --- a/src/plugins/qmldesigner/components/eventlist/eventlistview.h +++ b/src/plugins/qmldesigner/components/eventlist/eventlistview.h @@ -7,6 +7,8 @@ #include #include +#include + namespace QmlDesigner { struct Event @@ -49,7 +51,7 @@ class EventListView : public AbstractView Q_OBJECT public: - explicit EventListView(QObject *parent = nullptr); + explicit EventListView(); ~EventListView() override; void nodeRemoved(const ModelNode &removedNode, @@ -73,7 +75,7 @@ private: void reset(); EventList m_eventlist; - EventListModel *m_model; + std::unique_ptr m_model; }; } // namespace QmlDesigner. diff --git a/src/plugins/qmldesigner/components/eventlist/nodelistview.cpp b/src/plugins/qmldesigner/components/eventlist/nodelistview.cpp index bbf4d0b8adc..3131688798a 100644 --- a/src/plugins/qmldesigner/components/eventlist/nodelistview.cpp +++ b/src/plugins/qmldesigner/components/eventlist/nodelistview.cpp @@ -41,11 +41,10 @@ NodeListModel::NodeListModel(QObject *parent) setSortRole(internalIdRole); } - NodeListView::NodeListView(AbstractView *parent) - : AbstractView(parent) - , m_itemModel(new NodeListModel(this)) + : m_itemModel(new NodeListModel(this)) { + setParent(parent); parent->model()->attachView(this); reset(); } diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index 41b8aed4d27..28f5cac8fc4 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -42,10 +42,7 @@ namespace QmlDesigner { -FormEditorView::FormEditorView(QObject *parent) - : AbstractView(parent) -{ -} +FormEditorView::FormEditorView() {} FormEditorScene* FormEditorView::scene() const { diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.h b/src/plugins/qmldesigner/components/formeditor/formeditorview.h index 719319450e4..c70a606e235 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.h @@ -39,7 +39,7 @@ class QMLDESIGNERCORE_EXPORT FormEditorView : public AbstractView Q_OBJECT public: - FormEditorView(QObject *parent = nullptr); + FormEditorView(); ~FormEditorView() override; // AbstractView diff --git a/src/plugins/qmldesigner/components/integration/componentview.cpp b/src/plugins/qmldesigner/components/integration/componentview.cpp index 2a6486fca79..6cd8c69a042 100644 --- a/src/plugins/qmldesigner/components/integration/componentview.cpp +++ b/src/plugins/qmldesigner/components/integration/componentview.cpp @@ -15,10 +15,9 @@ namespace QmlDesigner { -ComponentView::ComponentView(QObject *parent) - : AbstractView(parent), - m_standardItemModel(new QStandardItemModel(this)), - m_componentAction(new ComponentAction(this)) +ComponentView::ComponentView() + : m_standardItemModel(new QStandardItemModel(this)) + , m_componentAction(new ComponentAction(this)) { } diff --git a/src/plugins/qmldesigner/components/integration/componentview.h b/src/plugins/qmldesigner/components/integration/componentview.h index 7ffffdc3d9e..145549fbf6e 100644 --- a/src/plugins/qmldesigner/components/integration/componentview.h +++ b/src/plugins/qmldesigner/components/integration/componentview.h @@ -27,7 +27,7 @@ public: ModelNodeRole = Qt::UserRole }; - ComponentView(QObject *parent = nullptr); + ComponentView(); void modelAttached(Model *model) override; void modelAboutToBeDetached(Model *model) override; diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index 9f6f8bc7373..97cc756697e 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -63,7 +63,7 @@ namespace QmlDesigner { DesignDocument::DesignDocument(ProjectStorage &projectStorage) : m_documentModel(Model::create("QtQuick.Item", 1, 0)) , m_subComponentManager(new SubComponentManager(m_documentModel.get(), this)) - , m_rewriterView(new RewriterView(RewriterView::Amend, m_documentModel.get())) + , m_rewriterView(new RewriterView(RewriterView::Amend)) , m_documentLoaded(false) , m_currentTarget(nullptr) , m_projectStorage(projectStorage) diff --git a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp index 5e1de5a5ce4..c217bda183b 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp @@ -22,8 +22,8 @@ namespace QmlDesigner { -DesignDocumentView::DesignDocumentView(QObject *parent) - : AbstractView(parent), m_modelMerger(new ModelMerger(this)) +DesignDocumentView::DesignDocumentView() + : m_modelMerger(new ModelMerger(this)) { } @@ -97,7 +97,7 @@ QString DesignDocumentView::toText() const textEdit.setPlainText(imports + QStringLiteral("Item {\n}\n")); NotIndentingTextEditModifier modifier(&textEdit); - QScopedPointer rewriterView(new RewriterView(RewriterView::Amend, nullptr)); + QScopedPointer rewriterView(new RewriterView(RewriterView::Amend)); rewriterView->setCheckSemanticErrors(false); rewriterView->setTextModifier(&modifier); outputModel->setRewriterView(rewriterView.data()); diff --git a/src/plugins/qmldesigner/components/integration/designdocumentview.h b/src/plugins/qmldesigner/components/integration/designdocumentview.h index e4d99187b27..7ed8addee0d 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentview.h +++ b/src/plugins/qmldesigner/components/integration/designdocumentview.h @@ -15,7 +15,7 @@ class QMLDESIGNERCORE_EXPORT DesignDocumentView : public AbstractView { Q_OBJECT public: - DesignDocumentView(QObject *parent = nullptr); + DesignDocumentView(); ~DesignDocumentView() override; ModelNode insertModel(const ModelNode &modelNode); diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp index aaf9391d382..cff890f7e4e 100644 --- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp +++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp @@ -25,9 +25,7 @@ namespace QmlDesigner { -MaterialBrowserView::MaterialBrowserView(QObject *parent) - : AbstractView(parent) -{} +MaterialBrowserView::MaterialBrowserView() {} MaterialBrowserView::~MaterialBrowserView() {} diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.h b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.h index 6e5a45e2469..d163b5fa3f6 100644 --- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.h +++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.h @@ -17,7 +17,7 @@ class MaterialBrowserView : public AbstractView Q_OBJECT public: - MaterialBrowserView(QObject *parent = nullptr); + MaterialBrowserView(); ~MaterialBrowserView() override; bool hasWidget() const override; diff --git a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp index b6b741d9037..9ddfbe73bec 100644 --- a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp +++ b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp @@ -48,9 +48,8 @@ namespace QmlDesigner { -MaterialEditorView::MaterialEditorView(QWidget *parent) - : AbstractView(parent) - , m_stackedWidget(new QStackedWidget(parent)) +MaterialEditorView::MaterialEditorView() + : m_stackedWidget(new QStackedWidget) , m_dynamicPropertiesModel(new Internal::DynamicPropertiesModel(true, this)) { m_updateShortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_F7), m_stackedWidget); diff --git a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.h b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.h index 249c78ea2c0..1789d17d44c 100644 --- a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.h +++ b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.h @@ -31,7 +31,7 @@ class MaterialEditorView : public AbstractView Q_OBJECT public: - MaterialEditorView(QWidget *parent = nullptr); + MaterialEditorView(); ~MaterialEditorView() override; bool hasWidget() const override; diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index d4ec7c7fc15..e59960f3c1f 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -88,9 +88,8 @@ static inline void moveNodesDown(const QList &nodes) namespace QmlDesigner { -NavigatorView::NavigatorView(QObject* parent) : - AbstractView(parent), - m_blockSelectionChangedSignal(false) +NavigatorView::NavigatorView() + : m_blockSelectionChangedSignal(false) { } diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.h b/src/plugins/qmldesigner/components/navigator/navigatorview.h index 73e5d2f5215..1fe0cf06253 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.h +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.h @@ -40,7 +40,7 @@ class NavigatorView : public AbstractView Q_OBJECT public: - NavigatorView(QObject* parent = nullptr); + NavigatorView(); ~NavigatorView() override; bool hasWidget() const override; diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp index 89924a1122a..054a1f4e005 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp @@ -33,11 +33,10 @@ namespace QmlDesigner { We always have 'one' current state, where we get updates from (see sceneChanged()). In case the current state is the base state, we render the base state + all other states. */ -StatesEditorView::StatesEditorView(QObject *parent) : - AbstractView(parent), - m_statesEditorModel(new StatesEditorModel(this)), - m_lastIndex(-1), - m_editor(nullptr) +StatesEditorView::StatesEditorView() + : m_statesEditorModel(new StatesEditorModel(this)) + , m_lastIndex(-1) + , m_editor(nullptr) { Q_ASSERT(m_statesEditorModel); // base state diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h index 6c459d1cf83..8477065d2ae 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h @@ -17,7 +17,7 @@ class StatesEditorView : public AbstractView { Q_OBJECT public: - explicit StatesEditorView(QObject *parent = nullptr); + explicit StatesEditorView(); ~StatesEditorView() override; void renameState(int internalNodeId,const QString &newName); diff --git a/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp index 599a1f443a6..65d021eb050 100644 --- a/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp +++ b/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp @@ -57,8 +57,7 @@ namespace Experimental { We always have 'one' current state, where we get updates from (see sceneChanged()). In case the current state is the base state, we render the base state + all other states. */ -StatesEditorView::StatesEditorView(QObject *parent) : - AbstractView(parent), +StatesEditorView::StatesEditorView() : m_statesEditorModel(new StatesEditorModel(this)), m_lastIndex(-1), m_editor(nullptr) diff --git a/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.h b/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.h index 5fc9ae5511a..e453ef212a0 100644 --- a/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.h +++ b/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.h @@ -45,7 +45,7 @@ class StatesEditorView : public AbstractView { Q_OBJECT public: - explicit StatesEditorView(QObject *parent = nullptr); + explicit StatesEditorView(); ~StatesEditorView() override; void renameState(int internalNodeId,const QString &newName); diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp index 3b911e83d94..d445f59257b 100644 --- a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp +++ b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp @@ -42,9 +42,8 @@ namespace QmlDesigner { const char TEXTEDITOR_CONTEXT_ID[] = "QmlDesigner.TextEditorContext"; -TextEditorView::TextEditorView(QObject *parent) - : AbstractView(parent) - , m_widget(new TextEditorWidget(this)) +TextEditorView::TextEditorView() + : m_widget(new TextEditorWidget(this)) , m_textEditorContext(new Internal::TextEditorContext(m_widget)) { Core::ICore::addContextObject(m_textEditorContext); diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorview.h b/src/plugins/qmldesigner/components/texteditor/texteditorview.h index 4bc782f069f..bb448162a60 100644 --- a/src/plugins/qmldesigner/components/texteditor/texteditorview.h +++ b/src/plugins/qmldesigner/components/texteditor/texteditorview.h @@ -25,7 +25,7 @@ class QMLDESIGNERCORE_EXPORT TextEditorView : public AbstractView Q_OBJECT public: - TextEditorView(QObject *parent = nullptr); + TextEditorView(); ~TextEditorView() override; // AbstractView diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp index e6ff85e33c5..1f3e5184fcd 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp @@ -45,9 +45,8 @@ namespace QmlDesigner { -TimelineView::TimelineView(QObject *parent) - : AbstractView(parent) - , m_timelineWidget(nullptr) +TimelineView::TimelineView() + : m_timelineWidget(nullptr) { EasingCurve::registerStreamOperators(); setEnabled(false); diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineview.h b/src/plugins/qmldesigner/components/timelineeditor/timelineview.h index 4c35c89fad6..a0dd51dafa6 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelineview.h +++ b/src/plugins/qmldesigner/components/timelineeditor/timelineview.h @@ -18,7 +18,7 @@ class TimelineView : public AbstractView Q_OBJECT public: - explicit TimelineView(QObject *parent = nullptr); + explicit TimelineView(); ~TimelineView() override; //Abstract View WidgetInfo widgetInfo() override; diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp index 1a805731977..12bf9759a5e 100644 --- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp +++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp @@ -40,9 +40,8 @@ namespace QmlDesigner { -TransitionEditorView::TransitionEditorView(QObject *parent) - : AbstractView(parent) - , m_transitionEditorWidget(nullptr) +TransitionEditorView::TransitionEditorView() + : m_transitionEditorWidget(nullptr) { } diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.h b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.h index d636a34e9ef..e25820965f5 100644 --- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.h +++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.h @@ -16,7 +16,7 @@ class TransitionEditorView : public AbstractView Q_OBJECT public: - explicit TransitionEditorView(QObject *parent = nullptr); + explicit TransitionEditorView(); ~TransitionEditorView() override; //Abstract View WidgetInfo widgetInfo() override; diff --git a/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp b/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp index 99aad65d9a0..c1ece4c93db 100644 --- a/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp +++ b/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp @@ -56,7 +56,7 @@ void ImageCacheCollector::start(Utils::SmallStringView name, CaptureCallback captureCallback, AbortCallback abortCallback) { - RewriterView rewriterView{RewriterView::Amend, nullptr}; + RewriterView rewriterView{RewriterView::Amend}; NodeInstanceView nodeInstanceView{m_connectionManager}; nodeInstanceView.setCaptureImageMinimumAndMaximumSize(captureImageMinimumSize, captureImageMaximumSize); diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h index ade1471c7cd..885a41f791e 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractview.h +++ b/src/plugins/qmldesigner/designercore/include/abstractview.h @@ -78,8 +78,7 @@ public: EmptyPropertiesRemoved = 0x2 }; Q_DECLARE_FLAGS(PropertyChangeFlags, PropertyChangeFlag) - AbstractView(QObject *parent = nullptr) - : QObject(parent) {} + AbstractView() {} ~AbstractView() override; diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h index 14f49188c02..a7dc9cc07ea 100644 --- a/src/plugins/qmldesigner/designercore/include/rewriterview.h +++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h @@ -53,7 +53,7 @@ public: }; public: - RewriterView(DifferenceHandling differenceHandling = RewriterView::Amend, QObject *parent = nullptr); + RewriterView(DifferenceHandling differenceHandling = RewriterView::Amend); ~RewriterView() override; void modelAttached(Model *model) override; diff --git a/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp index f8b004e99ab..31544acfdde 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp @@ -218,7 +218,7 @@ static QmlObjectNode createQmlObjectNodeFromSource(AbstractView *view, textEdit.setPlainText(source); NotIndentingTextEditModifier modifier(&textEdit); - QScopedPointer rewriterView(new RewriterView(RewriterView::Amend, nullptr)); + QScopedPointer rewriterView(new RewriterView(RewriterView::Amend)); rewriterView->setCheckSemanticErrors(false); rewriterView->setTextModifier(&modifier); rewriterView->setAllowComponentRoot(true); diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index ae9aefae602..aac2e6fd118 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -59,12 +59,11 @@ bool debugQmlPuppet() #endif } -RewriterView::RewriterView(DifferenceHandling differenceHandling, QObject *parent): - AbstractView(parent), - m_differenceHandling(differenceHandling), - m_positionStorage(new ModelNodePositionStorage), - m_modelToTextMerger(new Internal::ModelToTextMerger(this)), - m_textToModelMerger(new Internal::TextToModelMerger(this)) +RewriterView::RewriterView(DifferenceHandling differenceHandling) + : m_differenceHandling(differenceHandling) + , m_positionStorage(new ModelNodePositionStorage) + , m_modelToTextMerger(new Internal::ModelToTextMerger(this)) + , m_textToModelMerger(new Internal::TextToModelMerger(this)) { m_amendTimer.setSingleShot(true); diff --git a/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp b/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp index 55fe15bbd15..015bb582d60 100644 --- a/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp +++ b/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp @@ -58,9 +58,8 @@ VariantProperty TestModelToTextMerger::findAddedVariantProperty(const VariantPro return VariantProperty(); } -TestRewriterView::TestRewriterView(QObject *parent, - DifferenceHandling differenceHandling) - : RewriterView(differenceHandling, parent) +TestRewriterView::TestRewriterView(DifferenceHandling differenceHandling) + : RewriterView(differenceHandling) { //Unit tests do not like the semantic errors setCheckSemanticErrors(false); diff --git a/tests/auto/qml/qmldesigner/coretests/testrewriterview.h b/tests/auto/qml/qmldesigner/coretests/testrewriterview.h index 6da64f6d94a..20d27fe6d87 100644 --- a/tests/auto/qml/qmldesigner/coretests/testrewriterview.h +++ b/tests/auto/qml/qmldesigner/coretests/testrewriterview.h @@ -26,8 +26,7 @@ class TestRewriterView : public RewriterView Q_OBJECT public: - TestRewriterView(QObject *parent = 0, - DifferenceHandling differenceHandling = RewriterView::Validate); + TestRewriterView(DifferenceHandling differenceHandling = RewriterView::Validate); Internal::TestModelToTextMerger *modelToTextMerger() const; Internal::TextToModelMerger *textToModelMerger() const; diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp index 7955e6e365b..0fc0e2f3445 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp @@ -54,6 +54,8 @@ using namespace QmlDesigner; #include #include +#include + QT_BEGIN_NAMESPACE //Allow comparison of QByteArray and QString. We always assume utf8 as the encoding. @@ -137,8 +139,8 @@ static std::unique_ptr createModel(const QString &typeName, NotIndentingTextEditModifier *modifier = new NotIndentingTextEditModifier(textEdit); modifier->setParent(textEdit); - auto rewriterView = new QmlDesigner::RewriterView(QmlDesigner::RewriterView::Validate, - model.get()); + auto rewriterView = new QmlDesigner::RewriterView(QmlDesigner::RewriterView::Validate); + rewriterView->setParent(model.get()); //rewriterView->setCheckSemanticErrors(false); rewriterView->setTextModifier(modifier); @@ -209,7 +211,7 @@ void tst_TestCore::testModelCreateCoreModel() auto model(createModel("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer testView(new TestView(model.get())); + QScopedPointer testView(new TestView); QVERIFY(testView.data()); model->attachView(testView.data()); } @@ -253,7 +255,7 @@ void tst_TestCore::testRewriterView2() auto model(Model::create("QtQuick.Rectangle", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -415,7 +417,7 @@ void tst_TestCore::testRewriterErrors() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -540,7 +542,7 @@ void tst_TestCore::testModelCreateRect() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -996,7 +998,7 @@ void tst_TestCore::testRewriterChangeImports() auto model(Model::create("QtQuick.Rectangle")); - QScopedPointer testRewriterView(new TestRewriterView(0, RewriterView::Amend)); + QScopedPointer testRewriterView(new TestRewriterView(RewriterView::Amend)); testRewriterView->setTextModifier(&modifier); model->attachView(testRewriterView.data()); @@ -1080,7 +1082,7 @@ void tst_TestCore::testRewriterUnicodeChars() auto model(Model::create("QtQuick.Rectangle")); - QScopedPointer testRewriterView(new TestRewriterView(0, RewriterView::Amend)); + QScopedPointer testRewriterView(new TestRewriterView(RewriterView::Amend)); testRewriterView->setTextModifier(&modifier); model->attachView(testRewriterView.data()); @@ -1110,7 +1112,7 @@ void tst_TestCore::testRewriterTransactionAddingAfterReparenting() auto model(Model::create("QtQuick.Rectangle")); - QScopedPointer testRewriterView(new TestRewriterView(0, RewriterView::Amend)); + QScopedPointer testRewriterView(new TestRewriterView(RewriterView::Amend)); testRewriterView->setTextModifier(&modifier); model->attachView(testRewriterView.data()); @@ -1152,7 +1154,7 @@ void tst_TestCore::testRewriterReparentToNewNode() auto model(Model::create("QtQuick.Rectangle")); - QScopedPointer testRewriterView(new TestRewriterView(0, RewriterView::Amend)); + QScopedPointer testRewriterView(new TestRewriterView(RewriterView::Amend)); testRewriterView->setTextModifier(&modifier); model->attachView(testRewriterView.data()); @@ -1251,7 +1253,7 @@ void tst_TestCore::testRewriterBehaivours() auto model(Model::create("QtQuick.Rectangle")); - QScopedPointer testRewriterView(new TestRewriterView(0, RewriterView::Amend)); + QScopedPointer testRewriterView(new TestRewriterView(RewriterView::Amend)); testRewriterView->setTextModifier(&modifier); model->attachView(testRewriterView.data()); @@ -1501,7 +1503,7 @@ void tst_TestCore::testRewriterForGradientMagic() auto model1(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model1.get()); - QScopedPointer view1(new TestView(model1.get())); + QScopedPointer view1(new TestView); model1->attachView(view1.data()); QScopedPointer testRewriterView1(new TestRewriterView()); @@ -1553,7 +1555,7 @@ void tst_TestCore::testStatesVersionFailing() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -1663,7 +1665,7 @@ void tst_TestCore::testModelCreateSubNode() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -1711,7 +1713,7 @@ void tst_TestCore::testTypicalRewriterOperations() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -1798,7 +1800,7 @@ void tst_TestCore::testBasicStates() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -1919,7 +1921,7 @@ void tst_TestCore::testBasicStatesQtQuick20() QSKIP("No qml2puppet"); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -1973,7 +1975,7 @@ void tst_TestCore::testModelBasicOperations() auto model(createModel("QtQuick.Flipable", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -2033,7 +2035,7 @@ void tst_TestCore::testModelResolveIds() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -2091,7 +2093,7 @@ void tst_TestCore::testModelNodeListProperty() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -2151,7 +2153,7 @@ void tst_TestCore::testModelNodePropertyDynamic() auto model(createModel("QtQuick.Rectangle", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -2257,7 +2259,7 @@ void tst_TestCore::testBasicOperationsWithView() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -2372,9 +2374,9 @@ void tst_TestCore::testQmlModelView() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - TestView *view = new TestView(model.get()); + auto view = std::make_unique(); QVERIFY(view); - model->attachView(view); + model->attachView(view.get()); QVERIFY(view->model()); QVERIFY(view->rootQmlObjectNode().isValid()); @@ -2484,7 +2486,7 @@ void tst_TestCore::testModelRemoveNode() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -2546,7 +2548,7 @@ void tst_TestCore::reparentingNode() QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -2620,7 +2622,7 @@ void tst_TestCore::reparentingNodeLikeDragAndDrop() testRewriterView->setTextModifier(&textModifier); model->attachView(testRewriterView.data()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -2738,7 +2740,7 @@ void tst_TestCore::testModelReorderSiblings() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -2793,7 +2795,7 @@ void tst_TestCore::testModelRootNode() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -2825,7 +2827,7 @@ void tst_TestCore::reparentingNodeInModificationGroup() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -2877,7 +2879,7 @@ void tst_TestCore::testModelAddAndRemoveProperty() auto model(createModel("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->rewriterView()->setCheckSemanticErrors(false); //This test needs this QVERIFY(view.data()); model->attachView(view.data()); @@ -2922,10 +2924,10 @@ void tst_TestCore::testModelViewNotification() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view1(new TestView(model.get())); + QScopedPointer view1(new TestView); QVERIFY(view1.data()); - QScopedPointer view2(new TestView(model.get())); + QScopedPointer view2(new TestView); QVERIFY(view2.data()); model->attachView(view2.data()); @@ -3004,7 +3006,7 @@ void tst_TestCore::testRewriterTransaction() auto model(Model::create("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -3059,7 +3061,7 @@ void tst_TestCore::testRewriterId() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -3103,7 +3105,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction1() auto model(Model::create("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -3148,7 +3150,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction2() auto model(Model::create("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -3214,7 +3216,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction3() auto model(Model::create("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -3264,7 +3266,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction4() auto model(Model::create("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -3315,7 +3317,7 @@ void tst_TestCore::testRewriterAddNodeTransaction() auto model(Model::create("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -3362,7 +3364,7 @@ void tst_TestCore::testRewriterComponentId() auto model(Model::create("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -3398,7 +3400,7 @@ void tst_TestCore::testRewriterTransactionRewriter() auto model(Model::create("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -3470,7 +3472,7 @@ void tst_TestCore::testRewriterPropertyDeclarations() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -3532,7 +3534,7 @@ void tst_TestCore::testRewriterPropertyAliases() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -3592,7 +3594,7 @@ void tst_TestCore::testRewriterPositionAndOffset() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -3694,7 +3696,7 @@ void tst_TestCore::testRewriterComponentTextModifier() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -3765,7 +3767,7 @@ void tst_TestCore::testRewriterPreserveType() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -3810,7 +3812,7 @@ void tst_TestCore::testRewriterForArrayMagic() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -3862,7 +3864,7 @@ void tst_TestCore::testRewriterWithSignals() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -3905,7 +3907,7 @@ void tst_TestCore::testRewriterNodeSliding() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -3945,7 +3947,7 @@ void tst_TestCore::testRewriterExceptionHandling() auto model(Model::create("QtQuick.Text", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -4003,7 +4005,7 @@ void tst_TestCore::testRewriterFirstDefinitionInside() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -4073,7 +4075,7 @@ void tst_TestCore::testCopyModelRewriter1() auto model1(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model1.get()); - QScopedPointer view1(new TestView(model1.get())); + QScopedPointer view1(new TestView); model1->attachView(view1.data()); // read in 1 @@ -4092,7 +4094,7 @@ void tst_TestCore::testCopyModelRewriter1() auto model2(Model::create("QtQuick.Item", 1, 1)); QVERIFY(model2.get()); - QScopedPointer view2(new TestView(model2.get())); + QScopedPointer view2(new TestView); model2->attachView(view2.data()); // read in 2 @@ -4288,7 +4290,7 @@ void tst_TestCore::testMergeModelRewriter1() auto templateModel(Model::create("QtQuick.Item", 2, 1)); QVERIFY(templateModel.get()); - QScopedPointer templateView(new TestView(templateModel.get())); + QScopedPointer templateView(new TestView); templateModel->attachView(templateView.data()); // read in 1 @@ -4306,7 +4308,7 @@ void tst_TestCore::testMergeModelRewriter1() auto styleModel(Model::create("QtQuick.Item", 2, 1)); QVERIFY(styleModel.get()); - QScopedPointer styleView(new TestView(styleModel.get())); + QScopedPointer styleView(new TestView); styleModel->attachView(styleView.data()); // read in 2 @@ -4378,7 +4380,7 @@ void tst_TestCore::testCopyModelRewriter2() auto templateModel(Model::create("QtQuick.Item", 2, 1)); QVERIFY(templateModel.get()); - QScopedPointer view1(new TestView(templateModel.get())); + QScopedPointer view1(new TestView); templateModel->attachView(view1.data()); // read in 1 @@ -4398,7 +4400,7 @@ void tst_TestCore::testCopyModelRewriter2() auto styleModel(Model::create("QtQuick.Item", 2, 1)); QVERIFY(styleModel.get()); - QScopedPointer view2(new TestView(styleModel.get())); + QScopedPointer view2(new TestView); styleModel->attachView(view2.data()); QScopedPointer styleRewriterView(new TestRewriterView()); @@ -4515,7 +4517,7 @@ void tst_TestCore::testAnchorsAndRewriting() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -4581,7 +4583,7 @@ void tst_TestCore::testAnchorsAndRewritingCenter() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -4649,7 +4651,7 @@ void tst_TestCore::loadQml() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -4846,7 +4848,7 @@ void tst_TestCore::testMetaInfoEnums() auto model(createModel("QtQuick.Text")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -4958,7 +4960,7 @@ void tst_TestCore::testMetaInfoDotProperties() auto model(createModel("QtQuick.Text", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -4993,7 +4995,7 @@ void tst_TestCore::testMetaInfoListProperties() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -5028,9 +5030,9 @@ void tst_TestCore::testQtQuick20Basic() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - TestRewriterView *testRewriterView = new TestRewriterView(model.get()); + auto testRewriterView = std::make_unique(); testRewriterView->setTextModifier(&modifier); - model->attachView(testRewriterView); + model->attachView(testRewriterView.get()); QVERIFY(testRewriterView->errors().isEmpty()); ModelNode rootModelNode(testRewriterView->rootModelNode()); @@ -5050,9 +5052,9 @@ void tst_TestCore::testQtQuick20BasicRectangle() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - TestRewriterView *testRewriterView = new TestRewriterView(model.get()); + auto testRewriterView = std::make_unique(); testRewriterView->setTextModifier(&modifier); - model->attachView(testRewriterView); + model->attachView(testRewriterView.get()); QTest::qSleep(1000); QApplication::processEvents(); @@ -5092,13 +5094,13 @@ void tst_TestCore::testQtQuickControls2() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); - TestRewriterView *testRewriterView = new TestRewriterView(model.get()); + auto testRewriterView = std::make_unique(); testRewriterView->setTextModifier(&modifier); - model->attachView(testRewriterView); + model->attachView(testRewriterView.get()); QVERIFY(testRewriterView->errors().isEmpty()); @@ -5186,13 +5188,13 @@ void tst_TestCore::testImplicitComponents() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); - TestRewriterView *testRewriterView = new TestRewriterView(model.get()); + auto testRewriterView = std::make_unique(); testRewriterView->setTextModifier(&modifier); - model->attachView(testRewriterView); + model->attachView(testRewriterView.get()); QVERIFY(testRewriterView->errors().isEmpty()); @@ -5246,14 +5248,14 @@ void tst_TestCore::testRevisionedProperties() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); - TestRewriterView *testRewriterView = new TestRewriterView(model.get()); + auto testRewriterView = std::make_unique(); testRewriterView->setCheckSemanticErrors(true); testRewriterView->setTextModifier(&modifier); - model->attachView(testRewriterView); + model->attachView(testRewriterView.get()); QVERIFY(testRewriterView->errors().isEmpty()); @@ -5280,13 +5282,13 @@ void tst_TestCore::testStatesRewriter() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); - TestRewriterView *testRewriterView = new TestRewriterView(model.get()); + auto testRewriterView = std::make_unique(); testRewriterView->setTextModifier(&modifier); - model->attachView(testRewriterView); + model->attachView(testRewriterView.get()); QVERIFY(testRewriterView->errors().isEmpty()); @@ -5329,13 +5331,13 @@ void tst_TestCore::testGradientsRewriter() auto model(Model::create("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); - TestRewriterView *testRewriterView = new TestRewriterView(model.get()); + auto testRewriterView = std::make_unique(); testRewriterView->setTextModifier(&modifier); - model->attachView(testRewriterView); + model->attachView(testRewriterView.get()); QVERIFY(testRewriterView->errors().isEmpty()); @@ -5483,7 +5485,7 @@ void tst_TestCore::testQmlModelStates() { auto model(createModel("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -5542,7 +5544,7 @@ void tst_TestCore::testStatesWasInstances() auto model(createModel("QtQuick.Rectangle", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -5603,7 +5605,7 @@ void tst_TestCore::testStates() // auto model(createModel("QtQuick.Rectangle", 1, 1)); // QVERIFY(model.get()); -// QScopedPointer view(new TestView(model.get())); +// QScopedPointer view(new TestView); // QVERIFY(view.data()); // model->attachView(view.data()); @@ -5699,7 +5701,7 @@ void tst_TestCore::testStatesBaseState() auto model(createModel("QtQuick.Rectangle", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -5755,7 +5757,7 @@ void tst_TestCore::testInstancesIdResolution() { auto model(createModel("QtQuick.Rectangle", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -5841,7 +5843,7 @@ void tst_TestCore::testInstancesNotInScene() auto model(createModel("QtQuick.Rectangle", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -5863,7 +5865,7 @@ void tst_TestCore::testInstancesBindingsInStatesStress() for (int j = 0; j < 20; j++) { auto model(createModel("QtQuick.Rectangle", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -5969,7 +5971,7 @@ void tst_TestCore::testInstancesPropertyChangeTargets() auto model(createModel("QtQuick.Rectangle", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -6077,7 +6079,7 @@ void tst_TestCore::testInstancesDeletePropertyChanges() QSKIP("Instances are not working", SkipAll); auto model(createModel("QtQuick.Rectangle", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -6595,7 +6597,7 @@ void tst_TestCore::testQmlModelStatesInvalidForRemovedNodes() auto model(createModel("QtQuick.Rectangle", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -6638,7 +6640,7 @@ void tst_TestCore::testInstancesAttachToExistingModel() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -6674,7 +6676,7 @@ void tst_TestCore::testQmlModelAddMultipleStates() auto model(createModel("QtQuick.Rectangle", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -6704,7 +6706,7 @@ void tst_TestCore::testQmlModelRemoveStates() { auto model(createModel("QtQuick.Rectangle", 2, 0)); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -6737,14 +6739,14 @@ void tst_TestCore::testQmlModelStateWithName() auto model1(Model::create("QtQuick.Item")); - TestRewriterView *testRewriterView1 = new TestRewriterView(model1.get()); + auto testRewriterView1 = std::make_unique(); testRewriterView1->setTextModifier(&modifier1); - model1->attachView(testRewriterView1); + model1->attachView(testRewriterView1.get()); QVERIFY(testRewriterView1->errors().isEmpty()); - TestView *view = new TestView(model1.get()); - model1->attachView(view); + auto view = std::make_unique(); + model1->attachView(view.get()); QmlItemNode rootNode = view->rootModelNode(); @@ -6789,9 +6791,9 @@ void tst_TestCore::testRewriterAutomaticSemicolonAfterChangedProperty() auto model1(Model::create("QtQuick.Item")); - TestRewriterView *testRewriterView1 = new TestRewriterView(model1.get()); + auto testRewriterView1 = std::make_unique(); testRewriterView1->setTextModifier(&modifier1); - model1->attachView(testRewriterView1); + model1->attachView(testRewriterView1.get()); QVERIFY(testRewriterView1->errors().isEmpty()); @@ -6807,7 +6809,7 @@ void tst_TestCore::defaultPropertyValues() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -6852,7 +6854,7 @@ void tst_TestCore::testModelNodeInHierarchy() auto model(createModel("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -6887,7 +6889,7 @@ void tst_TestCore::testModelNodeIsAncestorOf() // } // } // - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -6930,7 +6932,7 @@ void tst_TestCore::testModelChangeType() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -7001,7 +7003,7 @@ void tst_TestCore::testModelSignalDefinition() auto model(createModel("QtQuick.Rectangle", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -7024,7 +7026,7 @@ void tst_TestCore::testModelDefaultProperties() auto model(createModel("QtQuick.Rectangle", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -7047,8 +7049,8 @@ void tst_TestCore::loadAnchors() testRewriterView1->setTextModifier(&modifier1); model->attachView(testRewriterView1.data()); - TestView *testView = new TestView(model.get()); - model->attachView(testView); + auto testView = std::make_unique(); + model->attachView(testView.get()); QmlItemNode rootQmlItemNode(testView->rootQmlItemNode()); QmlItemNode anchoredNode(rootQmlItemNode.children().first()); @@ -7070,8 +7072,7 @@ void tst_TestCore::loadAnchors() QCOMPARE(anchoredNode.instanceBoundingRect().width(), 100.0); QCOMPARE(anchoredNode.instanceBoundingRect().height(), 0.0); - - model->detachView(testView); + model->detachView(testView.get()); } void tst_TestCore::changeAnchors() @@ -7087,8 +7088,9 @@ void tst_TestCore::changeAnchors() testRewriterView1->setTextModifier(&modifier1); model->attachView(testRewriterView1.data()); - TestView *testView = new TestView(model.get()); - model->attachView(testView); + auto testView = std::make_unique(); + + model->attachView(testView.get()); QmlItemNode rootQmlItemNode(testView->rootQmlItemNode()); QmlItemNode anchoredNode(rootQmlItemNode.children().first()); @@ -7133,7 +7135,7 @@ void tst_TestCore::changeAnchors() QCOMPARE(anchoredNode.instanceBoundingRect().width(), 100.0); QCOMPARE(anchoredNode.instanceBoundingRect().height(), 0.0); - model->detachView(testView); + model->detachView(testView.get()); } void tst_TestCore::anchorToSibling() @@ -7149,8 +7151,9 @@ void tst_TestCore::anchorToSibling() testRewriterView1->setTextModifier(&modifier1); model->attachView(testRewriterView1.data()); - TestView *testView = new TestView(model.get()); - model->attachView(testView); + auto testView = std::make_unique(); + + model->attachView(testView.get()); QmlItemNode rootQmlItemNode(testView->rootQmlItemNode()); QmlItemNode anchoredNode(rootQmlItemNode.children().first()); @@ -7194,8 +7197,9 @@ void tst_TestCore::removeFillAnchorByDetaching() testRewriterView1->setTextModifier(&modifier1); model->attachView(testRewriterView1.data()); - TestView *testView = new TestView(model.get()); - model->attachView(testView); + auto testView = std::make_unique(); + + model->attachView(testView.get()); QmlItemNode rootQmlItemNode(testView->rootQmlItemNode()); @@ -7258,8 +7262,7 @@ void tst_TestCore::removeFillAnchorByDetaching() QCOMPARE(firstChild.instanceBoundingRect().width(), 100.0); QCOMPARE(firstChild.instanceBoundingRect().height(), 0.0); - - model->detachView(testView); + model->detachView(testView.get()); } void tst_TestCore::removeFillAnchorByChanging() @@ -7275,8 +7278,9 @@ void tst_TestCore::removeFillAnchorByChanging() testRewriterView1->setTextModifier(&modifier1); model->attachView(testRewriterView1.data()); - TestView *testView = new TestView(model.get()); - model->attachView(testView); + auto testView = std::make_unique(); + + model->attachView(testView.get()); QmlItemNode rootQmlItemNode(testView->rootQmlItemNode()); @@ -7340,8 +7344,7 @@ void tst_TestCore::removeFillAnchorByChanging() QCOMPARE(firstChild.instanceBoundingRect().width(), 100.0); QCOMPARE(firstChild.instanceBoundingRect().height(), -100.0); - - model->detachView(testView); + model->detachView(testView.get()); } void tst_TestCore::testModelBindings() @@ -7352,8 +7355,9 @@ void tst_TestCore::testModelBindings() //NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.get(), NodeInstanceServerInterface::TestModus); //model->attachView(nodeInstanceView); - TestView *testView = new TestView(model.get()); - model->attachView(testView); + auto testView = std::make_unique(); + + model->attachView(testView.get()); ModelNode rootModelNode = testView->rootModelNode(); QCOMPARE(rootModelNode.directSubModelNodes().count(), 0); @@ -7404,7 +7408,7 @@ void tst_TestCore::testModelBindings() childNode.bindingProperty("width").setExpression("root.width"); //QCOMPARE(childInstance.size().width(), 200.0); - model->detachView(testView); + model->detachView(testView.get()); } void tst_TestCore::testModelDynamicProperties() @@ -7412,8 +7416,9 @@ void tst_TestCore::testModelDynamicProperties() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - TestView *testView = new TestView(model.get()); - model->attachView(testView); + auto testView = std::make_unique(); + + model->attachView(testView.get()); QmlItemNode rootQmlItemNode(testView->rootQmlItemNode()); ModelNode rootModelNode = rootQmlItemNode.modelNode(); @@ -7458,7 +7463,7 @@ void tst_TestCore::testModelSliding() auto model(createModel("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -7532,7 +7537,7 @@ void tst_TestCore::testRewriterChangeId() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -7570,11 +7575,11 @@ void tst_TestCore::testRewriterRemoveId() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); - QScopedPointer testRewriterView(new TestRewriterView(0, TestRewriterView::Amend)); + QScopedPointer testRewriterView(new TestRewriterView(TestRewriterView::Amend)); testRewriterView->setTextModifier(&textModifier); model->attachView(testRewriterView.data()); @@ -7602,7 +7607,7 @@ void tst_TestCore::testRewriterChangeValueProperty() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -7642,7 +7647,7 @@ void tst_TestCore::testRewriterRemoveValueProperty() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -7684,7 +7689,7 @@ void tst_TestCore::testRewriterSignalProperty() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -7709,7 +7714,7 @@ void tst_TestCore::testRewriterObjectTypeProperty() auto model(Model::create("QtQuick.Item")); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); QVERIFY(view.data()); model->attachView(view.data()); @@ -7757,7 +7762,7 @@ void tst_TestCore::testRewriterPropertyChanges() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -7816,7 +7821,7 @@ void tst_TestCore::testRewriterListModel() testRewriterView->setTextModifier(&textModifier); model->attachView(testRewriterView.data()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); ModelNode listModelNode = view->rootModelNode(); @@ -7848,7 +7853,7 @@ void tst_TestCore::testRewriterAddProperty() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -7892,7 +7897,7 @@ void tst_TestCore::testRewriterAddPropertyInNestedObject() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -7938,7 +7943,7 @@ void tst_TestCore::testRewriterAddObjectDefinition() auto model(Model::create("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -7972,7 +7977,7 @@ void tst_TestCore::testRewriterAddStatesArray() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); QScopedPointer testRewriterView(new TestRewriterView()); @@ -8034,7 +8039,7 @@ void tst_TestCore::testRewriterRemoveStates() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); QScopedPointer testRewriterView(new TestRewriterView()); @@ -8092,7 +8097,7 @@ void tst_TestCore::testRewriterRemoveObjectDefinition() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -8151,7 +8156,7 @@ void tst_TestCore::testRewriterRemoveScriptBinding() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -8204,7 +8209,7 @@ void tst_TestCore::testRewriterNodeReparenting() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -8312,7 +8317,7 @@ void tst_TestCore::testRewriterNodeReparentingWithTransaction() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -8373,7 +8378,7 @@ void tst_TestCore::testRewriterMovingInOut() auto model(Model::create("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -8431,7 +8436,7 @@ void tst_TestCore::testRewriterMovingInOutWithTransaction() auto model(Model::create("QtQuick.Item", 2, 1)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -8485,7 +8490,7 @@ void tst_TestCore::testRewriterComplexMovingInOut() auto model(Model::create("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); // read in @@ -8581,8 +8586,9 @@ void tst_TestCore::removeCenteredInAnchorByDetaching() testRewriterView1->setTextModifier(&modifier1); model->attachView(testRewriterView1.data()); - TestView *testView = new TestView(model.get()); - model->attachView(testView); + auto testView = std::make_unique(); + + model->attachView(testView.get()); QmlItemNode rootQmlItemNode(testView->rootQmlItemNode()); @@ -8628,7 +8634,7 @@ void tst_TestCore::changePropertyBinding() auto model(createModel("QtQuick.Item", 2, 0)); QVERIFY(model.get()); - QScopedPointer view(new TestView(model.get())); + QScopedPointer view(new TestView); model->attachView(view.data()); ModelNode rootModelNode(view->rootModelNode()); diff --git a/tests/auto/qml/qmldesigner/testview.cpp b/tests/auto/qml/qmldesigner/testview.cpp index f5e4ff2c0dc..d698023e88b 100644 --- a/tests/auto/qml/qmldesigner/testview.cpp +++ b/tests/auto/qml/qmldesigner/testview.cpp @@ -15,16 +15,7 @@ #include #include -TestView::TestView(QmlDesigner::Model *model) - : QmlDesigner::AbstractView(model) -{ - /* - QmlDesigner::NodeInstanceView *nodeInstanceView = new QmlDesigner::NodeInstanceView(model, QmlDesigner::NodeInstanceServerInterface::TestModus); - - if (model) - model->setNodeInstanceView(nodeInstanceView); - */ -} +TestView::TestView() {} void TestView::modelAttached(QmlDesigner::Model *model) { diff --git a/tests/auto/qml/qmldesigner/testview.h b/tests/auto/qml/qmldesigner/testview.h index 9678621334e..e8983efa265 100644 --- a/tests/auto/qml/qmldesigner/testview.h +++ b/tests/auto/qml/qmldesigner/testview.h @@ -29,7 +29,7 @@ public: QStringList arguments; }; - TestView(QmlDesigner::Model *model); + TestView(); void modelAttached(QmlDesigner::Model *model); void modelAboutToBeDetached(QmlDesigner::Model *model);