Debugger: Modernize

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

Change-Id: I91a6874f0d7b94e9079ab4ef07c23c60c80be9c0
Reviewed-by: Christian Stenger <[email protected]>
Reviewed-by: hjk <[email protected]>

12 files changed, 40 insertions, 42 deletions

diff --git a/src/plugins/debugger/console/console.cpp b/src/plugins/debugger/console/console.cpp
index 31a16f8d738..9391d9f05f1 100644
--- a/src/plugins/debugger/console/console.cpp
+++ b/src/plugins/debugger/console/console.cpp
@@ -63,7 +63,7 @@ Console::Console()
     m_consoleWidget->setWindowTitle(displayName());
     m_consoleWidget->setEnabled(true);
 
-    QVBoxLayout *vbox = new QVBoxLayout(m_consoleWidget);
+    auto vbox = new QVBoxLayout(m_consoleWidget);
     vbox->setMargin(0);
     vbox->setSpacing(0);
 
@@ -92,7 +92,7 @@ Console::Console()
             itemDelegate, &ConsoleItemDelegate::currentChanged);
     m_consoleView->setItemDelegate(itemDelegate);
 
-    Aggregation::Aggregate *aggregate = new Aggregation::Aggregate();
+    auto aggregate = new Aggregation::Aggregate();
     aggregate->add(m_consoleView);
     aggregate->add(new Core::ItemViewFind(m_consoleView));
 
@@ -189,7 +189,7 @@ bool Console::canFocus() const
 
 bool Console::hasFocus() const
 {
-    for (QWidget *widget = m_consoleWidget->window()->focusWidget(); widget != 0;
+    for (QWidget *widget = m_consoleWidget->window()->focusWidget(); widget != nullptr;
          widget = widget->parentWidget()) {
         if (widget == m_consoleWidget)
             return true;
diff --git a/src/plugins/debugger/console/console.h b/src/plugins/debugger/console/console.h
index d95a56601a2..c46add0a864 100644
--- a/src/plugins/debugger/console/console.h
+++ b/src/plugins/debugger/console/console.h
@@ -43,7 +43,7 @@ namespace Utils { class SavedAction; }
 namespace Debugger {
 namespace Internal {
 
-typedef std::function<void(QString)> ScriptEvaluator;
+using ScriptEvaluator = std::function<void (QString)>;
 
 class ConsoleItemModel;
 class ConsoleView;
diff --git a/src/plugins/debugger/console/consoleedit.h b/src/plugins/debugger/console/consoleedit.h
index b27348f6d99..44ef4bd1121 100644
--- a/src/plugins/debugger/console/consoleedit.h
+++ b/src/plugins/debugger/console/consoleedit.h
@@ -41,8 +41,8 @@ public:
     QString getCurrentScript() const;
 
 protected:
-    void keyPressEvent(QKeyEvent *e);
-    void focusOutEvent(QFocusEvent *e);
+    void keyPressEvent(QKeyEvent *e) override;
+    void focusOutEvent(QFocusEvent *e) override;
 
 signals:
     void editingFinished();
diff --git a/src/plugins/debugger/console/consoleitem.cpp b/src/plugins/debugger/console/consoleitem.cpp
index 4bf02535947..d22e14d6b4f 100644
--- a/src/plugins/debugger/console/consoleitem.cpp
+++ b/src/plugins/debugger/console/consoleitem.cpp
@@ -44,7 +44,7 @@ ConsoleItem::ConsoleItem(ItemType itemType, const QString &expression, const QSt
 
 ConsoleItem::ConsoleItem(ConsoleItem::ItemType itemType, const QString &expression,
                          std::function<void(ConsoleItem *)> doFetch) :
-    m_itemType(itemType), m_text(addZeroWidthSpace(expression)), m_line(-1), m_doFetch(doFetch)
+    m_itemType(itemType), m_text(addZeroWidthSpace(expression)), m_doFetch(doFetch)
 {}
 
 ConsoleItem::ItemType ConsoleItem::itemType() const
@@ -144,7 +144,7 @@ void ConsoleItem::fetchMore()
     }
 
     for (TreeItem *child : *this) {
-        ConsoleItem *item = static_cast<ConsoleItem *>(child);
+        auto item = static_cast<ConsoleItem*>(child);
         if (item->m_doFetch) {
             item->m_doFetch(item);
             item->m_doFetch = m_doFetch;
diff --git a/src/plugins/debugger/console/consoleitem.h b/src/plugins/debugger/console/consoleitem.h
index e6402228bcb..5e6b5a4d770 100644
--- a/src/plugins/debugger/console/consoleitem.h
+++ b/src/plugins/debugger/console/consoleitem.h
@@ -75,7 +75,7 @@ private:
     ItemType m_itemType;
     QString m_text;
     QString m_file;
-    int m_line;
+    int m_line = -1;
 
     std::function<void(ConsoleItem *)> m_doFetch;
 };
diff --git a/src/plugins/debugger/console/consoleitemdelegate.cpp b/src/plugins/debugger/console/consoleitemdelegate.cpp
index 4fdb01b0362..5a4f0becaf4 100644
--- a/src/plugins/debugger/console/consoleitemdelegate.cpp
+++ b/src/plugins/debugger/console/consoleitemdelegate.cpp
@@ -57,8 +57,7 @@ ConsoleItemDelegate::ConsoleItemDelegate(ConsoleItemModel *model, QObject *paren
     m_expandIcon(Utils::Icons::EXPAND.icon()),
     m_collapseIcon(Utils::Icons::COLLAPSE.icon()),
     m_prompt(Utils::Icon({{QLatin1String(":/utils/images/next.png"),
-                          Utils::Theme::TextColorNormal}}, Utils::Icon::Tint).icon()),
-    m_cachedHeight(0)
+                          Utils::Theme::TextColorNormal}}, Utils::Icon::Tint).icon())
 {
 }
 
@@ -124,7 +123,7 @@ void ConsoleItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o
                                             bool(opt.state & QStyle::State_Selected));
 
     // Calculate positions
-    const QTreeView *view = qobject_cast<const QTreeView *>(opt.widget);
+    const auto view = qobject_cast<const QTreeView*>(opt.widget);
     int level = 0;
     QModelIndex idx(index);
     while (idx.parent() != QModelIndex()) {
@@ -219,7 +218,7 @@ QSize ConsoleItemDelegate::sizeHint(const QStyleOptionViewItem &option,
     QStyleOptionViewItem opt = option;
     initStyleOption(&opt, index);
 
-    const QTreeView *view = qobject_cast<const QTreeView *>(opt.widget);
+    const auto view = qobject_cast<const QTreeView*>(opt.widget);
     int level = 0;
     QModelIndex idx(index);
     while (idx.parent() != QModelIndex()) {
@@ -268,7 +267,7 @@ QWidget *ConsoleItemDelegate::createEditor(QWidget *parent,
                                               const QModelIndex &index) const
 
 {
-    ConsoleEdit *editor = new ConsoleEdit(index, parent);
+    auto editor = new ConsoleEdit(index, parent);
     // Make the background transparent so that the prompt shines through
     editor->setStyleSheet(QLatin1String("QTextEdit {"
                                         "margin-left: 24px;"
@@ -286,7 +285,7 @@ QWidget *ConsoleItemDelegate::createEditor(QWidget *parent,
 void ConsoleItemDelegate::setEditorData(QWidget *editor,
                                            const QModelIndex &index) const
 {
-    ConsoleEdit *edtr = qobject_cast<ConsoleEdit *>(editor);
+    auto edtr = qobject_cast<ConsoleEdit*>(editor);
     edtr->insertPlainText(index.data(ConsoleItem::ExpressionRole).toString());
 }
 
@@ -294,7 +293,7 @@ void ConsoleItemDelegate::setModelData(QWidget *editor,
                                           QAbstractItemModel *model,
                                           const QModelIndex &index) const
 {
-    ConsoleEdit *edtr = qobject_cast<ConsoleEdit *>(editor);
+    auto edtr = qobject_cast<ConsoleEdit*>(editor);
     model->setData(index, edtr->getCurrentScript(), ConsoleItem::ExpressionRole);
     model->setData(index, ConsoleItem::InputType, ConsoleItem::TypeRole);
 }
diff --git a/src/plugins/debugger/console/consoleitemdelegate.h b/src/plugins/debugger/console/consoleitemdelegate.h
index 87896a89c29..3b40666743d 100644
--- a/src/plugins/debugger/console/consoleitemdelegate.h
+++ b/src/plugins/debugger/console/consoleitemdelegate.h
@@ -48,16 +48,17 @@ public:
 
 protected:
     void paint(QPainter *painter, const QStyleOptionViewItem &option,
-               const QModelIndex &index) const;
+               const QModelIndex &index) const override;
     QSize sizeHint(const QStyleOptionViewItem &option,
-                   const QModelIndex &index) const;
+                   const QModelIndex &index) const override;
     QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
-                          const QModelIndex &index) const;
-    void setEditorData(QWidget *editor, const QModelIndex &index) const;
-    void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
+                          const QModelIndex &index) const override;
+    void setEditorData(QWidget *editor, const QModelIndex &index) const override;
+    void setModelData(QWidget *editor, QAbstractItemModel *model,
+                      const QModelIndex &index) const override;
 
     void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option,
-                              const QModelIndex &index) const;
+                              const QModelIndex &index) const override;
 
 private:
     qreal layoutText(QTextLayout &tl, int width, bool *success = nullptr) const;
@@ -70,7 +71,7 @@ private:
     const QIcon m_expandIcon;
     const QIcon m_collapseIcon;
     const QIcon m_prompt;
-    mutable int m_cachedHeight;
+    mutable int m_cachedHeight = 0;
     mutable QFont m_cachedFont;
 };
 
@@ -95,8 +96,6 @@ public:
           m_width(rect.width()),
           m_top(rect.top()),
           m_bottom(rect.bottom()),
-          m_maxFileLength(0),
-          m_maxLineLength(0),
           m_showTaskIconArea(showTaskIconArea),
           m_showExpandableIconArea(showExpandableIconArea)
     {
diff --git a/src/plugins/debugger/console/consoleitemmodel.cpp b/src/plugins/debugger/console/consoleitemmodel.cpp
index ea36932f305..383a0e7b643 100644
--- a/src/plugins/debugger/console/consoleitemmodel.cpp
+++ b/src/plugins/debugger/console/consoleitemmodel.cpp
@@ -38,8 +38,7 @@ namespace Internal {
 ///////////////////////////////////////////////////////////////////////
 
 ConsoleItemModel::ConsoleItemModel(QObject *parent) :
-    Utils::TreeModel<>(new ConsoleItem, parent),
-    m_maxSizeOfFileName(0), m_canFetchMore(false)
+    Utils::TreeModel<>(new ConsoleItem, parent)
 {
     clear();
 }
diff --git a/src/plugins/debugger/console/consoleitemmodel.h b/src/plugins/debugger/console/consoleitemmodel.h
index 5aaab0335c8..921b5d1cc92 100644
--- a/src/plugins/debugger/console/consoleitemmodel.h
+++ b/src/plugins/debugger/console/consoleitemmodel.h
@@ -60,8 +60,8 @@ signals:
     void selectEditableRow(const QModelIndex &index, QItemSelectionModel::SelectionFlags flags);
 
 private:
-    int m_maxSizeOfFileName;
-    bool m_canFetchMore;
+    int m_maxSizeOfFileName = 0;
+    bool m_canFetchMore = false;
 };
 
 } // Internal
diff --git a/src/plugins/debugger/console/consoleproxymodel.h b/src/plugins/debugger/console/consoleproxymodel.h
index d75114d3e62..c97c4f10cf0 100644
--- a/src/plugins/debugger/console/consoleproxymodel.h
+++ b/src/plugins/debugger/console/consoleproxymodel.h
@@ -52,7 +52,8 @@ signals:
                          QItemSelectionModel::SelectionFlags command);
 
 protected:
-    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
+    bool filterAcceptsRow(int source_row,
+                          const QModelIndex &source_parent) const override;
 
 private:
     QFlags<ConsoleItem::ItemType> m_filter;
diff --git a/src/plugins/debugger/console/consoleview.cpp b/src/plugins/debugger/console/consoleview.cpp
index 50a8a838f90..2891e1aa0bc 100644
--- a/src/plugins/debugger/console/consoleview.cpp
+++ b/src/plugins/debugger/console/consoleview.cpp
@@ -110,7 +110,7 @@ ConsoleView::ConsoleView(ConsoleItemModel *model, QWidget *parent) :
             baseName = QLatin1String("fusion"); // Qt5
         }
     }
-    ConsoleViewStyle *style = new ConsoleViewStyle(baseName);
+    auto style = new ConsoleViewStyle(baseName);
     setStyle(style);
     style->setParent(this);
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -180,18 +180,18 @@ void ConsoleView::contextMenuEvent(QContextMenuEvent *event)
     QModelIndex itemIndex = indexAt(event->pos());
     QMenu menu;
 
-    QAction *copy = new QAction(tr("&Copy"), this);
+    auto copy = new QAction(tr("&Copy"), this);
     copy->setEnabled(itemIndex.isValid());
     menu.addAction(copy);
-    QAction *show = new QAction(tr("&Show in Editor"), this);
+    auto show = new QAction(tr("&Show in Editor"), this);
     show->setEnabled(canShowItemInTextEditor(itemIndex));
     menu.addAction(show);
     menu.addSeparator();
-    QAction *clear = new QAction(tr("C&lear"), this);
+    auto clear = new QAction(tr("C&lear"), this);
     menu.addAction(clear);
 
     QAction *a = menu.exec(event->globalPos());
-    if (a == 0)
+    if (a == nullptr)
         return;
 
     if (a == copy) {
@@ -199,8 +199,8 @@ void ConsoleView::contextMenuEvent(QContextMenuEvent *event)
     } else if (a == show) {
         onRowActivated(itemIndex);
     } else if (a == clear) {
-        QAbstractProxyModel *proxyModel = qobject_cast<QAbstractProxyModel *>(model());
-        ConsoleItemModel *handler = qobject_cast<ConsoleItemModel *>(
+        auto proxyModel = qobject_cast<QAbstractProxyModel*>(model());
+        auto handler = qobject_cast<ConsoleItemModel*>(
                     proxyModel->sourceModel());
         handler->clear();
     }
diff --git a/src/plugins/debugger/console/consoleview.h b/src/plugins/debugger/console/consoleview.h
index 493e65a2527..9e3f2013bb3 100644
--- a/src/plugins/debugger/console/consoleview.h
+++ b/src/plugins/debugger/console/consoleview.h
@@ -44,12 +44,12 @@ public:
     void populateFileFinder();
 
 protected:
-    void mousePressEvent(QMouseEvent *event);
-    void resizeEvent(QResizeEvent *e);
+    void mousePressEvent(QMouseEvent *event) override;
+    void resizeEvent(QResizeEvent *e) override;
     void drawBranches(QPainter *painter, const QRect &rect,
-                      const QModelIndex &index) const;
-    void contextMenuEvent(QContextMenuEvent *event);
-    void focusInEvent(QFocusEvent *event);
+                      const QModelIndex &index) const override;
+    void contextMenuEvent(QContextMenuEvent *event) override;
+    void focusInEvent(QFocusEvent *event) override;
 
 private:
     void onRowActivated(const QModelIndex &index);