From ef7e95a7bbcce5290338c0ea32d1cc71f1015964 Mon Sep 17 00:00:00 2001
From: Lorenz Haas <lykurg@gmail.com>
Date: Sun, 21 Jun 2015 19:29:13 +0200
Subject: [PATCH] Beautifier: Consistently use qt5 connection style
Change-Id: Iea7a554dbb323b3a2b691d3e254c4e111897beb8
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
---
.../artisticstyle/artisticstyleoptionspage.cpp | 2 +-
.../artisticstyle/artisticstylesettings.cpp | 3 ++-
src/plugins/beautifier/beautifierplugin.cpp | 12 +++++++-----
.../clangformat/clangformatoptionspage.cpp | 2 +-
src/plugins/beautifier/configurationdialog.cpp | 4 ++--
.../beautifier/uncrustify/uncrustifyoptionspage.cpp | 2 +-
6 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
index 34a586b8a0c..191806c48f0 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
@@ -58,7 +58,7 @@ ArtisticStyleOptionsPageWidget::ArtisticStyleOptionsPageWidget(ArtisticStyleSett
ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand);
ui->command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle(
QLatin1String(Constants::ArtisticStyle::DISPLAY_NAME)));
- connect(ui->command, SIGNAL(validChanged(bool)), ui->options, SLOT(setEnabled(bool)));
+ connect(ui->command, &Utils::PathChooser::validChanged, ui->options, &QWidget::setEnabled);
ui->configurations->setSettings(m_settings);
}
diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
index 0604661184f..66e713c84c7 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
@@ -59,7 +59,8 @@ ArtisticStyleSettings::ArtisticStyleSettings() :
AbstractSettings(QLatin1String(Constants::ArtisticStyle::SETTINGS_NAME),
QLatin1String(".astyle"))
{
- connect(&m_versionWatcher, SIGNAL(finished()), this, SLOT(helperSetVersion()));
+ connect(&m_versionWatcher, &QFutureWatcherBase::finished,
+ this, &ArtisticStyleSettings::helperSetVersion);
setCommand(QLatin1String("astyle"));
m_settings.insert(QLatin1String(kUseOtherFiles), QVariant(true));
diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp
index abc10bfe013..bcfb73ec5f0 100644
--- a/src/plugins/beautifier/beautifierplugin.cpp
+++ b/src/plugins/beautifier/beautifierplugin.cpp
@@ -75,8 +75,9 @@ namespace Internal {
BeautifierPlugin::BeautifierPlugin() :
m_asyncFormatMapper(new QSignalMapper)
{
- connect(m_asyncFormatMapper, SIGNAL(mapped(QObject*)),
- this, SLOT(formatCurrentFileContinue(QObject*)));
+ connect(m_asyncFormatMapper,
+ static_cast<void (QSignalMapper::*)(QObject *)>(&QSignalMapper::mapped),
+ this, &BeautifierPlugin::formatCurrentFileContinue);
connect(this, &BeautifierPlugin::pipeError, this, &BeautifierPlugin::showError);
}
@@ -114,8 +115,8 @@ bool BeautifierPlugin::initialize(const QStringList &arguments, QString *errorSt
void BeautifierPlugin::extensionsInitialized()
{
if (const Core::EditorManager *editorManager = Core::EditorManager::instance()) {
- connect(editorManager, SIGNAL(currentEditorChanged(Core::IEditor*)),
- this, SLOT(updateActions(Core::IEditor*)));
+ connect(editorManager, &Core::EditorManager::currentEditorChanged,
+ this, &BeautifierPlugin::updateActions);
}
}
@@ -237,7 +238,8 @@ void BeautifierPlugin::formatCurrentFile(const Command &command, int startPos, i
QFutureWatcher<FormatTask> *watcher = new QFutureWatcher<FormatTask>;
connect(doc, &TextDocument::contentsChanged,
watcher, &QFutureWatcher<FormatTask>::cancel);
- connect(watcher, SIGNAL(finished()), m_asyncFormatMapper, SLOT(map()));
+ connect(watcher, &QFutureWatcherBase::finished, m_asyncFormatMapper,
+ static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
m_asyncFormatMapper->setMapping(watcher, watcher);
watcher->setFuture(QtConcurrent::run(&BeautifierPlugin::formatAsync, this, task));
}
diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
index f510d943290..f271a2ffa2c 100644
--- a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
+++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
@@ -57,7 +57,7 @@ ClangFormatOptionsPageWidget::ClangFormatOptionsPageWidget(ClangFormatSettings *
ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand);
ui->command->setPromptDialogTitle(
BeautifierPlugin::msgCommandPromptDialogTitle(QLatin1String("Clang Format")));
- connect(ui->command, SIGNAL(validChanged(bool)), ui->options, SLOT(setEnabled(bool)));
+ connect(ui->command, &Utils::PathChooser::validChanged, ui->options, &QWidget::setEnabled);
ui->configurations->setSettings(m_settings);
}
diff --git a/src/plugins/beautifier/configurationdialog.cpp b/src/plugins/beautifier/configurationdialog.cpp
index 1edb17cf840..572a7182331 100644
--- a/src/plugins/beautifier/configurationdialog.cpp
+++ b/src/plugins/beautifier/configurationdialog.cpp
@@ -57,8 +57,8 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent) :
updateDocumentation();
connect(ui->name, &QLineEdit::textChanged, this, &ConfigurationDialog::updateOkButton);
updateOkButton(); // force initial test.
- connect(ui->editor, SIGNAL(documentationChanged(QString,QString)),
- this, SLOT(updateDocumentation(QString,QString)));
+ connect(ui->editor, &ConfigurationEditor::documentationChanged,
+ this, &ConfigurationDialog::updateDocumentation);
// Set palette and font according to settings
const TextEditor::FontSettings fs = TextEditor::TextEditorSettings::instance()->fontSettings();
diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
index eb4f070863d..c023fe8e2c3 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
@@ -58,7 +58,7 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set
ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand);
ui->command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle(
QLatin1String(Constants::Uncrustify::DISPLAY_NAME)));
- connect(ui->command, SIGNAL(validChanged(bool)), ui->options, SLOT(setEnabled(bool)));
+ connect(ui->command, &Utils::PathChooser::validChanged, ui->options, &QWidget::setEnabled);
ui->configurations->setSettings(m_settings);
}
--
GitLab