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

MacrosPlugin: Modernize

Browse Source 
modernize-*

Change-Id: Iffb1bdc9b2b7e89e4744ceaef35f7bcaad418797
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Alessandro Portale
2018-11-14 01:41:46 +01:00
parent 62abfd7b50
commit 88b43d54c3
18 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/macros/actionmacrohandler.h
View File

@@ -42,8 +42,8 @@ class ActionMacroHandler : public IMacroHandler
public: public:
ActionMacroHandler(); ActionMacroHandler();
bool canExecuteEvent(const MacroEvent &macroEvent); bool canExecuteEvent(const MacroEvent &macroEvent) override;
bool executeEvent(const MacroEvent &macroEvent); bool executeEvent(const MacroEvent &macroEvent) override;
private: private:
void registerCommand(Core::Id id); void registerCommand(Core::Id id);

7
src/plugins/macros/findmacrohandler.cpp
View File

@@ -74,7 +74,7 @@ bool FindMacroHandler::executeEvent(const MacroEvent &macroEvent)
if (!aggregate) if (!aggregate)
return false; return false;
Core::IFindSupport *currentFind = aggregate->component<Core::IFindSupport>(); auto currentFind = aggregate->component<Core::IFindSupport>();
if (!currentFind) if (!currentFind)
return false; return false;
@@ -190,9 +190,8 @@ void FindMacroHandler::changeEditor(Core::IEditor *editor)
Aggregation::Aggregate *aggregate = Aggregation::Aggregate::parentAggregate(editor->widget()); Aggregation::Aggregate *aggregate = Aggregation::Aggregate::parentAggregate(editor->widget());
if (aggregate) { if (aggregate) {
Core::IFindSupport *currentFind = aggregate->component<Core::IFindSupport>(); if (auto currentFind = aggregate->component<Core::IFindSupport>()) {
if (currentFind) { auto macroFind = qobject_cast<MacroTextFind *>(currentFind);
MacroTextFind *macroFind = qobject_cast<MacroTextFind *>(currentFind);
if (macroFind) if (macroFind)
return; return;

6
src/plugins/macros/findmacrohandler.h
View File

@@ -41,10 +41,10 @@ class FindMacroHandler : public IMacroHandler
public: public:
FindMacroHandler(); FindMacroHandler();
void startRecording(Macro* macro); void startRecording(Macro* macro) override;
bool canExecuteEvent(const MacroEvent &macroEvent); bool canExecuteEvent(const MacroEvent &macroEvent) override;
bool executeEvent(const MacroEvent &macroEvent); bool executeEvent(const MacroEvent &macroEvent) override;
void findIncremental(const QString &txt, Core::FindFlags findFlags); void findIncremental(const QString &txt, Core::FindFlags findFlags);
void findStep(const QString &txt, Core::FindFlags findFlags); void findStep(const QString &txt, Core::FindFlags findFlags);

2
src/plugins/macros/macroevent.h
View File

@@ -40,7 +40,7 @@ namespace Internal {
class MacroEvent class MacroEvent
{ {
public: public:
MacroEvent() {} MacroEvent() = default;
Core::Id id() const; Core::Id id() const;
void setId(Core::Id id); void setId(Core::Id id);

4
src/plugins/macros/macrolocatorfilter.cpp
View File

@@ -45,9 +45,7 @@ MacroLocatorFilter::MacroLocatorFilter(QObject *parent)
setShortcutString("rm"); setShortcutString("rm");
} }
MacroLocatorFilter::~MacroLocatorFilter() MacroLocatorFilter::~MacroLocatorFilter() = default;
{
}
QList<Core::LocatorFilterEntry> MacroLocatorFilter::matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry) QList<Core::LocatorFilterEntry> MacroLocatorFilter::matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry)
{ {

2
src/plugins/macros/macrolocatorfilter.h
View File

@@ -38,7 +38,7 @@ class MacroLocatorFilter : public Core::ILocatorFilter
public: public:
explicit MacroLocatorFilter(QObject *parent); explicit MacroLocatorFilter(QObject *parent);
~MacroLocatorFilter(); ~MacroLocatorFilter() override;
QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future,
const QString &entry) override; const QString &entry) override;

4
src/plugins/macros/macromanager.cpp
View File

@@ -135,7 +135,7 @@ void MacroManager::MacroManagerPrivate::initialize()
foreach (const QString &name, files) { foreach (const QString &name, files) {
QString fileName = dir.absolutePath() + QLatin1Char('/') + name; QString fileName = dir.absolutePath() + QLatin1Char('/') + name;
Macro *macro = new Macro; auto macro = new Macro;
if (macro->loadHeader(fileName)) if (macro->loadHeader(fileName))
addMacro(macro); addMacro(macro);
else else
@@ -152,7 +152,7 @@ void MacroManager::MacroManagerPrivate::addMacro(Macro *macro)
{ {
// Add sortcut // Add sortcut
Core::Context context(TextEditor::Constants::C_TEXTEDITOR); Core::Context context(TextEditor::Constants::C_TEXTEDITOR);
QAction *action = new QAction(macro->description(), q); auto action = new QAction(macro->description(), q);
Core::Command *command = Core::ActionManager::registerAction( Core::Command *command = Core::ActionManager::registerAction(
action, makeId(macro->displayName()), context); action, makeId(macro->displayName()), context);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Core::Command::CA_UpdateText);

4
src/plugins/macros/macromanager.h
View File

@@ -61,8 +61,8 @@ protected:
void changeMacro(const QString &name, const QString &description); void changeMacro(const QString &name, const QString &description);
private: private:
explicit MacroManager(QObject *parent = 0); explicit MacroManager(QObject *parent = nullptr);
~MacroManager(); ~MacroManager() override;
static MacroManager *m_instance; static MacroManager *m_instance;

8
src/plugins/macros/macrooptionspage.h
View File

@@ -39,12 +39,12 @@ class MacroOptionsPage : public Core::IOptionsPage
Q_OBJECT Q_OBJECT
public: public:
MacroOptionsPage(QObject *parent = 0); MacroOptionsPage(QObject *parent = nullptr);
// IOptionsPage implementation // IOptionsPage implementation
QWidget *widget(); QWidget *widget() override;
void apply(); void apply() override;
void finish(); void finish() override;
private: private:
QPointer<MacroOptionsWidget> m_widget; QPointer<MacroOptionsWidget> m_widget;

2
src/plugins/macros/macrooptionswidget.cpp
View File

@@ -94,7 +94,7 @@ void MacroOptionsWidget::createTable()
Macro *macro = it.value(); Macro *macro = it.value();
QFileInfo fileInfo(macro->fileName()); QFileInfo fileInfo(macro->fileName());
if (fileInfo.absoluteDir() == dir.absolutePath()) { if (fileInfo.absoluteDir() == dir.absolutePath()) {
QTreeWidgetItem *macroItem = new QTreeWidgetItem(m_ui->treeWidget); auto macroItem = new QTreeWidgetItem(m_ui->treeWidget);
macroItem->setText(0, macro->displayName()); macroItem->setText(0, macro->displayName());
macroItem->setText(1, macro->description()); macroItem->setText(1, macro->description());
macroItem->setData(0, NAME_ROLE, macro->displayName()); macroItem->setData(0, NAME_ROLE, macro->displayName());

4
src/plugins/macros/macrooptionswidget.h
View File

@@ -44,8 +44,8 @@ namespace Ui { class MacroOptionsWidget; }
class MacroOptionsWidget : public QWidget { class MacroOptionsWidget : public QWidget {
Q_OBJECT Q_OBJECT
public: public:
explicit MacroOptionsWidget(QWidget *parent = 0); explicit MacroOptionsWidget(QWidget *parent = nullptr);
~MacroOptionsWidget(); ~MacroOptionsWidget() override;
void initialize(); void initialize();

2
src/plugins/macros/macrosconstants.h
View File

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

6
src/plugins/macros/macrosplugin.h
View File

@@ -38,10 +38,10 @@ class MacrosPlugin : public ExtensionSystem::IPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Macros.json") Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Macros.json")
public: public:
~MacrosPlugin(); ~MacrosPlugin() override;
bool initialize(const QStringList &arguments, QString *errorMessage); bool initialize(const QStringList &arguments, QString *errorMessage) override;
void extensionsInitialized(); void extensionsInitialized() override;
private: private:
MacroManager *m_macroManager = nullptr; MacroManager *m_macroManager = nullptr;

6
src/plugins/macros/macrotextfind.cpp
View File

@@ -44,7 +44,7 @@ bool MacroTextFind::supportsReplace() const
Core::FindFlags MacroTextFind::supportedFindFlags() const Core::FindFlags MacroTextFind::supportedFindFlags() const
{ {
QTC_ASSERT(m_currentFind, return 0); QTC_ASSERT(m_currentFind, return {});
return m_currentFind->supportedFindFlags(); return m_currentFind->supportedFindFlags();
} }
@@ -63,13 +63,13 @@ void MacroTextFind::clearHighlights()
QString MacroTextFind::currentFindString() const QString MacroTextFind::currentFindString() const
{ {
QTC_ASSERT(m_currentFind, return QString()); QTC_ASSERT(m_currentFind, return {});
return m_currentFind->currentFindString(); return m_currentFind->currentFindString();
} }
QString MacroTextFind::completedFindString() const QString MacroTextFind::completedFindString() const
{ {
QTC_ASSERT(m_currentFind, return QString()); QTC_ASSERT(m_currentFind, return {});
return m_currentFind->completedFindString(); return m_currentFind->completedFindString();
} }

28
src/plugins/macros/macrotextfind.h
View File

@@ -39,22 +39,22 @@ class MacroTextFind : public Core::IFindSupport
public: public:
MacroTextFind(Core::IFindSupport *currentFind); MacroTextFind(Core::IFindSupport *currentFind);
bool supportsReplace() const; bool supportsReplace() const override;
Core::FindFlags supportedFindFlags() const; Core::FindFlags supportedFindFlags() const override;
void resetIncrementalSearch(); void resetIncrementalSearch() override;
void clearHighlights(); void clearHighlights() override;
QString currentFindString() const; QString currentFindString() const override;
QString completedFindString() const; QString completedFindString() const override;
void highlightAll(const QString &txt, Core::FindFlags findFlags); void highlightAll(const QString &txt, Core::FindFlags findFlags) override;
Core::IFindSupport::Result findIncremental(const QString &txt, Core::FindFlags findFlags); Core::IFindSupport::Result findIncremental(const QString &txt, Core::FindFlags findFlags) override;
Core::IFindSupport::Result findStep(const QString &txt, Core::FindFlags findFlags); Core::IFindSupport::Result findStep(const QString &txt, Core::FindFlags findFlags) override;
void replace(const QString &before, const QString &after, Core::FindFlags findFlags); void replace(const QString &before, const QString &after, Core::FindFlags findFlags) override;
bool replaceStep(const QString &before, const QString &after, Core::FindFlags findFlags); bool replaceStep(const QString &before, const QString &after, Core::FindFlags findFlags) override;
int replaceAll(const QString &before, const QString &after, Core::FindFlags findFlags); int replaceAll(const QString &before, const QString &after, Core::FindFlags findFlags) override;
void defineFindScope(); void defineFindScope() override;
void clearFindScope(); void clearFindScope() override;
signals: signals:
void incrementalSearchReseted(); void incrementalSearchReseted();

4
src/plugins/macros/savedialog.h
View File

@@ -37,8 +37,8 @@ class SaveDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
explicit SaveDialog(QWidget *parent = 0); explicit SaveDialog(QWidget *parent = nullptr);
~SaveDialog(); ~SaveDialog() override;
QString name() const; QString name() const;
QString description() const; QString description() const;

2
src/plugins/macros/texteditormacrohandler.cpp
View File

@@ -110,7 +110,7 @@ bool TextEditorMacroHandler::eventFilter(QObject *watched, QEvent *event)
return false; return false;
if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) { if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
QKeyEvent *keyEvent = dynamic_cast<QKeyEvent *>(event); auto keyEvent = dynamic_cast<QKeyEvent *>(event);
MacroEvent e; MacroEvent e;
e.setId(KEYEVENTNAME); e.setId(KEYEVENTNAME);
e.setValue(TEXT, keyEvent->text()); e.setValue(TEXT, keyEvent->text());

10
src/plugins/macros/texteditormacrohandler.h
View File

@@ -41,13 +41,13 @@ class TextEditorMacroHandler : public IMacroHandler
public: public:
TextEditorMacroHandler(); TextEditorMacroHandler();
void startRecording(Macro *macro); void startRecording(Macro *macro) override;
void endRecordingMacro(Macro *macro); void endRecordingMacro(Macro *macro) override;
bool canExecuteEvent(const MacroEvent &macroEvent); bool canExecuteEvent(const MacroEvent &macroEvent) override;
bool executeEvent(const MacroEvent &macroEvent); bool executeEvent(const MacroEvent &macroEvent) override;
bool eventFilter(QObject *watched, QEvent *event); bool eventFilter(QObject *watched, QEvent *event) override;
void changeEditor(Core::IEditor *editor); void changeEditor(Core::IEditor *editor);
void closeEditor(Core::IEditor *editor); void closeEditor(Core::IEditor *editor);