From a9f73d079a3874c4034e03555758aac4c4602cbb Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 5 Jun 2016 22:34:47 +0300 Subject: [PATCH] Todo: Use Qt5-style connects The heavy lifting was done by clazy. Change-Id: I6132a266f9d350dfecd7a12b03877bdcbbc31302 Reviewed-by: Eike Ziller --- src/plugins/todo/cpptodoitemsscanner.h | 6 +---- src/plugins/todo/keyworddialog.cpp | 6 ++--- src/plugins/todo/keyworddialog.h | 4 +--- src/plugins/todo/optionsdialog.cpp | 17 +++++++++----- src/plugins/todo/optionsdialog.h | 5 +---- src/plugins/todo/optionsdialog.ui | 22 +------------------ src/plugins/todo/qmljstodoitemsscanner.h | 6 +---- src/plugins/todo/todoitemsmodel.h | 2 -- src/plugins/todo/todoitemsprovider.cpp | 15 +++++++------ src/plugins/todo/todoitemsprovider.h | 3 +-- src/plugins/todo/todooutputpane.h | 21 +++++++++--------- src/plugins/todo/todooutputtreeview.cpp | 2 +- src/plugins/todo/todooutputtreeview.h | 4 +--- src/plugins/todo/todoplugin.h | 4 +--- .../todo/todoprojectsettingswidget.cpp | 3 ++- src/plugins/todo/todoprojectsettingswidget.h | 4 +--- src/plugins/todo/todoprojectsettingswidget.ui | 22 +------------------ 17 files changed, 46 insertions(+), 100 deletions(-) diff --git a/src/plugins/todo/cpptodoitemsscanner.h b/src/plugins/todo/cpptodoitemsscanner.h index 966976d0543..5725ef46336 100644 --- a/src/plugins/todo/cpptodoitemsscanner.h +++ b/src/plugins/todo/cpptodoitemsscanner.h @@ -35,18 +35,14 @@ namespace Internal { class CppTodoItemsScanner : public TodoItemsScanner { - Q_OBJECT - public: explicit CppTodoItemsScanner(const KeywordList &keywordList, QObject *parent = 0); protected: void scannerParamsChanged(); -private slots: - void documentUpdated(CPlusPlus::Document::Ptr doc); - private: + void documentUpdated(CPlusPlus::Document::Ptr doc); void processDocument(CPlusPlus::Document::Ptr doc); }; diff --git a/src/plugins/todo/keyworddialog.cpp b/src/plugins/todo/keyworddialog.cpp index 066f4cb0ffb..721f65f6aba 100644 --- a/src/plugins/todo/keyworddialog.cpp +++ b/src/plugins/todo/keyworddialog.cpp @@ -47,8 +47,8 @@ KeywordDialog::KeywordDialog(const Keyword &keyword, const QSet &alread ui->keywordNameEdit->setText(keyword.name); ui->errorLabel->hide(); - connect(ui->buttonBox, SIGNAL(accepted()), SLOT(acceptButtonClicked())); - connect(ui->keywordNameEdit, SIGNAL(textChanged(QString)), ui->errorLabel, SLOT(hide())); + connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &KeywordDialog::acceptButtonClicked); + connect(ui->keywordNameEdit, &QLineEdit::textChanged, ui->errorLabel, &QWidget::hide); } KeywordDialog::~KeywordDialog() @@ -108,7 +108,7 @@ void KeywordDialog::setupColorWidgets(const QColor &color) { ui->colorButton->setColor(color); ui->colorEdit->setText(color.name()); - connect(ui->colorButton, SIGNAL(colorChanged(QColor)), SLOT(colorSelected(QColor))); + connect(ui->colorButton, &Utils::QtColorButton::colorChanged, this, &KeywordDialog::colorSelected); } bool KeywordDialog::canAccept() diff --git a/src/plugins/todo/keyworddialog.h b/src/plugins/todo/keyworddialog.h index b6e8a775d0b..e7c858aed86 100644 --- a/src/plugins/todo/keyworddialog.h +++ b/src/plugins/todo/keyworddialog.h @@ -47,11 +47,9 @@ public: Keyword keyword(); -private slots: +private: void colorSelected(const QColor &color); void acceptButtonClicked(); - -private: void setupListWidget(IconType selectedIcon); void setupColorWidgets(const QColor &color); bool canAccept(); diff --git a/src/plugins/todo/optionsdialog.cpp b/src/plugins/todo/optionsdialog.cpp index 4fba99d7790..2b411aa40ef 100644 --- a/src/plugins/todo/optionsdialog.cpp +++ b/src/plugins/todo/optionsdialog.cpp @@ -41,11 +41,18 @@ OptionsDialog::OptionsDialog(QWidget *parent) : ui->setupUi(this); ui->keywordsList->setIconSize(QSize(16, 16)); setKeywordsButtonsEnabled(); - connect(ui->addKeywordButton, SIGNAL(clicked()), SLOT(addKeywordButtonClicked())); - connect(ui->removeKeywordButton, SIGNAL(clicked()), SLOT(removeKeywordButtonClicked())); - connect(ui->editKeywordButton, SIGNAL(clicked()), SLOT(editKeywordButtonClicked())); - connect(ui->resetKeywordsButton, SIGNAL(clicked()), SLOT(resetKeywordsButtonClicked())); - connect(ui->keywordsList, SIGNAL(itemDoubleClicked(QListWidgetItem*)), SLOT(keywordDoubleClicked(QListWidgetItem*))); + connect(ui->addKeywordButton, &QAbstractButton::clicked, + this, &OptionsDialog::addKeywordButtonClicked); + connect(ui->removeKeywordButton, &QAbstractButton::clicked, + this, &OptionsDialog::removeKeywordButtonClicked); + connect(ui->editKeywordButton, &QAbstractButton::clicked, + this, &OptionsDialog::editKeywordButtonClicked); + connect(ui->resetKeywordsButton, &QAbstractButton::clicked, + this, &OptionsDialog::resetKeywordsButtonClicked); + connect(ui->keywordsList, &QListWidget::itemDoubleClicked, + this, &OptionsDialog::keywordDoubleClicked); + connect(ui->keywordsList, &QListWidget::itemSelectionChanged, + this, &OptionsDialog::setKeywordsButtonsEnabled); } OptionsDialog::~OptionsDialog() diff --git a/src/plugins/todo/optionsdialog.h b/src/plugins/todo/optionsdialog.h index 7754caae8d9..a4ccbd0cf44 100644 --- a/src/plugins/todo/optionsdialog.h +++ b/src/plugins/todo/optionsdialog.h @@ -42,7 +42,6 @@ class Keyword; class OptionsDialog : public QWidget { - Q_OBJECT public: explicit OptionsDialog(QWidget *parent = 0); ~OptionsDialog(); @@ -50,15 +49,13 @@ public: void setSettings(const Settings &settings); Settings settings(); -private slots: +private: void addKeywordButtonClicked(); void editKeywordButtonClicked(); void removeKeywordButtonClicked(); void resetKeywordsButtonClicked(); void setKeywordsButtonsEnabled(); void keywordDoubleClicked(QListWidgetItem *item); - -private: void uiFromSettings(const Settings &settings); Settings settingsFromUi(); void addToKeywordsList(const Keyword &keyword); diff --git a/src/plugins/todo/optionsdialog.ui b/src/plugins/todo/optionsdialog.ui index e097f1cf058..321978494e3 100644 --- a/src/plugins/todo/optionsdialog.ui +++ b/src/plugins/todo/optionsdialog.ui @@ -114,25 +114,5 @@ - - - keywordsList - itemSelectionChanged() - Todo::Internal::OptionsDialog - setKeywordsButtonsEnabled() - - - 247 - 176 - - - 5 - 137 - - - - - - setKeywordsButtonsEnabled() - + diff --git a/src/plugins/todo/qmljstodoitemsscanner.h b/src/plugins/todo/qmljstodoitemsscanner.h index 91b4aed6785..2816c4f6a88 100644 --- a/src/plugins/todo/qmljstodoitemsscanner.h +++ b/src/plugins/todo/qmljstodoitemsscanner.h @@ -35,8 +35,6 @@ namespace Internal { class QmlJsTodoItemsScanner : public TodoItemsScanner { - Q_OBJECT - public: explicit QmlJsTodoItemsScanner(const KeywordList &keywordList, QObject *parent = 0); @@ -44,10 +42,8 @@ protected: bool shouldProcessFile(const QString &fileName); void scannerParamsChanged() override; -private slots: - void documentUpdated(QmlJS::Document::Ptr doc); - private: + void documentUpdated(QmlJS::Document::Ptr doc); void processDocument(QmlJS::Document::Ptr doc); }; diff --git a/src/plugins/todo/todoitemsmodel.h b/src/plugins/todo/todoitemsmodel.h index e16422ee3a2..278ee018f85 100644 --- a/src/plugins/todo/todoitemsmodel.h +++ b/src/plugins/todo/todoitemsmodel.h @@ -49,8 +49,6 @@ public: QVariant headerData(int section, Qt::Orientation orientation, int role) const; void sort(int column, Qt::SortOrder order = Qt::AscendingOrder); - -public slots: void todoItemsListUpdated(); private: diff --git a/src/plugins/todo/todoitemsprovider.cpp b/src/plugins/todo/todoitemsprovider.cpp index 2bae89683b4..3bedefac057 100644 --- a/src/plugins/todo/todoitemsprovider.cpp +++ b/src/plugins/todo/todoitemsprovider.cpp @@ -111,8 +111,8 @@ void TodoItemsProvider::createScanners() m_scanners << new QmlJsTodoItemsScanner(m_settings.keywords, this); foreach (TodoItemsScanner *scanner, m_scanners) { - connect(scanner, SIGNAL(itemsFetched(QString,QList)), this, - SLOT(itemsFetched(QString,QList)), Qt::QueuedConnection); + connect(scanner, &TodoItemsScanner::itemsFetched, this, + &TodoItemsProvider::itemsFetched, Qt::QueuedConnection); } } @@ -208,16 +208,17 @@ void TodoItemsProvider::updateListTimeoutElapsed() void TodoItemsProvider::setupStartupProjectBinding() { m_startupProject = SessionManager::startupProject(); - connect(SessionManager::instance(), SIGNAL(startupProjectChanged(ProjectExplorer::Project*)), - SLOT(startupProjectChanged(ProjectExplorer::Project*))); - connect(ProjectExplorerPlugin::instance(), SIGNAL(fileListChanged()), SLOT(projectsFilesChanged())); + connect(SessionManager::instance(), &SessionManager::startupProjectChanged, + this, &TodoItemsProvider::startupProjectChanged); + connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::fileListChanged, + this, &TodoItemsProvider::projectsFilesChanged); } void TodoItemsProvider::setupCurrentEditorBinding() { m_currentEditor = Core::EditorManager::currentEditor(); - connect(Core::EditorManager::instance(), SIGNAL(currentEditorChanged(Core::IEditor*)), - SLOT(currentEditorChanged(Core::IEditor*))); + connect(Core::EditorManager::instance(), &Core::EditorManager::currentEditorChanged, + this, &TodoItemsProvider::currentEditorChanged); } void TodoItemsProvider::setupUpdateListTimer() diff --git a/src/plugins/todo/todoitemsprovider.h b/src/plugins/todo/todoitemsprovider.h index 2e946a7512e..5c5b4ecf704 100644 --- a/src/plugins/todo/todoitemsprovider.h +++ b/src/plugins/todo/todoitemsprovider.h @@ -49,7 +49,6 @@ public: explicit TodoItemsProvider(Settings settings, QObject *parent = 0); TodoItemsModel *todoItemsModel(); -public slots: void settingsChanged(const Settings &newSettings); void projectSettingsChanged(ProjectExplorer::Project *project); @@ -82,7 +81,7 @@ private: void setItemsListWithinStartupProject(); void setItemsListWithinSubproject(); -private slots: +private: void itemsFetched(const QString &fileName, const QList &items); void startupProjectChanged(ProjectExplorer::Project *project); void projectsFilesChanged(); diff --git a/src/plugins/todo/todooutputpane.h b/src/plugins/todo/todooutputpane.h index 91a05eea311..c534fce0498 100644 --- a/src/plugins/todo/todooutputpane.h +++ b/src/plugins/todo/todooutputpane.h @@ -73,21 +73,11 @@ signals: void todoItemClicked(const TodoItem &item); void scanningScopeChanged(ScanningScope scanningScope); -private slots: +private: void scopeButtonClicked(QAbstractButton *button); void todoTreeViewClicked(const QModelIndex &index); void updateTodoCount(); -private: - TodoOutputTreeView *m_todoTreeView; - QToolButton *m_currentFileButton; - QToolButton *m_wholeProjectButton; - QToolButton *m_subProjectButton; - QWidget *m_spacer; - QButtonGroup *m_scopeButtons; - QList *items; - TodoItemsModel *m_todoItemsModel; - void createTreeView(); void freeTreeView(); void createScopeButtons(); @@ -96,6 +86,15 @@ private: QModelIndex selectedModelIndex(); QModelIndex nextModelIndex(); QModelIndex previousModelIndex(); + + TodoOutputTreeView *m_todoTreeView; + QToolButton *m_currentFileButton; + QToolButton *m_wholeProjectButton; + QToolButton *m_subProjectButton; + QWidget *m_spacer; + QButtonGroup *m_scopeButtons; + QList *items; + TodoItemsModel *m_todoItemsModel; }; } // namespace Internal diff --git a/src/plugins/todo/todooutputtreeview.cpp b/src/plugins/todo/todooutputtreeview.cpp index 2111de5080d..4475999870e 100644 --- a/src/plugins/todo/todooutputtreeview.cpp +++ b/src/plugins/todo/todooutputtreeview.cpp @@ -51,7 +51,7 @@ TodoOutputTreeView::TodoOutputTreeView(QWidget *parent) : header()->setSectionResizeMode(QHeaderView::Interactive); header()->setStretchLastSection(true); header()->setSectionsMovable(false); - connect(header(), SIGNAL(sectionResized(int,int,int)), SLOT(todoColumnResized(int,int,int))); + connect(header(), &QHeaderView::sectionResized, this, &TodoOutputTreeView::todoColumnResized); loadDisplaySettings(); } diff --git a/src/plugins/todo/todooutputtreeview.h b/src/plugins/todo/todooutputtreeview.h index 50329c5e572..54c1b24df2c 100644 --- a/src/plugins/todo/todooutputtreeview.h +++ b/src/plugins/todo/todooutputtreeview.h @@ -32,17 +32,15 @@ namespace Internal { class TodoOutputTreeView : public Utils::TreeView { - Q_OBJECT public: explicit TodoOutputTreeView(QWidget *parent = 0); ~TodoOutputTreeView(); void resizeEvent(QResizeEvent *event); -private slots: +private: void todoColumnResized(int column, int oldSize, int newSize); -private: void saveDisplaySettings(); void loadDisplaySettings(); diff --git a/src/plugins/todo/todoplugin.h b/src/plugins/todo/todoplugin.h index 8733f3bfc90..99e262c9bbd 100644 --- a/src/plugins/todo/todoplugin.h +++ b/src/plugins/todo/todoplugin.h @@ -50,12 +50,10 @@ public: void extensionsInitialized(); bool initialize(const QStringList &arguments, QString *errorString); -private slots: +private: void settingsChanged(const Settings &settings); void scanningScopeChanged(ScanningScope scanningScope); void todoItemClicked(const TodoItem &item); - -private: void createItemsProvider(); void createTodoOutputPane(); void createOptionsPage(); diff --git a/src/plugins/todo/todoprojectsettingswidget.cpp b/src/plugins/todo/todoprojectsettingswidget.cpp index 0747856618d..1b241ff1959 100644 --- a/src/plugins/todo/todoprojectsettingswidget.cpp +++ b/src/plugins/todo/todoprojectsettingswidget.cpp @@ -38,7 +38,6 @@ namespace Todo { namespace Internal { TodoProjectSettingsWidget::TodoProjectSettingsWidget(ProjectExplorer::Project *project) : - QWidget(0), ui(new Ui::TodoProjectSettingsWidget), m_project(project) { @@ -51,6 +50,8 @@ TodoProjectSettingsWidget::TodoProjectSettingsWidget(ProjectExplorer::Project *p this, &TodoProjectSettingsWidget::removeExcludedPatternButtonClicked); connect(ui->excludedPatternsList, &QListWidget::itemChanged, this, &TodoProjectSettingsWidget::excludedPatternChanged, Qt::QueuedConnection); + connect(ui->excludedPatternsList, &QListWidget::itemSelectionChanged, + this, &TodoProjectSettingsWidget::setExcludedPatternsButtonsEnabled); loadSettings(); } diff --git a/src/plugins/todo/todoprojectsettingswidget.h b/src/plugins/todo/todoprojectsettingswidget.h index c6e7204df6f..9cc8262f5ef 100644 --- a/src/plugins/todo/todoprojectsettingswidget.h +++ b/src/plugins/todo/todoprojectsettingswidget.h @@ -53,13 +53,11 @@ public: signals: void projectSettingsChanged(); -private slots: +private: void addExcludedPatternButtonClicked(); void removeExcludedPatternButtonClicked(); void setExcludedPatternsButtonsEnabled(); void excludedPatternChanged(QListWidgetItem *item); - -private: QListWidgetItem *addToExcludedPatternsList(const QString &pattern); void loadSettings(); void saveSettings(); diff --git a/src/plugins/todo/todoprojectsettingswidget.ui b/src/plugins/todo/todoprojectsettingswidget.ui index 2b43e1d96c0..a8149df9919 100644 --- a/src/plugins/todo/todoprojectsettingswidget.ui +++ b/src/plugins/todo/todoprojectsettingswidget.ui @@ -67,25 +67,5 @@ - - - excludedPatternsList - itemSelectionChanged() - Todo::Internal::TodoProjectSettingsWidget - setExcludedPatternsButtonsEnabled() - - - 170 - 381 - - - 221 - 240 - - - - - - setExcludedPatternsButtonsEnabled() - +