SerialTerminal: Modernize

modernize-*

Change-Id: If7b19d7c560ecda5f6e519d88b7eab46d4eabccf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

6 files changed, 27 insertions, 25 deletions

diff --git a/src/plugins/serialterminal/consolelineedit.h b/src/plugins/serialterminal/consolelineedit.h
index b3167cdb52e..dcb2c62d2a5 100644
--- a/src/plugins/serialterminal/consolelineedit.h
+++ b/src/plugins/serialterminal/consolelineedit.h
@@ -39,7 +39,7 @@ public:
     void loadHistoryEntry(int entryIndex);
 
 protected:
-    void keyPressEvent(QKeyEvent *event) override final;
+    void keyPressEvent(QKeyEvent *event) final;
 
 private:
     QStringList m_history;
diff --git a/src/plugins/serialterminal/serialdevicemodel.h b/src/plugins/serialterminal/serialdevicemodel.h
index a9f67f1938e..3d13ace6bed 100644
--- a/src/plugins/serialterminal/serialdevicemodel.h
+++ b/src/plugins/serialterminal/serialdevicemodel.h
@@ -50,9 +50,9 @@ public:
 
     void update();
 
-    Qt::ItemFlags flags(const QModelIndex &index) const override final;
-    int rowCount(const QModelIndex &parent) const override final;
-    QVariant data(const QModelIndex &index, int role) const override final;
+    Qt::ItemFlags flags(const QModelIndex &index) const final;
+    int rowCount(const QModelIndex &parent) const final;
+    QVariant data(const QModelIndex &index, int role) const final;
 
 private:
     QList<QSerialPortInfo> m_ports;
diff --git a/src/plugins/serialterminal/serialoutputpane.cpp b/src/plugins/serialterminal/serialoutputpane.cpp
index 776d3fd879f..cf3a9a2f147 100644
--- a/src/plugins/serialterminal/serialoutputpane.cpp
+++ b/src/plugins/serialterminal/serialoutputpane.cpp
@@ -414,7 +414,7 @@ void SerialOutputPane::createToolButtons()
 void SerialOutputPane::updateLineEndingsComboBox()
 {
     m_lineEndingsSelection->clear();
-    for (QPair<QString,QByteArray> value : m_settings.lineEndings)
+    for (auto &value : m_settings.lineEndings)
         m_lineEndingsSelection->addItem(value.first, value.second);
 
     m_lineEndingsSelection->setCurrentIndex(m_settings.defaultLineEndingIndex);
@@ -520,7 +520,7 @@ void SerialOutputPane::contextMenuRequested(const QPoint &pos, int index)
 {
     QList<QAction *> actions { m_closeCurrentTabAction, m_closeAllTabsAction, m_closeOtherTabsAction };
 
-    QAction *action = QMenu::exec(actions, m_tabWidget->mapToGlobal(pos), 0, m_tabWidget);
+    QAction *action = QMenu::exec(actions, m_tabWidget->mapToGlobal(pos), nullptr, m_tabWidget);
     const int currentIdx = index != -1 ? index : currentIndex();
 
     if (action == m_closeCurrentTabAction) {
diff --git a/src/plugins/serialterminal/serialoutputpane.h b/src/plugins/serialterminal/serialoutputpane.h
index 5f011f9daa6..56577d46135 100644
--- a/src/plugins/serialterminal/serialoutputpane.h
+++ b/src/plugins/serialterminal/serialoutputpane.h
@@ -70,22 +70,22 @@ public:
     explicit SerialOutputPane(Settings &settings);
 
     // IOutputPane
-    QWidget *outputWidget(QWidget *parent) override final;
-    QList<QWidget *> toolBarWidgets() const override final;
-    QString displayName() const override final;
-
-    int priorityInStatusBar() const override final;
-    void clearContents() override final;
-    void visibilityChanged(bool) override final;
-    bool canFocus() const override final;
-    bool hasFocus() const override final;
-    void setFocus() override final;
-
-    bool canNext() const override final;
-    bool canPrevious() const override final;
-    void goToNext() override final;
-    void goToPrev() override final;
-    bool canNavigate() const override final;
+    QWidget *outputWidget(QWidget *parent) final;
+    QList<QWidget *> toolBarWidgets() const final;
+    QString displayName() const final;
+
+    int priorityInStatusBar() const final;
+    void clearContents() final;
+    void visibilityChanged(bool) final;
+    bool canFocus() const final;
+    bool hasFocus() const final;
+    void setFocus() final;
+
+    bool canNext() const final;
+    bool canPrevious() const final;
+    void goToNext() final;
+    void goToPrev() final;
+    bool canNavigate() const final;
 
     void createNewOutputWindow(SerialControl *rc);
 
diff --git a/src/plugins/serialterminal/serialterminalconstants.h b/src/plugins/serialterminal/serialterminalconstants.h
index f498f35db41..7e56d259dd8 100644
--- a/src/plugins/serialterminal/serialterminalconstants.h
+++ b/src/plugins/serialterminal/serialterminalconstants.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include <QtGlobal>
+
 namespace SerialTerminal {
 namespace Constants {
 
diff --git a/src/plugins/serialterminal/serialterminalplugin.h b/src/plugins/serialterminal/serialterminalplugin.h
index 7bf4b3ea41c..c383a4ee6af 100644
--- a/src/plugins/serialterminal/serialterminalplugin.h
+++ b/src/plugins/serialterminal/serialterminalplugin.h
@@ -43,9 +43,9 @@ class SerialTerminalPlugin : public ExtensionSystem::IPlugin
 public:
     explicit SerialTerminalPlugin() = default;
 
-    bool initialize(const QStringList &arguments, QString *errorString) override final;
-    void extensionsInitialized() override final;
-    ShutdownFlag aboutToShutdown() override final;
+    bool initialize(const QStringList &arguments, QString *errorString) final;
+    void extensionsInitialized() final;
+    ShutdownFlag aboutToShutdown() final;
 
 private:
     void settingsChanged(const Settings &settings);