QmlDesigner: Modernize

modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
modernize-use-default-member-init
modernize-use-equals-default

Change-Id: Ic42b5c59fed5a4a01853138542d8156471e86f58
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

13 files changed, 26 insertions, 30 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();