feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SerialTerminal: Modernize

Browse Source 
modernize-*

Change-Id: If7b19d7c560ecda5f6e519d88b7eab46d4eabccf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Alessandro Portale
2018-11-24 20:37:59 +01:00
parent 3116875516
commit bbac294682
6 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/serialterminal/consolelineedit.h
View File

@@ -39,7 +39,7 @@ public:
void loadHistoryEntry(int entryIndex); void loadHistoryEntry(int entryIndex);
protected: protected:
void keyPressEvent(QKeyEvent *event) override final; void keyPressEvent(QKeyEvent *event) final;
private: private:
QStringList m_history; QStringList m_history;

6
src/plugins/serialterminal/serialdevicemodel.h
View File

@@ -50,9 +50,9 @@ public:
void update(); void update();
Qt::ItemFlags flags(const QModelIndex &index) const override final; Qt::ItemFlags flags(const QModelIndex &index) const final;
int rowCount(const QModelIndex &parent) const override final; int rowCount(const QModelIndex &parent) const final;
QVariant data(const QModelIndex &index, int role) const override final; QVariant data(const QModelIndex &index, int role) const final;
private: private:
QList<QSerialPortInfo> m_ports; QList<QSerialPortInfo> m_ports;

4
src/plugins/serialterminal/serialoutputpane.cpp
View File

@@ -414,7 +414,7 @@ void SerialOutputPane::createToolButtons()
void SerialOutputPane::updateLineEndingsComboBox() void SerialOutputPane::updateLineEndingsComboBox()
{ {
m_lineEndingsSelection->clear(); 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->addItem(value.first, value.second);
m_lineEndingsSelection->setCurrentIndex(m_settings.defaultLineEndingIndex); 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 }; 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(); const int currentIdx = index != -1 ? index : currentIndex();
if (action == m_closeCurrentTabAction) { if (action == m_closeCurrentTabAction) {

28
src/plugins/serialterminal/serialoutputpane.h
View File

@@ -70,22 +70,22 @@ public:
explicit SerialOutputPane(Settings &settings); explicit SerialOutputPane(Settings &settings);
// IOutputPane // IOutputPane
QWidget *outputWidget(QWidget *parent) override final; QWidget *outputWidget(QWidget *parent) final;
QList<QWidget *> toolBarWidgets() const override final; QList<QWidget *> toolBarWidgets() const final;
QString displayName() const override final; QString displayName() const final;
int priorityInStatusBar() const override final; int priorityInStatusBar() const final;
void clearContents() override final; void clearContents() final;
void visibilityChanged(bool) override final; void visibilityChanged(bool) final;
bool canFocus() const override final; bool canFocus() const final;
bool hasFocus() const override final; bool hasFocus() const final;
void setFocus() override final; void setFocus() final;
bool canNext() const override final; bool canNext() const final;
bool canPrevious() const override final; bool canPrevious() const final;
void goToNext() override final; void goToNext() final;
void goToPrev() override final; void goToPrev() final;
bool canNavigate() const override final; bool canNavigate() const final;
void createNewOutputWindow(SerialControl *rc); void createNewOutputWindow(SerialControl *rc);

2
src/plugins/serialterminal/serialterminalconstants.h
View File

@@ -25,6 +25,8 @@
#pragma once #pragma once
#include <QtGlobal>
namespace SerialTerminal { namespace SerialTerminal {
namespace Constants { namespace Constants {

6
src/plugins/serialterminal/serialterminalplugin.h
View File

@@ -43,9 +43,9 @@ class SerialTerminalPlugin : public ExtensionSystem::IPlugin
public: public:
explicit SerialTerminalPlugin() = default; explicit SerialTerminalPlugin() = default;
bool initialize(const QStringList &arguments, QString *errorString) override final; bool initialize(const QStringList &arguments, QString *errorString) final;
void extensionsInitialized() override final; void extensionsInitialized() final;
ShutdownFlag aboutToShutdown() override final; ShutdownFlag aboutToShutdown() final;
private: private:
void settingsChanged(const Settings &settings); void settingsChanged(const Settings &settings);