diff --git a/src/plugins/beautifier/abstractsettings.cpp b/src/plugins/beautifier/abstractsettings.cpp
index b67e57cc75f9c0c1b9b9e2b3770ab8acd75cd932..81e6193102f2b9aafa40d20b14dfcda7b2ac3f2a 100644
--- a/src/plugins/beautifier/abstractsettings.cpp
+++ b/src/plugins/beautifier/abstractsettings.cpp
@@ -82,7 +82,7 @@ bool AbstractSettings::styleExists(const QString &key) const
 
 bool AbstractSettings::styleIsReadOnly(const QString &key)
 {
-    QFileInfo fi(m_styleDir.absoluteFilePath(key + m_ending));
+    const QFileInfo fi(m_styleDir.absoluteFilePath(key + m_ending));
     if (!fi.exists()) {
         // newly added style which was not saved yet., thus it is not read only.
         //TODO In a later version when we have predefined styles in Core::ICore::resourcePath()
diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp
index bcfb73ec5f01c72e8e22639de3d922a3662f1b94..960a2fdca6494203d19efafe8faa0c1cf74a006c 100644
--- a/src/plugins/beautifier/beautifierplugin.cpp
+++ b/src/plugins/beautifier/beautifierplugin.cpp
@@ -142,7 +142,7 @@ QString BeautifierPlugin::format(const QString &text, const Command &command,
     switch (command.processing()) {
     case Command::FileProcessing: {
         // Save text to temporary file
-        QFileInfo fi(fileName);
+        const QFileInfo fi(fileName);
         Utils::TempFileSaver sourceFile(QDir::tempPath() + QLatin1String("/qtc_beautifier_XXXXXXXX.")
                                         + fi.suffix());
         sourceFile.setAutoRemove(true);
@@ -396,7 +396,7 @@ void BeautifierPlugin::formatCurrentFileContinue(QObject *watcher)
     // Restore folded blocks
     const QTextDocument *doc = textEditor->document();
     foreach (const int blockId, foldedBlocks) {
-        QTextBlock block = doc->findBlockByNumber(qMax(0, blockId));
+        const QTextBlock block = doc->findBlockByNumber(qMax(0, blockId));
         if (block.isValid())
             TextDocumentLayout::doFoldOrUnfold(block, false);
     }
diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp
index e277c86a3173455f7753326036f734d3eb26a11e..79eee4a1356c9607404f840b31818bbe0c2cd872 100644
--- a/src/plugins/beautifier/clangformat/clangformat.cpp
+++ b/src/plugins/beautifier/clangformat/clangformat.cpp
@@ -112,11 +112,12 @@ void ClangFormat::formatFile()
 
 void ClangFormat::formatSelectedText()
 {
-    TextEditor::TextEditorWidget *widget = TextEditor::TextEditorWidget::currentTextEditorWidget();
+    const TextEditor::TextEditorWidget *widget
+            = TextEditor::TextEditorWidget::currentTextEditorWidget();
     if (!widget)
         return;
 
-    QTextCursor tc = widget->textCursor();
+    const QTextCursor tc = widget->textCursor();
     if (tc.hasSelection()) {
         const int offset = tc.selectionStart();
         const int length = tc.selectionEnd() - offset;
diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
index f271a2ffa2ce74ce1a43e5c3d4b91a2c4e7a50ae..32fb362f05a967635659cbdf5fd911fc73c4c277 100644
--- a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
+++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
@@ -69,7 +69,7 @@ ClangFormatOptionsPageWidget::~ClangFormatOptionsPageWidget()
 void ClangFormatOptionsPageWidget::restore()
 {
     ui->command->setPath(m_settings->command());
-    int textIndex = ui->predefinedStyle->findText(m_settings->predefinedStyle());
+    const int textIndex = ui->predefinedStyle->findText(m_settings->predefinedStyle());
     if (textIndex != -1)
         ui->predefinedStyle->setCurrentIndex(textIndex);
     ui->formatEntireFileFallback->setChecked(m_settings->formatEntireFileFallback());
diff --git a/src/plugins/beautifier/configurationdialog.cpp b/src/plugins/beautifier/configurationdialog.cpp
index 572a7182331eeb69040b46d0c4de488d966c2461..9d010419d364e0315898e5085005cd8a656615b8 100644
--- a/src/plugins/beautifier/configurationdialog.cpp
+++ b/src/plugins/beautifier/configurationdialog.cpp
@@ -137,9 +137,7 @@ QString ConfigurationDialog::value() const
 void ConfigurationDialog::updateOkButton()
 {
     const QString key = ui->name->text().simplified();
-    bool exists = false;
-    if (m_settings && key != m_currentKey)
-        exists = m_settings->styleExists(key);
+    const bool exists = m_settings && key != m_currentKey && m_settings->styleExists(key);
     ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!(key.isEmpty() || exists));
 }
 
diff --git a/src/plugins/beautifier/configurationeditor.cpp b/src/plugins/beautifier/configurationeditor.cpp
index f435409cfa77579ba9de9dd0bbb5720ba67895a7..a9b113569c52a934f62fc1166e03d0a6e114eda9 100644
--- a/src/plugins/beautifier/configurationeditor.cpp
+++ b/src/plugins/beautifier/configurationeditor.cpp
@@ -139,7 +139,7 @@ void ConfigurationEditor::setCommentExpression(const QRegExp &rx)
 bool ConfigurationEditor::eventFilter(QObject *object, QEvent *event)
 {
     if (event->type() == QEvent::ShortcutOverride) {
-        QKeyEvent *key = static_cast<QKeyEvent *>(event);
+        const QKeyEvent *key = static_cast<const QKeyEvent *>(event);
         if (key->key() == Qt::Key_Escape) {
             event->accept();
             m_completer->popup()->hide();
@@ -176,7 +176,7 @@ void ConfigurationEditor::keyPressEvent(QKeyEvent *event)
         QPlainTextEdit::keyPressEvent(event);
 
     const int cursorPosition = textCursor().position();
-    QTextCursor cursor = cursorForTextUnderCursor();
+    const QTextCursor cursor = cursorForTextUnderCursor();
     const QString prefix = cursor.selectedText();
 
     if (!isShortcut && (prefix.length() < 2 || cursorPosition != cursor.position())) {
diff --git a/src/plugins/beautifier/configurationpanel.cpp b/src/plugins/beautifier/configurationpanel.cpp
index cd8a148aca0ae1e4502f044ab0bb12d469e1f334..01162eeda8012139f9ba9ffc1238dda42c52d83c 100644
--- a/src/plugins/beautifier/configurationpanel.cpp
+++ b/src/plugins/beautifier/configurationpanel.cpp
@@ -65,7 +65,7 @@ void ConfigurationPanel::setSettings(AbstractSettings *settings)
 
 void ConfigurationPanel::setCurrentConfiguration(const QString &text)
 {
-    int textIndex = ui->configurations->findText(text);
+    const int textIndex = ui->configurations->findText(text);
     if (textIndex != -1)
         ui->configurations->setCurrentIndex(textIndex);
 }
@@ -117,7 +117,7 @@ void ConfigurationPanel::populateConfigurations(const QString &key)
     const QString currentText = (!key.isEmpty()) ? key : ui->configurations->currentText();
     ui->configurations->clear();
     ui->configurations->addItems(m_settings->styles());
-    int textIndex = ui->configurations->findText(currentText);
+    const int textIndex = ui->configurations->findText(currentText);
     if (textIndex != -1)
         ui->configurations->setCurrentIndex(textIndex);
     updateButtons();
diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp
index a501a6c209f33f1859b0296ca6cb7e455daed15e..10cbbd9860ddbbb7db5997d23607b6ec52dadff8 100644
--- a/src/plugins/beautifier/uncrustify/uncrustify.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp
@@ -130,7 +130,8 @@ void Uncrustify::formatSelectedText()
         return;
     }
 
-    TextEditor::TextEditorWidget *widget = TextEditor::TextEditorWidget::currentTextEditorWidget();
+    const TextEditor::TextEditorWidget *widget
+            = TextEditor::TextEditorWidget::currentTextEditorWidget();
     if (!widget)
         return;