diff --git a/src/plugins/todo/cpptodoitemsscanner.h b/src/plugins/todo/cpptodoitemsscanner.h
index 5725ef46336..52cd184ee5f 100644
--- a/src/plugins/todo/cpptodoitemsscanner.h
+++ b/src/plugins/todo/cpptodoitemsscanner.h
@@ -36,10 +36,10 @@ namespace Internal {
 class CppTodoItemsScanner : public TodoItemsScanner
 {
 public:
-    explicit CppTodoItemsScanner(const KeywordList &keywordList, QObject *parent = 0);
+    explicit CppTodoItemsScanner(const KeywordList &keywordList, QObject *parent = nullptr);
 
 protected:
-    void scannerParamsChanged();
+    void scannerParamsChanged() override;
 
 private:
     void documentUpdated(CPlusPlus::Document::Ptr doc);
diff --git a/src/plugins/todo/keyword.h b/src/plugins/todo/keyword.h
index 533992355de..2020e155542 100644
--- a/src/plugins/todo/keyword.h
+++ b/src/plugins/todo/keyword.h
@@ -47,7 +47,7 @@ public:
     bool equals(const Keyword &other) const;
 };
 
-typedef QList<Keyword> KeywordList;
+using KeywordList = QList<Keyword>;
 
 bool operator ==(Keyword &k1, Keyword &k2);
 bool operator !=(Keyword &k1, Keyword &k2);
diff --git a/src/plugins/todo/keyworddialog.cpp b/src/plugins/todo/keyworddialog.cpp
index 95e36544fea..1c1867d82b6 100644
--- a/src/plugins/todo/keyworddialog.cpp
+++ b/src/plugins/todo/keyworddialog.cpp
@@ -142,8 +142,8 @@ bool KeywordDialog::isKeywordNameCorrect()
     if (name.isEmpty())
         return false;
 
-    for (int i = 0; i < name.size(); ++i)
-        if (LineParser::isKeywordSeparator(name.at(i)))
+    for (const QChar i : name)
+        if (LineParser::isKeywordSeparator(i))
             return false;
 
     return true;
diff --git a/src/plugins/todo/keyworddialog.h b/src/plugins/todo/keyworddialog.h
index e7c858aed86..92746995b91 100644
--- a/src/plugins/todo/keyworddialog.h
+++ b/src/plugins/todo/keyworddialog.h
@@ -42,8 +42,8 @@ class KeywordDialog : public QDialog
     Q_OBJECT
 public:
     KeywordDialog(const Keyword &keyword, const QSet<QString> &alreadyUsedKeywordNames,
-                  QWidget *parent = 0);
-    ~KeywordDialog();
+                  QWidget *parent = nullptr);
+    ~KeywordDialog() override;
 
     Keyword keyword();
 
diff --git a/src/plugins/todo/lineparser.h b/src/plugins/todo/lineparser.h
index 8d5c3bed1ed..6c434a7624d 100644
--- a/src/plugins/todo/lineparser.h
+++ b/src/plugins/todo/lineparser.h
@@ -47,7 +47,7 @@ private:
 
     // map key here is keyword start position in the text line
     // and map value is keyword index in m_keywords
-    typedef QMap<int, int> KeywordEntryCandidates;
+    using KeywordEntryCandidates = QMap<int, int> ;
 
     struct KeywordEntry {
         int keywordIndex;
diff --git a/src/plugins/todo/optionsdialog.h b/src/plugins/todo/optionsdialog.h
index a4ccbd0cf44..716bdd5fd27 100644
--- a/src/plugins/todo/optionsdialog.h
+++ b/src/plugins/todo/optionsdialog.h
@@ -43,8 +43,8 @@ class Keyword;
 class OptionsDialog : public QWidget
 {
 public:
-    explicit OptionsDialog(QWidget *parent = 0);
-    ~OptionsDialog();
+    explicit OptionsDialog(QWidget *parent = nullptr);
+    ~OptionsDialog() override;
 
     void setSettings(const Settings &settings);
     Settings settings();
diff --git a/src/plugins/todo/optionspage.cpp b/src/plugins/todo/optionspage.cpp
index ff3c0ed83a7..a39d6218926 100644
--- a/src/plugins/todo/optionspage.cpp
+++ b/src/plugins/todo/optionspage.cpp
@@ -34,14 +34,13 @@
 #include <QIcon>
 #include <QMessageBox>
 
-Todo::Internal::OptionsDialog *some = 0;
+Todo::Internal::OptionsDialog *some = nullptr;
 
 namespace Todo {
 namespace Internal {
 
 OptionsPage::OptionsPage(const Settings &settings, QObject *parent) :
-    IOptionsPage(parent),
-    m_widget(0)
+    IOptionsPage(parent)
 {
     setSettings(settings);
 
diff --git a/src/plugins/todo/optionspage.h b/src/plugins/todo/optionspage.h
index f38f7787875..b546f8f6d39 100644
--- a/src/plugins/todo/optionspage.h
+++ b/src/plugins/todo/optionspage.h
@@ -42,13 +42,13 @@ class OptionsPage : public Core::IOptionsPage
     Q_OBJECT
 
 public:
-    OptionsPage(const Settings &settings, QObject *parent = 0);
+    OptionsPage(const Settings &settings, QObject *parent = nullptr);
 
     void setSettings(const Settings &settings);
 
-    QWidget *widget();
-    void apply();
-    void finish();
+    QWidget *widget() override;
+    void apply() override;
+    void finish() override;
 
 signals:
     void settingsChanged(const Settings &settings);
diff --git a/src/plugins/todo/qmljstodoitemsscanner.h b/src/plugins/todo/qmljstodoitemsscanner.h
index 2816c4f6a88..02f7ed595a6 100644
--- a/src/plugins/todo/qmljstodoitemsscanner.h
+++ b/src/plugins/todo/qmljstodoitemsscanner.h
@@ -36,7 +36,7 @@ namespace Internal {
 class QmlJsTodoItemsScanner : public TodoItemsScanner
 {
 public:
-    explicit QmlJsTodoItemsScanner(const KeywordList &keywordList, QObject *parent = 0);
+    explicit QmlJsTodoItemsScanner(const KeywordList &keywordList, QObject *parent = nullptr);
 
 protected:
     bool shouldProcessFile(const QString &fileName);
diff --git a/src/plugins/todo/todoitem.h b/src/plugins/todo/todoitem.h
index 0d17e1068e1..be38f85ae7b 100644
--- a/src/plugins/todo/todoitem.h
+++ b/src/plugins/todo/todoitem.h
@@ -41,12 +41,10 @@ namespace Internal {
 class TodoItem
 {
 public:
-    TodoItem() : line(-1) {}
-
     QString text;
     Utils::FileName file;
-    int line;
-    IconType iconType;
+    int line = -1;
+    IconType iconType = IconType::Todo;
     QColor color;
 };
 
diff --git a/src/plugins/todo/todoitemsmodel.cpp b/src/plugins/todo/todoitemsmodel.cpp
index 64919bf35e4..03d48a13527 100644
--- a/src/plugins/todo/todoitemsmodel.cpp
+++ b/src/plugins/todo/todoitemsmodel.cpp
@@ -40,9 +40,7 @@ namespace Internal {
 
 TodoItemsModel::TodoItemsModel(QObject *parent) :
     QAbstractTableModel(parent),
-    m_todoItemsList(0),
-    m_currentSortColumn(Constants::OutputColumnIndex(0)),
-    m_currentSortOrder(Qt::AscendingOrder)
+    m_currentSortColumn(Constants::OutputColumnIndex(0))
 {
 }
 
diff --git a/src/plugins/todo/todoitemsmodel.h b/src/plugins/todo/todoitemsmodel.h
index 278ee018f85..ac66c155e23 100644
--- a/src/plugins/todo/todoitemsmodel.h
+++ b/src/plugins/todo/todoitemsmodel.h
@@ -39,22 +39,22 @@ class TodoItemsModel : public QAbstractTableModel
     Q_OBJECT
 
 public:
-    explicit TodoItemsModel(QObject *parent = 0);
+    explicit TodoItemsModel(QObject *parent = nullptr);
 
     void setTodoItemsList(QList<TodoItem> *list);
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant data(const QModelIndex &index, int role) const;
-    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
 
-    void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
+    void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
     void todoItemsListUpdated();
 
 private:
-    QList<TodoItem> *m_todoItemsList;
+    QList<TodoItem> *m_todoItemsList = nullptr;
     Constants::OutputColumnIndex m_currentSortColumn;
-    Qt::SortOrder m_currentSortOrder;
+    Qt::SortOrder m_currentSortOrder = Qt::AscendingOrder;
 };
 
 }
diff --git a/src/plugins/todo/todoitemsprovider.h b/src/plugins/todo/todoitemsprovider.h
index 5c5b4ecf704..234025bfec7 100644
--- a/src/plugins/todo/todoitemsprovider.h
+++ b/src/plugins/todo/todoitemsprovider.h
@@ -46,7 +46,7 @@ class TodoItemsProvider : public QObject
     Q_OBJECT
 
 public:
-    explicit TodoItemsProvider(Settings settings, QObject *parent = 0);
+    explicit TodoItemsProvider(Settings settings, QObject *parent = nullptr);
     TodoItemsModel *todoItemsModel();
 
     void settingsChanged(const Settings &newSettings);
diff --git a/src/plugins/todo/todoitemsscanner.h b/src/plugins/todo/todoitemsscanner.h
index 75f1c6ac4c7..ec90a0d19fb 100644
--- a/src/plugins/todo/todoitemsscanner.h
+++ b/src/plugins/todo/todoitemsscanner.h
@@ -41,7 +41,7 @@ class TodoItemsScanner : public QObject
     Q_OBJECT
 
 public:
-    explicit TodoItemsScanner(const KeywordList &keywordList, QObject *parent = 0);
+    explicit TodoItemsScanner(const KeywordList &keywordList, QObject *parent = nullptr);
     void setParams(const KeywordList &keywordList);
 
 signals:
diff --git a/src/plugins/todo/todooutputpane.cpp b/src/plugins/todo/todooutputpane.cpp
index 99d8779abfb..2b1a06ab258 100644
--- a/src/plugins/todo/todooutputpane.cpp
+++ b/src/plugins/todo/todooutputpane.cpp
@@ -193,7 +193,7 @@ void TodoOutputPane::updateTodoCount()
 void TodoOutputPane::updateFilter()
 {
     QStringList keywords;
-    for (QToolButton *btn: m_filterButtons) {
+    for (const QToolButton *btn: qAsConst(m_filterButtons)) {
         if (btn->isChecked())
             keywords.append(btn->property(Constants::FILTER_KEYWORD_NAME).toString());
     }
@@ -210,7 +210,7 @@ void TodoOutputPane::updateFilter()
 
 void TodoOutputPane::clearFilter()
 {
-    for (QToolButton *btn: m_filterButtons)
+    for (QToolButton *btn: qAsConst(m_filterButtons))
         btn->setChecked(false);
 
     updateFilter();
@@ -225,7 +225,7 @@ void TodoOutputPane::createTreeView()
 
     m_todoTreeView = new TodoOutputTreeView();
     m_todoTreeView->setModel(m_filteredTodoItemsModel);
-    Aggregation::Aggregate *agg = new Aggregation::Aggregate;
+    auto agg = new Aggregation::Aggregate;
     agg->add(m_todoTreeView);
     agg->add(new Core::ItemViewFind(m_todoTreeView));
 
@@ -240,7 +240,7 @@ void TodoOutputPane::freeTreeView()
 
 QToolButton *TodoOutputPane::createCheckableToolButton(const QString &text, const QString &toolTip, const QIcon &icon)
 {
-    QToolButton *button = new QToolButton();
+    auto button = new QToolButton;
 
     button->setCheckable(true);
     button->setText(text);
diff --git a/src/plugins/todo/todooutputpane.h b/src/plugins/todo/todooutputpane.h
index c2ef23ec146..0c99d0a04af 100644
--- a/src/plugins/todo/todooutputpane.h
+++ b/src/plugins/todo/todooutputpane.h
@@ -45,30 +45,30 @@ class TodoItem;
 class TodoItemsModel;
 class TodoOutputTreeView;
 
-typedef QList<QToolButton*> QToolButtonList;
+using QToolButtonList = QList<QToolButton *>;
 
 class TodoOutputPane : public Core::IOutputPane
 {
     Q_OBJECT
 
 public:
-    TodoOutputPane(TodoItemsModel *todoItemsModel, const Settings *settings, QObject *parent = 0);
-    ~TodoOutputPane();
+    TodoOutputPane(TodoItemsModel *todoItemsModel, const Settings *settings, QObject *parent = nullptr);
+    ~TodoOutputPane() override;
 
-    QWidget *outputWidget(QWidget *parent);
-    QList<QWidget*> toolBarWidgets() const;
-    QString displayName() const;
-    int priorityInStatusBar() const;
-    void clearContents();
-    void visibilityChanged(bool visible);
-    void setFocus();
-    bool hasFocus() const;
-    bool canFocus() const;
-    bool canNavigate() const;
-    bool canNext() const;
-    bool canPrevious() const;
-    void goToNext();
-    void goToPrev();
+    QWidget *outputWidget(QWidget *parent) override;
+    QList<QWidget*> toolBarWidgets() const override;
+    QString displayName() const override;
+    int priorityInStatusBar() const override;
+    void clearContents() override;
+    void visibilityChanged(bool visible) override;
+    void setFocus() override;
+    bool hasFocus() const override;
+    bool canFocus() const override;
+    bool canNavigate() const override;
+    bool canNext() const override;
+    bool canPrevious() const override;
+    void goToNext() override;
+    void goToPrev() override;
 
     void setScanningScope(ScanningScope scanningScope);
 
diff --git a/src/plugins/todo/todooutputtreeview.cpp b/src/plugins/todo/todooutputtreeview.cpp
index caff88efc7e..9db3800089b 100644
--- a/src/plugins/todo/todooutputtreeview.cpp
+++ b/src/plugins/todo/todooutputtreeview.cpp
@@ -37,9 +37,7 @@ namespace Todo {
 namespace Internal {
 
 TodoOutputTreeView::TodoOutputTreeView(QWidget *parent) :
-    Utils::TreeView(parent),
-    m_textColumnDefaultWidth(0),
-    m_fileColumnDefaultWidth(0)
+    Utils::TreeView(parent)
 {
     setRootIsDecorated(false);
     setFrameStyle(QFrame::NoFrame);
diff --git a/src/plugins/todo/todooutputtreeview.h b/src/plugins/todo/todooutputtreeview.h
index 54c1b24df2c..d55ac9e48e9 100644
--- a/src/plugins/todo/todooutputtreeview.h
+++ b/src/plugins/todo/todooutputtreeview.h
@@ -33,10 +33,10 @@ namespace Internal {
 class TodoOutputTreeView : public Utils::TreeView
 {
 public:
-    explicit TodoOutputTreeView(QWidget *parent = 0);
-    ~TodoOutputTreeView();
+    explicit TodoOutputTreeView(QWidget *parent = nullptr);
+    ~TodoOutputTreeView() override;
 
-    void resizeEvent(QResizeEvent *event);
+    void resizeEvent(QResizeEvent *event) override;
 
 private:
     void todoColumnResized(int column, int oldSize, int newSize);
@@ -44,8 +44,8 @@ private:
     void saveDisplaySettings();
     void loadDisplaySettings();
 
-    qreal m_textColumnDefaultWidth;
-    qreal m_fileColumnDefaultWidth;
+    qreal m_textColumnDefaultWidth = 0.0;
+    qreal m_fileColumnDefaultWidth = 0.0;
 };
 
 } // namespace Internal
diff --git a/src/plugins/todo/todooutputtreeviewdelegate.h b/src/plugins/todo/todooutputtreeviewdelegate.h
index 28f1fa8db6b..452f274fdcb 100644
--- a/src/plugins/todo/todooutputtreeviewdelegate.h
+++ b/src/plugins/todo/todooutputtreeviewdelegate.h
@@ -34,7 +34,7 @@ class TodoOutputTreeViewDelegate : public QStyledItemDelegate
 {
     Q_OBJECT
 public:
-    explicit TodoOutputTreeViewDelegate(QObject *parent = 0);
+    explicit TodoOutputTreeViewDelegate(QObject *parent = nullptr);
     void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 };
 
diff --git a/src/plugins/todo/todoplugin.cpp b/src/plugins/todo/todoplugin.cpp
index 3f273c37f6e..b59e50ee44d 100644
--- a/src/plugins/todo/todoplugin.cpp
+++ b/src/plugins/todo/todoplugin.cpp
@@ -45,17 +45,12 @@
 namespace Todo {
 namespace Internal {
 
-TodoPlugin::TodoPlugin() :
-    m_todoOutputPane(0),
-    m_optionsPage(0),
-    m_todoItemsProvider(0)
+TodoPlugin::TodoPlugin()
 {
     qRegisterMetaType<TodoItem>("TodoItem");
 }
 
-TodoPlugin::~TodoPlugin()
-{
-}
+TodoPlugin::~TodoPlugin() = default;
 
 bool TodoPlugin::initialize(const QStringList& args, QString *errMsg)
 {
diff --git a/src/plugins/todo/todoplugin.h b/src/plugins/todo/todoplugin.h
index 99e262c9bbd..7a3063c7cf5 100644
--- a/src/plugins/todo/todoplugin.h
+++ b/src/plugins/todo/todoplugin.h
@@ -45,10 +45,10 @@ class TodoPlugin : public ExtensionSystem::IPlugin
 
 public:
     TodoPlugin();
-    ~TodoPlugin();
+    ~TodoPlugin() override;
 
-    void extensionsInitialized();
-    bool initialize(const QStringList &arguments, QString *errorString);
+    void extensionsInitialized() override;
+    bool initialize(const QStringList &arguments, QString *errorString) override;
 
 private:
     void settingsChanged(const Settings &settings);
@@ -59,9 +59,9 @@ private:
     void createOptionsPage();
 
     Settings m_settings;
-    TodoOutputPane *m_todoOutputPane;
-    OptionsPage *m_optionsPage;
-    TodoItemsProvider *m_todoItemsProvider;
+    TodoOutputPane *m_todoOutputPane = nullptr;
+    OptionsPage *m_optionsPage = nullptr;
+    TodoItemsProvider *m_todoItemsProvider = nullptr;
 };
 
 } // namespace Internal
diff --git a/src/plugins/todo/todoprojectsettingswidget.cpp b/src/plugins/todo/todoprojectsettingswidget.cpp
index a868b71adc7..59c544e0e55 100644
--- a/src/plugins/todo/todoprojectsettingswidget.cpp
+++ b/src/plugins/todo/todoprojectsettingswidget.cpp
@@ -63,7 +63,7 @@ TodoProjectSettingsWidget::~TodoProjectSettingsWidget()
 
 QListWidgetItem *TodoProjectSettingsWidget::addToExcludedPatternsList(const QString &pattern)
 {
-    QListWidgetItem *item = new QListWidgetItem(pattern);
+    auto item = new QListWidgetItem(pattern);
     item->setFlags(item->flags() | Qt::ItemIsEditable);
     prepareItem(item);
     ui->excludedPatternsList->addItem(item);
diff --git a/src/plugins/todo/todoprojectsettingswidget.h b/src/plugins/todo/todoprojectsettingswidget.h
index 9cc8262f5ef..d711922eb66 100644
--- a/src/plugins/todo/todoprojectsettingswidget.h
+++ b/src/plugins/todo/todoprojectsettingswidget.h
@@ -48,7 +48,7 @@ class TodoProjectSettingsWidget : public QWidget
 
 public:
     explicit TodoProjectSettingsWidget(ProjectExplorer::Project *project);
-    ~TodoProjectSettingsWidget();
+    ~TodoProjectSettingsWidget() override;
 
 signals:
     void projectSettingsChanged();