Designer: Modernize

* Remove QLatin1{Char|String}
* Use member initialization
* Use range-for
* Use nullptr

Change-Id: I51c24c0a2066861f59731585f19d61b28c76c0a3
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

28 files changed, 162 insertions, 185 deletions

diff --git a/src/plugins/designer/codemodelhelpers.cpp b/src/plugins/designer/codemodelhelpers.cpp
index 94555292f6..82bb28383d 100644
--- a/src/plugins/designer/codemodelhelpers.cpp
+++ b/src/plugins/designer/codemodelhelpers.cpp
@@ -129,7 +129,7 @@ bool navigateToSlot(const QString &uiFileName,
     SearchFunction searchFunc(setupUiC);
     const SearchFunction::FunctionList funcs = searchFunc(generatedHeaderDoc);
     if (funcs.size() != 1) {
-        *errorMessage = QString::fromLatin1("Internal error: The function \"%1\" could not be found in %2").arg(QLatin1String(setupUiC), generatedHeaderFile);
+        *errorMessage = QString::fromLatin1("Internal error: The function \"%1\" could not be found in %2").arg(setupUiC, generatedHeaderFile);
         return false;
     }
     return true;
diff --git a/src/plugins/designer/cpp/formclasswizard.cpp b/src/plugins/designer/cpp/formclasswizard.cpp
index c3183b2a94..88c1b5da4c 100644
--- a/src/plugins/designer/cpp/formclasswizard.cpp
+++ b/src/plugins/designer/cpp/formclasswizard.cpp
@@ -43,17 +43,17 @@ FormClassWizard::FormClassWizard()
 
 QString FormClassWizard::headerSuffix() const
 {
-    return preferredSuffix(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE));
+    return preferredSuffix(CppTools::Constants::CPP_HEADER_MIMETYPE);
 }
 
 QString FormClassWizard::sourceSuffix() const
 {
-    return preferredSuffix(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE));
+    return preferredSuffix(CppTools::Constants::CPP_SOURCE_MIMETYPE);
 }
 
 QString FormClassWizard::formSuffix() const
 {
-    return preferredSuffix(QLatin1String(Constants::FORM_MIMETYPE));
+    return preferredSuffix(Constants::FORM_MIMETYPE);
 }
 
 Core::BaseFileWizard *FormClassWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
@@ -69,7 +69,7 @@ Core::GeneratedFiles FormClassWizard::generateFiles(const QWizard *w, QString *e
     const Designer::FormClassWizardParameters params = wizardDialog->parameters();
 
     if (params.uiTemplate.isEmpty()) {
-        *errorMessage = QLatin1String("Internal error: FormClassWizard::generateFiles: empty template contents");
+        *errorMessage = "Internal error: FormClassWizard::generateFiles: empty template contents";
         return Core::GeneratedFiles();
     }
 
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp
index dee3843a41..95b099b4c4 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.cpp
+++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp
@@ -46,7 +46,8 @@ FormClassWizardDialog::FormClassWizardDialog(const Core::BaseFileWizardFactory *
     setPage(FormPageId, m_formPage);
     setPage(ClassPageId, m_classPage);
 
-    foreach (QWizardPage *p, extensionPages())
+    const auto pages = extensionPages();
+    for (QWizardPage *p : pages)
         addPage(p);
 }
 
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.h b/src/plugins/designer/cpp/formclasswizarddialog.h
index 9ce0ea0b59..69b3deff45 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.h
+++ b/src/plugins/designer/cpp/formclasswizarddialog.h
@@ -43,7 +43,7 @@ class FormClassWizardDialog : public Core::BaseFileWizard
 public:
     typedef QList<QWizardPage *> WizardPageList;
 
-    explicit FormClassWizardDialog(const Core::BaseFileWizardFactory *factory, QWidget *parent = 0);
+    explicit FormClassWizardDialog(const Core::BaseFileWizardFactory *factory, QWidget *parent = nullptr);
 
     QString path() const;
     void setPath(const QString &);
@@ -56,8 +56,8 @@ protected:
     void initializePage(int id);
 
 private:
-    FormTemplateWizardPage *m_formPage;
-    FormClassWizardPage *m_classPage;
+    FormTemplateWizardPage *m_formPage = nullptr;
+    FormClassWizardPage *m_classPage = nullptr;
     QString m_rawFormTemplate;
 };
 
diff --git a/src/plugins/designer/cpp/formclasswizardpage.cpp b/src/plugins/designer/cpp/formclasswizardpage.cpp
index 5a2d905b75..358db5a691 100644
--- a/src/plugins/designer/cpp/formclasswizardpage.cpp
+++ b/src/plugins/designer/cpp/formclasswizardpage.cpp
@@ -44,8 +44,7 @@ namespace Internal {
 
 FormClassWizardPage::FormClassWizardPage(QWidget * parent) :
     QWizardPage(parent),
-    m_ui(new Ui::FormClassWizardPage),
-    m_isValid(false)
+    m_ui(new Ui::FormClassWizardPage)
 {
     m_ui->setupUi(this);
 
@@ -69,9 +68,9 @@ FormClassWizardPage::~FormClassWizardPage()
 // Retrieve settings of CppTools plugin.
 bool FormClassWizardPage::lowercaseHeaderFiles()
 {
-    QString lowerCaseSettingsKey = QLatin1String(CppTools::Constants::CPPTOOLS_SETTINGSGROUP);
-    lowerCaseSettingsKey += QLatin1Char('/');
-    lowerCaseSettingsKey += QLatin1String(CppTools::Constants::LOWERCASE_CPPFILES_KEY);
+    QString lowerCaseSettingsKey = CppTools::Constants::CPPTOOLS_SETTINGSGROUP;
+    lowerCaseSettingsKey += '/';
+    lowerCaseSettingsKey += CppTools::Constants::LOWERCASE_CPPFILES_KEY;
     const bool lowerCaseDefault = CppTools::Constants::lowerCaseFilesDefault;
     return Core::ICore::settings()->value(lowerCaseSettingsKey, QVariant(lowerCaseDefault)).toBool();
 }
diff --git a/src/plugins/designer/cpp/formclasswizardpage.h b/src/plugins/designer/cpp/formclasswizardpage.h
index a789f41438..8acd421a7d 100644
--- a/src/plugins/designer/cpp/formclasswizardpage.h
+++ b/src/plugins/designer/cpp/formclasswizardpage.h
@@ -42,7 +42,7 @@ class FormClassWizardPage : public QWizardPage
     Q_OBJECT
 
 public:
-    explicit FormClassWizardPage(QWidget * parent = 0);
+    explicit FormClassWizardPage(QWidget *parent = nullptr);
     ~FormClassWizardPage();
 
     virtual bool isComplete () const;
@@ -66,8 +66,8 @@ private:
 private:
     void initFileGenerationSettings();
 
-    Ui::FormClassWizardPage *m_ui;
-    bool m_isValid;
+    Ui::FormClassWizardPage *m_ui = nullptr;
+    bool m_isValid = false;
 };
 
 } // namespace Internal
diff --git a/src/plugins/designer/designercontext.h b/src/plugins/designer/designercontext.h
index 11bd0afd8e..5802d2cf3b 100644
--- a/src/plugins/designer/designercontext.h
+++ b/src/plugins/designer/designercontext.h
@@ -35,7 +35,7 @@ class DesignerContext : public Core::IContext
 public:
     explicit DesignerContext(const Core::Context &contexts,
                              QWidget *widget,
-                             QObject *parent = 0);
+                             QObject *parent = nullptr);
 
     QString contextHelpId() const override;
 };
diff --git a/src/plugins/designer/editorwidget.cpp b/src/plugins/designer/editorwidget.cpp
index 4b64a09e04..e2b2ab9689 100644
--- a/src/plugins/designer/editorwidget.cpp
+++ b/src/plugins/designer/editorwidget.cpp
@@ -43,7 +43,7 @@ EditorWidget::EditorWidget(QWidget *parent) :
     Utils::FancyMainWindow(parent),
     m_stack(new FormEditorStack)
 {
-    setObjectName(QLatin1String("EditorWidget"));
+    setObjectName("EditorWidget");
     setCentralWidget(m_stack);
     setDocumentMode(true);
     setTabPosition(Qt::AllDockWidgetAreas, QTabWidget::South);
@@ -69,8 +69,8 @@ EditorWidget::EditorWidget(QWidget *parent) :
 void EditorWidget::resetToDefaultLayout()
 {
     setTrackingEnabled(false);
-    QList<QDockWidget *> dockWidgetList = dockWidgets();
-    foreach (QDockWidget *dockWidget, dockWidgetList) {
+    const QList<QDockWidget *> dockWidgetList = dockWidgets();
+    for (QDockWidget *dockWidget : dockWidgetList) {
         dockWidget->setFloating(false);
         removeDockWidget(dockWidget);
     }
@@ -84,7 +84,7 @@ void EditorWidget::resetToDefaultLayout()
     tabifyDockWidget(m_designerDockWidgets[ActionEditorSubWindow],
                      m_designerDockWidgets[SignalSlotEditorSubWindow]);
 
-    foreach (QDockWidget *dockWidget, dockWidgetList)
+    for (QDockWidget *dockWidget : dockWidgetList)
         dockWidget->show();
 
     setTrackingEnabled(true);
diff --git a/src/plugins/designer/editorwidget.h b/src/plugins/designer/editorwidget.h
index d102eb1851..35ccbb7ec6 100644
--- a/src/plugins/designer/editorwidget.h
+++ b/src/plugins/designer/editorwidget.h
@@ -51,7 +51,7 @@ class EditorWidget : public Utils::FancyMainWindow
     Q_OBJECT
 
 public:
-    explicit EditorWidget(QWidget *parent = 0);
+    explicit EditorWidget(QWidget *parent = nullptr);
 
     QDockWidget* const* designerDockWidgets() const;
 
@@ -66,7 +66,7 @@ public:
     void resetToDefaultLayout();
 
 private:
-    FormEditorStack *m_stack;
+    FormEditorStack *m_stack = nullptr;
     QDockWidget *m_designerDockWidgets[Designer::Constants::DesignerSubWindowCount];
 };
 
diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp
index a0fc7c47a2..7edde10be9 100644
--- a/src/plugins/designer/formeditorplugin.cpp
+++ b/src/plugins/designer/formeditorplugin.cpp
@@ -46,6 +46,7 @@
 #include <coreplugin/designmode.h>
 #include <cpptools/cpptoolsconstants.h>
 #include <projectexplorer/jsonwizard/jsonwizardfactory.h>
+#include <utils/asconst.h>
 #include <utils/mimetypes/mimedatabase.h>
 
 #include <QAction>
@@ -84,7 +85,7 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error)
     IWizardFactory::registerFactoryCreator(
                 []() -> QList<IWizardFactory *> {
                     IWizardFactory *wizard = new FormClassWizard;
-                    wizard->setCategory(QLatin1String(Core::Constants::WIZARD_CATEGORY_QT));
+                    wizard->setCategory(Core::Constants::WIZARD_CATEGORY_QT);
                     wizard->setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::WIZARD_TR_CATEGORY_QT));
                     wizard->setDisplayName(tr("Qt Designer Form Class"));
                     wizard->setIconText("ui/h");
@@ -104,10 +105,9 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error)
     const QString locale = ICore::userInterfaceLanguage();
     if (!locale.isEmpty()) {
         QTranslator *qtr = new QTranslator(this);
-        const QString &creatorTrPath =
-                ICore::resourcePath() + QLatin1String("/translations");
+        const QString &creatorTrPath = ICore::resourcePath() + "/translations";
         const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-        const QString &trFile = QLatin1String("designer_") + locale;
+        const QString &trFile = "designer_" + locale;
         if (qtr->load(trFile, qtTrPath) || qtr->load(trFile, creatorTrPath))
             QCoreApplication::installTranslator(qtr);
     }
@@ -164,19 +164,18 @@ static QString otherFile()
     // Determine potential suffixes of candidate files
     // 'ui' -> 'cpp', 'cpp/h' -> 'ui'.
     QStringList candidateSuffixes;
-    if (currentMimeType.matchesName(QLatin1String(FORM_MIMETYPE))) {
+    if (currentMimeType.matchesName(FORM_MIMETYPE)) {
         candidateSuffixes += Utils::mimeTypeForName(CppTools::Constants::CPP_SOURCE_MIMETYPE).suffixes();
-    } else if (currentMimeType.matchesName(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE))
-               || currentMimeType.matchesName(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE))) {
+    } else if (currentMimeType.matchesName(CppTools::Constants::CPP_SOURCE_MIMETYPE)
+               || currentMimeType.matchesName(CppTools::Constants::CPP_HEADER_MIMETYPE)) {
         candidateSuffixes += Utils::mimeTypeForName(FORM_MIMETYPE).suffixes();
     } else {
         return QString();
     }
     // Try to find existing file with desired suffix
     const QFileInfo currentFI(current);
-    const QString currentBaseName = currentFI.path() + QLatin1Char('/')
-            + currentFI.baseName() + QLatin1Char('.');
-    foreach (const QString &candidateSuffix, candidateSuffixes) {
+    const QString currentBaseName = currentFI.path() + '/' + currentFI.baseName() + '.';
+    for (const QString &candidateSuffix : Utils::asConst(candidateSuffixes)) {
         const QFileInfo fi(currentBaseName + candidateSuffix);
         if (fi.isFile())
             return fi.absoluteFilePath();
diff --git a/src/plugins/designer/formeditorplugin.h b/src/plugins/designer/formeditorplugin.h
index 5509c524e6..ba6702b4a0 100644
--- a/src/plugins/designer/formeditorplugin.h
+++ b/src/plugins/designer/formeditorplugin.h
@@ -44,7 +44,7 @@ public:
     ~FormEditorPlugin() override;
 
     //Plugin
-    bool initialize(const QStringList &arguments, QString *errorMessage = 0) override;
+    bool initialize(const QStringList &arguments, QString *errorMessage = nullptr) override;
     void extensionsInitialized() override;
 
 #ifdef WITH_TESTS
@@ -57,7 +57,7 @@ private:
     void switchSourceForm();
     void initializeTemplates();
 
-    QAction *m_actionSwitchSource;
+    QAction *m_actionSwitchSource = nullptr;
 };
 
 } // namespace Internal
diff --git a/src/plugins/designer/formeditorstack.cpp b/src/plugins/designer/formeditorstack.cpp
index 085a641409..44e14add3a 100644
--- a/src/plugins/designer/formeditorstack.cpp
+++ b/src/plugins/designer/formeditorstack.cpp
@@ -34,6 +34,7 @@
 #include <coreplugin/modemanager.h>
 #include <coreplugin/imode.h>
 
+#include <utils/asconst.h>
 #include <utils/qtcassert.h>
 
 #include <QDesignerFormWindowInterface>
@@ -48,10 +49,9 @@ namespace Designer {
 namespace Internal {
 
 FormEditorStack::FormEditorStack(QWidget *parent) :
-    QStackedWidget(parent),
-    m_designerCore(0)
+    QStackedWidget(parent)
 {
-    setObjectName(QLatin1String("FormEditorStack"));
+    setObjectName("FormEditorStack");
 }
 
 void FormEditorStack::add(const EditorData &data)
@@ -153,7 +153,7 @@ void FormEditorStack::updateFormWindowSelectionHandles()
     if (Designer::Constants::Internal::debug)
         qDebug() << "updateFormWindowSelectionHandles";
     QDesignerFormWindowInterface *activeFormWindow = m_designerCore->formWindowManager()->activeFormWindow();
-    foreach (const EditorData  &fdm, m_formEditors) {
+    for (const EditorData  &fdm : Utils::asConst(m_formEditors)) {
         const bool active = activeFormWindow == fdm.widgetHost->formWindow();
         fdm.widgetHost->updateFormWindowSelectionHandles(active);
     }
@@ -166,7 +166,7 @@ void FormEditorStack::formSizeChanged(int w, int h)
         qDebug() << Q_FUNC_INFO << w << h;
     if (const SharedTools::WidgetHost *wh = qobject_cast<const SharedTools::WidgetHost *>(sender())) {
         wh->formWindow()->setDirty(true);
-        static const QString geometry = QLatin1String("geometry");
+        static const QString geometry = "geometry";
         m_designerCore->propertyEditor()->setPropertyValue(geometry, QRect(0,0,w,h) );
     }
 }
@@ -184,7 +184,7 @@ void FormEditorStack::modeAboutToChange(Core::Id mode)
 
     // Sync the editor when entering edit mode
     if (mode == Core::Constants::MODE_EDIT)
-        foreach (const EditorData &data, m_formEditors)
+        for (const EditorData &data : Utils::asConst(m_formEditors))
             data.formWindowEditor->formWindowFile()->syncXmlFromFormWindow();
 }
 
diff --git a/src/plugins/designer/formeditorstack.h b/src/plugins/designer/formeditorstack.h
index caf8bf5ec6..bed1de4d2b 100644
--- a/src/plugins/designer/formeditorstack.h
+++ b/src/plugins/designer/formeditorstack.h
@@ -52,7 +52,7 @@ class FormEditorStack : public QStackedWidget
     Q_OBJECT
 
 public:
-    explicit FormEditorStack(QWidget *parent = 0);
+    explicit FormEditorStack(QWidget *parent = nullptr);
 
     void add(const EditorData &d);
 
@@ -73,7 +73,7 @@ private:
     inline int indexOfFormEditor(const QObject *xmlEditor) const;
 
     QList<EditorData> m_formEditors;
-    QDesignerFormEditorInterface *m_designerCore;
+    QDesignerFormEditorInterface *m_designerCore = nullptr;
 };
 
 } // namespace Internal
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index edafb26f07..e526c2f937 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -191,60 +191,45 @@ public:
     IEditor *createEditor();
 
 public:
-    QDesignerFormEditorInterface *m_formeditor;
-    QtCreatorIntegration *m_integration;
-    QDesignerFormWindowManagerInterface *m_fwm;
+    QDesignerFormEditorInterface *m_formeditor = nullptr;
+    QtCreatorIntegration *m_integration = nullptr;
+    QDesignerFormWindowManagerInterface *m_fwm = nullptr;
     FormEditorW::InitializationStage m_initStage;
 
     QWidget *m_designerSubWindows[DesignerSubWindowCount];
 
-    QAction *m_lockAction;
-    QAction *m_resetLayoutAction;
+    QAction *m_lockAction = nullptr;
+    QAction *m_resetLayoutAction = nullptr;
 
     QList<IOptionsPage *> m_settingsPages;
-    QActionGroup *m_actionGroupEditMode;
-    QAction *m_actionPrint;
-    QAction *m_actionPreview;
-    QActionGroup *m_actionGroupPreviewInStyle;
-    QMenu *m_previewInStyleMenu;
-    QAction *m_actionAboutPlugins;
-
-    DesignerContext *m_context;
+    QActionGroup *m_actionGroupEditMode = nullptr;
+    QAction *m_actionPrint = nullptr;
+    QAction *m_actionPreview = nullptr;
+    QActionGroup *m_actionGroupPreviewInStyle = nullptr;
+    QMenu *m_previewInStyleMenu = nullptr;
+    QAction *m_actionAboutPlugins = nullptr;
+
+    DesignerContext *m_context = nullptr;
     Context m_contexts;
 
     QList<Id> m_toolActionIds;
-    QWidget *m_modeWidget;
-    EditorWidget *m_editorWidget;
-    DesignMode *m_designMode;
+    QWidget *m_modeWidget = nullptr;
+    EditorWidget *m_editorWidget = nullptr;
+    DesignMode *m_designMode = nullptr;
 
-    QWidget *m_editorToolBar;
-    EditorToolBar *m_toolBar;
+    QWidget *m_editorToolBar = nullptr;
+    EditorToolBar *m_toolBar = nullptr;
 
     QMap<Command *, QAction *> m_commandToDesignerAction;
-    FormWindowEditorFactory *m_xmlEditorFactory;
+    FormWindowEditorFactory *m_xmlEditorFactory = nullptr;
 };
 
-static FormEditorData *d = 0;
-static FormEditorW *m_instance = 0;
+static FormEditorData *d = nullptr;
+static FormEditorW *m_instance = nullptr;
 
 FormEditorData::FormEditorData() :
     m_formeditor(QDesignerComponents::createFormEditor(0)),
-    m_integration(0),
-    m_fwm(0),
-    m_initStage(FormEditorW::RegisterPlugins),
-    m_actionGroupEditMode(0),
-    m_actionPrint(0),
-    m_actionPreview(0),
-    m_actionGroupPreviewInStyle(0),
-    m_previewInStyleMenu(0),
-    m_actionAboutPlugins(0),
-    m_context(0),
-    m_modeWidget(0),
-    m_editorWidget(0),
-    m_designMode(0),
-    m_editorToolBar(0),
-    m_toolBar(0),
-    m_xmlEditorFactory(0)
+    m_initStage(FormEditorW::RegisterPlugins)
 {
     if (Designer::Constants::Internal::debug)
         qDebug() << Q_FUNC_INFO;
@@ -264,7 +249,8 @@ FormEditorData::FormEditorData() :
 
     setupActions();
 
-    foreach (QDesignerOptionsPageInterface *designerPage, m_formeditor->optionsPages()) {
+    const auto optionPages = m_formeditor->optionsPages();
+    for (QDesignerOptionsPageInterface *designerPage : optionPages) {
         SettingsPage *settingsPage = new SettingsPage(designerPage);
         m_settingsPages.append(settingsPage);
     }
@@ -293,13 +279,13 @@ FormEditorData::~FormEditorData()
         ICore::removeContextObject(m_context);
     if (m_initStage == FormEditorW::FullyInitialized) {
         QSettings *s = ICore::settings();
-        s->beginGroup(QLatin1String(settingsGroupC));
+        s->beginGroup(settingsGroupC);
         m_editorWidget->saveSettings(s);
         s->endGroup();
 
         m_designMode->unregisterDesignWidget(m_modeWidget);
         delete m_modeWidget;
-        m_modeWidget = 0;
+        m_modeWidget = nullptr;
     }
 
     delete m_formeditor;
@@ -308,7 +294,7 @@ FormEditorData::~FormEditorData()
     delete m_integration;
 
     delete m_xmlEditorFactory ;
-    d = 0;
+    d = nullptr;
 }
 
 // Add an actioon to toggle the view state of a dock window
@@ -385,9 +371,8 @@ void FormEditorData::fullInit()
     /**
      * This will initialize our TabOrder, Signals and slots and Buddy editors.
      */
-    QList<QObject*> plugins = QPluginLoader::staticInstances();
-    plugins += m_formeditor->pluginInstances();
-    foreach (QObject *plugin, plugins) {
+    const QList<QObject *> plugins = QPluginLoader::staticInstances() + m_formeditor->pluginInstances();
+    for (QObject *plugin : plugins) {
         if (QDesignerFormEditorPluginInterface *formEditorPlugin = qobject_cast<QDesignerFormEditorPluginInterface*>(plugin)) {
             if (!formEditorPlugin->isInitialized())
                 formEditorPlugin->initialize(m_formeditor);
@@ -402,15 +387,16 @@ void FormEditorData::fullInit()
         delete initTime;
     }
 
-    QObject::connect(EditorManager::instance(), &EditorManager::editorsClosed, [this] (QList<IEditor*> editors) {
-        foreach (IEditor *editor, editors)
+    QObject::connect(EditorManager::instance(), &EditorManager::editorsClosed,
+                     [this] (const QList<IEditor *> editors) {
+        for (IEditor *editor : editors)
             m_editorWidget->removeFormWindowEditor(editor);
     });
 
     // Nest toolbar and editor widget
     m_editorWidget = new EditorWidget;
     QSettings *settings = ICore::settings();
-    settings->beginGroup(QLatin1String(settingsGroupC));
+    settings->beginGroup(settingsGroupC);
     m_editorWidget->restoreSettings(settings);
     settings->endGroup();
 
@@ -422,7 +408,7 @@ void FormEditorData::fullInit()
 
     m_designMode = DesignMode::instance();
     m_modeWidget = new QWidget;
-    m_modeWidget->setObjectName(QLatin1String("DesignerModeWidget"));
+    m_modeWidget->setObjectName("DesignerModeWidget");
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setMargin(0);
     layout->setSpacing(0);
@@ -432,7 +418,7 @@ void FormEditorData::fullInit()
     MiniSplitter *splitter = new MiniSplitter(Qt::Vertical);
     splitter->addWidget(m_editorWidget);
     QWidget *outputPane = new OutputPanePlaceHolder(m_designMode->id(), splitter);
-    outputPane->setObjectName(QLatin1String("DesignerOutputPanePlaceHolder"));
+    outputPane->setObjectName("DesignerOutputPanePlaceHolder");
     splitter->addWidget(outputPane);
     layout->addWidget(splitter);
     m_modeWidget->setLayout(layout);
@@ -442,7 +428,7 @@ void FormEditorData::fullInit()
     m_context = new DesignerContext(designerContexts, m_modeWidget, m_instance);
     ICore::addContextObject(m_context);
 
-    m_designMode->registerDesignWidget(m_modeWidget, QStringList(QLatin1String(FORM_MIMETYPE)), m_contexts);
+    m_designMode->registerDesignWidget(m_modeWidget, QStringList(FORM_MIMETYPE), m_contexts);
 
     setupViewActions();
 
@@ -455,30 +441,30 @@ void FormEditorData::initDesignerSubWindows()
 
     QDesignerWidgetBoxInterface *wb = QDesignerComponents::createWidgetBox(m_formeditor, 0);
     wb->setWindowTitle(tr("Widget Box"));
-    wb->setObjectName(QLatin1String("WidgetBox"));
+    wb->setObjectName("WidgetBox");
     m_formeditor->setWidgetBox(wb);
     m_designerSubWindows[WidgetBoxSubWindow] = wb;
 
     QDesignerObjectInspectorInterface *oi = QDesignerComponents::createObjectInspector(m_formeditor, 0);
     oi->setWindowTitle(tr("Object Inspector"));
-    oi->setObjectName(QLatin1String("ObjectInspector"));
+    oi->setObjectName("ObjectInspector");
     m_formeditor->setObjectInspector(oi);
     m_designerSubWindows[ObjectInspectorSubWindow] = oi;
 
     QDesignerPropertyEditorInterface *pe = QDesignerComponents::createPropertyEditor(m_formeditor, 0);
     pe->setWindowTitle(tr("Property Editor"));
-    pe->setObjectName(QLatin1String("PropertyEditor"));
+    pe->setObjectName("PropertyEditor");
     m_formeditor->setPropertyEditor(pe);
     m_designerSubWindows[PropertyEditorSubWindow] = pe;
 
     QWidget *se = QDesignerComponents::createSignalSlotEditor(m_formeditor, 0);
     se->setWindowTitle(tr("Signals && Slots Editor"));
-    se->setObjectName(QLatin1String("SignalsAndSlotsEditor"));
+    se->setObjectName("SignalsAndSlotsEditor");
     m_designerSubWindows[SignalSlotEditorSubWindow] = se;
 
     QDesignerActionEditorInterface *ae = QDesignerComponents::createActionEditor(m_formeditor, 0);
     ae->setWindowTitle(tr("Action Editor"));
-    ae->setObjectName(QLatin1String("ActionEditor"));
+    ae->setObjectName("ActionEditor");
     m_formeditor->setActionEditor(ae);
     m_designerSubWindows[ActionEditorSubWindow] = ae;
     m_initStage = FormEditorW::SubwindowsInitialized;
@@ -507,9 +493,9 @@ void FormEditorW::ensureInitStage(InitializationStage s)
 void FormEditorW::deleteInstance()
 {
     delete d;
-    d = 0;
+    d = nullptr;
     delete m_instance;
-    m_instance = 0;
+    m_instance = nullptr;
 }
 
 IEditor *FormEditorW::createEditor()
@@ -555,22 +541,22 @@ void FormEditorData::setupActions()
     m_toolActionIds.push_back("FormEditor.WidgetEditor");
     createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
                          tr("Edit Widgets"), m_toolActionIds.back(),
-                         EditModeWidgetEditor, QLatin1String("widgettool.png"), tr("F3"));
+                         EditModeWidgetEditor, "widgettool.png", tr("F3"));
 
     m_toolActionIds.push_back("FormEditor.SignalsSlotsEditor");
     createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
                          tr("Edit Signals/Slots"), m_toolActionIds.back(),
-                         EditModeSignalsSlotEditor, QLatin1String("signalslottool.png"), tr("F4"));
+                         EditModeSignalsSlotEditor, "signalslottool.png", tr("F4"));
 
     m_toolActionIds.push_back("FormEditor.BuddyEditor");
     createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
                          tr("Edit Buddies"), m_toolActionIds.back(),
-                         EditModeBuddyEditor, QLatin1String("buddytool.png"));
+                         EditModeBuddyEditor, "buddytool.png");
 
     m_toolActionIds.push_back("FormEditor.TabOrderEditor");
     createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
                          tr("Edit Tab Order"),  m_toolActionIds.back(),
-                         EditModeTabOrderEditor, QLatin1String("tabordertool.png"));
+                         EditModeTabOrderEditor, "tabordertool.png");
 
     //tool actions
     m_toolActionIds.push_back("FormEditor.LayoutHorizontally");
@@ -678,7 +664,7 @@ QToolBar *FormEditorData::createEditorToolBar() const
 
 ActionContainer *FormEditorData::createPreviewStyleMenu(QActionGroup *actionGroup)
 {
-    const QString menuId = QLatin1String(M_FORMEDITOR_PREVIEW);
+    const QString menuId = M_FORMEDITOR_PREVIEW;
     ActionContainer *menuPreviewStyle = ActionManager::createMenu(M_FORMEDITOR_PREVIEW);
     menuPreviewStyle->menu()->setTitle(tr("Preview in"));
 
@@ -688,10 +674,10 @@ ActionContainer *FormEditorData::createPreviewStyleMenu(QActionGroup *actionGrou
     // in the configuration dialog.
     const QList<QAction*> actions = actionGroup->actions();
 
-    const QString deviceProfilePrefix = QLatin1String("DeviceProfile");
-    const QChar dot = QLatin1Char('.');
+    const QString deviceProfilePrefix = "DeviceProfile";
+    const QChar dot = '.';
 
-    foreach (QAction* a, actions) {
+    for (QAction *a : actions) {
         QString name = menuId;
         name += dot;
         const QVariant data = a->data();
@@ -720,7 +706,7 @@ void FormEditorData::setPreviewMenuEnabled(bool e)
 
 void FormEditorData::saveSettings(QSettings *s)
 {
-    s->beginGroup(QLatin1String(settingsGroupC));
+    s->beginGroup(settingsGroupC);
     m_editorWidget->saveSettings(s);
     s->endGroup();
 }
diff --git a/src/plugins/designer/formtemplatewizardpage.cpp b/src/plugins/designer/formtemplatewizardpage.cpp
index 7336ddc159..ce5f3ddb8c 100644
--- a/src/plugins/designer/formtemplatewizardpage.cpp
+++ b/src/plugins/designer/formtemplatewizardpage.cpp
@@ -49,7 +49,7 @@ namespace Internal {
 
 FormPageFactory::FormPageFactory()
 {
-    setTypeIdsSuffix(QLatin1String("Form"));
+    setTypeIdsSuffix("Form");
 }
 
 Utils::WizardPage *FormPageFactory::create(ProjectExplorer::JsonWizard *wizard, Core::Id typeId,
@@ -117,14 +117,14 @@ bool FormTemplateWizardPage::validatePage()
         QMessageBox::critical(this, tr("%1 - Error").arg(title()), errorMessage);
         return false;
     }
-    wizard()->setProperty("FormContents", m_templateContents.split(QLatin1Char('\n')));
+    wizard()->setProperty("FormContents", m_templateContents.split('\n'));
     return true;
 }
 
 QString FormTemplateWizardPage::stripNamespaces(const QString &className)
 {
     QString rc = className;
-    const int namespaceIndex = rc.lastIndexOf(QLatin1String("::"));
+    const int namespaceIndex = rc.lastIndexOf("::");
     if (namespaceIndex != -1)
         rc.remove(0, namespaceIndex + 2);
     return rc;
diff --git a/src/plugins/designer/formtemplatewizardpage.h b/src/plugins/designer/formtemplatewizardpage.h
index 7921148dca..6fb665c4a6 100644
--- a/src/plugins/designer/formtemplatewizardpage.h
+++ b/src/plugins/designer/formtemplatewizardpage.h
@@ -56,7 +56,7 @@ class FormTemplateWizardPage : public Utils::WizardPage
     Q_OBJECT
 
 public:
-    explicit FormTemplateWizardPage(QWidget * parent = 0);
+    explicit FormTemplateWizardPage(QWidget *parent = nullptr);
 
     bool isComplete () const override;
     bool validatePage() override;
@@ -72,8 +72,8 @@ private:
     void slotCurrentTemplateChanged(bool);
 
     QString m_templateContents;
-    QDesignerNewFormWidgetInterface *m_newFormWidget;
-    bool m_templateSelected;
+    QDesignerNewFormWidgetInterface *m_newFormWidget = nullptr;
+    bool m_templateSelected = false;
 };
 
 } // namespace Internal
diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp
index e5b6a313be..a35e8e14f2 100644
--- a/src/plugins/designer/formwindowfile.cpp
+++ b/src/plugins/designer/formwindowfile.cpp
@@ -49,7 +49,7 @@ namespace Internal {
 FormWindowFile::FormWindowFile(QDesignerFormWindowInterface *form, QObject *parent)
   : m_formWindow(form)
 {
-    setMimeType(QLatin1String(Designer::Constants::FORM_MIMETYPE));
+    setMimeType(Designer::Constants::FORM_MIMETYPE);
     setParent(parent);
     setId(Core::Id(Designer::Constants::K_DESIGNER_XML_EDITOR_ID));
     // Designer needs UTF-8 regardless of settings.
diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h
index f14a63d780..d9129c88b9 100644
--- a/src/plugins/designer/formwindowfile.h
+++ b/src/plugins/designer/formwindowfile.h
@@ -44,7 +44,7 @@ class FormWindowFile : public TextEditor::TextDocument
     Q_OBJECT
 
 public:
-    explicit FormWindowFile(QDesignerFormWindowInterface *form, QObject *parent = 0);
+    explicit FormWindowFile(QDesignerFormWindowInterface *form, QObject *parent = nullptr);
     ~FormWindowFile() override { }
 
     // IDocument
diff --git a/src/plugins/designer/gotoslot_test.cpp b/src/plugins/designer/gotoslot_test.cpp
index 5bb03dda15..46198429b7 100644
--- a/src/plugins/designer/gotoslot_test.cpp
+++ b/src/plugins/designer/gotoslot_test.cpp
@@ -36,6 +36,7 @@
 
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/Overview.h>
+#include <utils/asconst.h>
 #include <utils/fileutils.h>
 
 #include <QDesignerFormEditorInterface>
@@ -120,7 +121,7 @@ protected:
     {
         QString declaration = m_overview.prettyName(symbol->name());
         if (!m_currentClass.isEmpty())
-            declaration = m_currentClass + QLatin1String("::") + declaration;
+            declaration = m_currentClass + "::" + declaration;
         if (m_referenceFunction == declaration)
             m_result = true;
         return false;
@@ -153,7 +154,7 @@ public:
         QCOMPARE(files.size(), 3);
 
         QList<TextEditor::BaseTextEditor *> editors;
-        foreach (const QString &file, files) {
+        for (const QString &file : files) {
             IEditor *editor = EditorManager::openEditor(file);
             TextEditor::BaseTextEditor *e = qobject_cast<TextEditor::BaseTextEditor *>(editor);
             QVERIFY(e);
@@ -170,14 +171,13 @@ public:
         // Execute "Go To Slot"
         QDesignerIntegrationInterface *integration = FormEditorW::designerEditor()->integration();
         QVERIFY(integration);
-        integration->emitNavigateToSlot(QLatin1String("pushButton"), QLatin1String("clicked()"),
-                                        QStringList());
+        integration->emitNavigateToSlot("pushButton", "clicked()", QStringList());
 
         QCOMPARE(EditorManager::currentDocument()->filePath().toString(), cppFile);
         QVERIFY(EditorManager::currentDocument()->isModified());
 
         // Wait for updated documents
-        foreach (TextEditor::BaseTextEditor *editor, editors) {
+        for (TextEditor::BaseTextEditor *editor : Utils::asConst(editors)) {
             const QString filePath = editor->document()->filePath().toString();
             if (auto parser = BuiltinEditorDocumentParser::get(filePath)) {
                 forever {
@@ -201,10 +201,8 @@ public:
         const Document::Ptr hDocument = hDocumentParser->document();
         QVERIFY(checkDiagsnosticMessages(hDocument));
 
-        QVERIFY(documentContainsFunctionDefinition(cppDocument,
-            QLatin1String("Form::on_pushButton_clicked")));
-        QVERIFY(documentContainsMemberFunctionDeclaration(hDocument,
-            QLatin1String("Form::on_pushButton_clicked")));
+        QVERIFY(documentContainsFunctionDefinition(cppDocument, "Form::on_pushButton_clicked"));
+        QVERIFY(documentContainsMemberFunctionDeclaration(hDocument, "Form::on_pushButton_clicked"));
     }
 
     static bool checkDiagsnosticMessages(const Document::Ptr &document)
@@ -217,7 +215,8 @@ public:
         const QStringList ignoreList = QStringList({"ui_form.h: No such file or directory",
                                                     "QWidget: No such file or directory"});
         QList<Document::DiagnosticMessage> cleanedDiagnosticMessages;
-        foreach (const Document::DiagnosticMessage &message, document->diagnosticMessages()) {
+        const auto diagnosticMessages = document->diagnosticMessages();
+        for (const Document::DiagnosticMessage &message : diagnosticMessages) {
             if (!ignoreList.contains(message.text()))
                 cleanedDiagnosticMessages << message;
         }
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 1f6bd925b7..efd35e4287 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -43,6 +43,7 @@
 #include <texteditor/textdocument.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
+#include <utils/asconst.h>
 #include <utils/mimetypes/mimedatabase.h>
 #include <utils/qtcassert.h>
 
@@ -66,8 +67,8 @@ using namespace ProjectExplorer;
 static QString msgClassNotFound(const QString &uiClassName, const QList<Document::Ptr> &docList)
 {
     QString files;
-    foreach (const Document::Ptr &doc, docList) {
-        files += QLatin1Char('\n');
+    for (const Document::Ptr &doc : docList) {
+        files += '\n';
         files += QDir::toNativeSeparators(doc->fileName());
     }
     return QtCreatorIntegration::tr(
@@ -121,10 +122,10 @@ static QList<Document::Ptr> findDocumentsIncluding(const Snapshot &docTable,
                                                    const QString &fileName, bool checkFileNameOnly)
 {
     QList<Document::Ptr> docList;
-    foreach (const Document::Ptr &doc, docTable) { // we go through all documents
+    for (const Document::Ptr &doc : docTable) { // we go through all documents
         const QList<Document::Include> includes = doc->resolvedIncludes()
             + doc->unresolvedIncludes();
-        foreach (const Document::Include &include, includes) {
+        for (const Document::Include &include : includes) {
             if (checkFileNameOnly) {
                 const QFileInfo fi(include.unresolvedFileName());
                 if (fi.fileName() == fileName) { // we are only interested in docs which includes fileName only
@@ -204,7 +205,7 @@ static const Class *findClass(const Namespace *parentNameSpace, const LookupCont
             if (const Namespace *ns = sym->asNamespace()) {
                 QString tempNS = *namespaceName;
                 tempNS += o.prettyName(ns->name());
-                tempNS += QLatin1String("::");
+                tempNS += "::";
                 if (const Class *cl = findClass(ns, context, className, &tempNS)) {
                     *namespaceName = tempNS;
                     return cl;
@@ -227,15 +228,15 @@ static Function *findDeclaration(const Class *cl, const QString &functionName)
             if (Function *fun = decl->type()->asFunctionType()) {
                 // Format signature
                 QString memberFunction = overview.prettyName(fun->name());
-                memberFunction += QLatin1Char('(');
+                memberFunction += '(';
                 const uint aCount = fun->argumentCount();
                 for (uint i = 0; i < aCount; i++) { // we build argument types string
                     const Argument *arg = fun->argumentAt(i)->asArgument();
                     if (i > 0)
-                        memberFunction += QLatin1Char(',');
+                        memberFunction += ',';
                     memberFunction += overview.prettyType(arg->type());
                 }
-                memberFunction += QLatin1Char(')');
+                memberFunction += ')';
                 // we compare normalized signatures
                 memberFunction = QString::fromUtf8(QMetaObject::normalizedSignature(memberFunction.toUtf8()));
                 if (memberFunction == funName) // we match function names and argument lists
@@ -273,9 +274,7 @@ static void addDeclaration(const Snapshot &snapshot,
                            const Class *cl,
                            const QString &functionName)
 {
-    QString declaration = QLatin1String("void ");
-    declaration += functionName;
-    declaration += QLatin1String(";\n");
+    const QString declaration = "void " + functionName + ";\n";
 
     CppTools::CppRefactoringChanges refactoring(snapshot);
     CppTools::InsertionPointLocator find(refactoring);
@@ -303,13 +302,8 @@ static Document::Ptr addDefinition(const Snapshot &docTable,
                                    const QString &functionName,
                                    int *line)
 {
-    QString definition = QLatin1String("\nvoid ");
-    definition += className;
-    definition += QLatin1String("::");
-    definition += functionName;
-    definition += QLatin1String("\n{\n");
-    definition += QString(indentation, QLatin1Char(' '));
-    definition += QLatin1String("\n}\n");
+    const QString definition = "\nvoid " + className + "::" + functionName
+            + "\n{\n" + QString(indentation, ' ') + "\n}\n";
 
     // we find all documents which include headerFileName
     const QList<Document::Ptr> docList = findDocumentsIncluding(docTable, headerFileName, false);
@@ -318,7 +312,7 @@ static Document::Ptr addDefinition(const Snapshot &docTable,
 
     QFileInfo headerFI(headerFileName);
     const QString headerBaseName = headerFI.completeBaseName();
-    foreach (const Document::Ptr &doc, docList) {
+    for (const Document::Ptr &doc : docList) {
         const QFileInfo sourceFI(doc->fileName());
         // we take only those documents which have the same filename
         if (headerBaseName == sourceFI.baseName()) {
@@ -347,9 +341,7 @@ static Document::Ptr addDefinition(const Snapshot &docTable,
 
 static QString addConstRefIfNeeded(const QString &argument)
 {
-    if (argument.startsWith(QLatin1String("const "))
-            || argument.endsWith(QLatin1Char('&'))
-            || argument.endsWith(QLatin1Char('*')))
+    if (argument.startsWith("const ") || argument.endsWith('&') || argument.endsWith('*'))
         return argument;
 
     // for those types we don't want to add "const &"
@@ -359,10 +351,10 @@ static QString addConstRefIfNeeded(const QString &argument)
 
     for (int i = 0; i < nonConstRefs.count(); i++) {
         const QString nonConstRef = nonConstRefs.at(i);
-        if (argument == nonConstRef || argument.startsWith(nonConstRef + QLatin1Char(' ')))
+        if (argument == nonConstRef || argument.startsWith(nonConstRef + ' '))
             return argument;
     }
-    return QLatin1String("const ") + argument + QLatin1Char('&');
+    return "const " + argument + '&';
 }
 
 static QString formatArgument(const QString &argument)
@@ -372,8 +364,8 @@ static QString formatArgument(const QString &argument)
     while (i > 0) { // from the end of the "argument" string
         i--;
         const QChar c = argument.at(i); // take the char
-        if (c != QLatin1Char('*') && c != QLatin1Char('&')) { // if it's not the * or &
-            formattedArgument.insert(i + 1, QLatin1Char(' ')); // insert space after that char or just append space (to separate it from the parameter name)
+        if (c != '*' && c != '&') { // if it's not the * or &
+            formattedArgument.insert(i + 1, ' '); // insert space after that char or just append space (to separate it from the parameter name)
             break;
         }
     }
@@ -384,25 +376,25 @@ static QString formatArgument(const QString &argument)
 // "void foo(bool checked)"
 static QString addParameterNames(const QString &functionSignature, const QStringList &parameterNames)
 {
-    const int firstParen = functionSignature.indexOf(QLatin1Char('('));
+    const int firstParen = functionSignature.indexOf('(');
     QString functionName = functionSignature.left(firstParen + 1);
     QString argumentsString = functionSignature.mid(firstParen + 1);
-    const int lastParen = argumentsString.lastIndexOf(QLatin1Char(')'));
+    const int lastParen = argumentsString.lastIndexOf(')');
     if (lastParen != -1)
         argumentsString.truncate(lastParen);
-    const QStringList arguments = argumentsString.split(QLatin1Char(','), QString::SkipEmptyParts);
+    const QStringList arguments = argumentsString.split(',', QString::SkipEmptyParts);
     const int pCount = parameterNames.count();
     const int aCount = arguments.count();
     for (int i = 0; i < aCount; ++i) {
         if (i > 0)
-            functionName += QLatin1String(", ");
+            functionName += ", ";
         const QString argument = addConstRefIfNeeded(arguments.at(i));
         functionName += formatArgument(argument);
         if (i < pCount) {
             // prepare parameterName
             QString parameterName = parameterNames.at(i);
             if (parameterName.isEmpty()) {
-                const QString generatedName = QLatin1String("arg") + QString::number(i + 1);
+                const QString generatedName = "arg" + QString::number(i + 1);
                 if (!parameterNames.contains(generatedName))
                     parameterName = generatedName;
             }
@@ -411,7 +403,7 @@ static QString addParameterNames(const QString &functionSignature, const QString
                 functionName += parameterName;
         }
     }
-    functionName += QLatin1Char(')');
+    functionName += ')';
     return functionName;
 }
 
@@ -435,7 +427,8 @@ static ClassDocumentPtrPair
     if (maxIncludeDepth) {
         // Check the includes
         const unsigned recursionMaxIncludeDepth = maxIncludeDepth - 1u;
-        foreach (const QString &include, doc->includedFiles()) {
+        const auto includedFiles = doc->includedFiles();
+        for (const QString &include : includedFiles) {
             const Snapshot::const_iterator it = docTable.find(include);
             if (it != docTable.end()) {
                 const Document::Ptr includeDoc = it.value();
@@ -463,9 +456,9 @@ void QtCreatorIntegration::slotNavigateToSlot(const QString &objectName, const Q
 
 static inline QString uiClassName(QString formObjectName)
 {
-    const int indexOfScope = formObjectName.lastIndexOf(QLatin1String("::"));
+    const int indexOfScope = formObjectName.lastIndexOf("::");
     const int uiNameSpaceInsertionPos = indexOfScope >= 0 ? indexOfScope + 2 : 0;
-    formObjectName.insert(uiNameSpaceInsertionPos, QLatin1String("Ui::"));
+    formObjectName.insert(uiNameSpaceInsertionPos, "Ui::");
     return formObjectName;
 }
 
@@ -510,7 +503,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
     // So we should somehow get that info from project manager (?)
     const QFileInfo fi = currentUiFile.toFileInfo();
     const QString uiFolder = fi.absolutePath();
-    const QString uicedName = QLatin1String("ui_") + fi.completeBaseName() + QLatin1String(".h");
+    const QString uicedName = "ui_" + fi.completeBaseName() + ".h";
 
     // Retrieve code model snapshot restricted to project of ui file or the working copy.
     Snapshot docTable = CppTools::CppModelManager::instance()->snapshot();
@@ -542,7 +535,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
     // first in case there are project subdirectories that contain identical file names.
     const QList<Document::Ptr> docList = findDocumentsIncluding(docTable, uicedName, true); // change to false when we know the absolute path to generated ui_<>.h file
     DocumentMap docMap;
-    foreach (const Document::Ptr &d, docList) {
+    for (const Document::Ptr &d : docList) {
         const QFileInfo docFi(d->fileName());
         docMap.insert(qAbs(docFi.absolutePath().compare(uiFolder, Qt::CaseInsensitive)), d);
     }
@@ -567,7 +560,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
     const Class *cl = 0;
     Document::Ptr doc;
 
-    foreach (const Document::Ptr &d, docMap) {
+    for (const Document::Ptr &d : Utils::asConst(docMap)) {
         LookupContext context(d, docTable);
         const ClassDocumentPtrPair cd = findClassRecursively(context, uiClass, 1u , &namespaceName);
         if (cd.first) {
@@ -586,7 +579,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
     if (Designer::Constants::Internal::debug)
         qDebug() << "Found class  " << className << doc->fileName();
 
-    const QString functionName = QLatin1String("on_") + objectName + QLatin1Char('_') + signalSignature;
+    const QString functionName = "on_" + objectName + '_' + signalSignature;
     const QString functionNameWithParameterNames = addParameterNames(functionName, parameterNames);
 
     if (Designer::Constants::Internal::debug)
diff --git a/src/plugins/designer/qtcreatorintegration.h b/src/plugins/designer/qtcreatorintegration.h
index 3b1f25c0f9..14a66bcc1f 100644
--- a/src/plugins/designer/qtcreatorintegration.h
+++ b/src/plugins/designer/qtcreatorintegration.h
@@ -38,7 +38,7 @@ class QtCreatorIntegration : public QDesignerIntegration
     Q_OBJECT
 
 public:
-    explicit QtCreatorIntegration(QDesignerFormEditorInterface *core, QObject *parent = 0);
+    explicit QtCreatorIntegration(QDesignerFormEditorInterface *core, QObject *parent = nullptr);
 
     QWidget *containerWindow(QWidget *widget) const override;
 
diff --git a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
index 52eac27273..0769e55237 100644
--- a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
+++ b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
@@ -69,7 +69,7 @@ bool QtDesignerFormClassCodeGenerator::generateCpp(const FormClassWizardParamete
     QtSupport::CodeGenSettings generationParameters;
     generationParameters.fromSettings(Core::ICore::settings());
 
-    const QString indent = QString(indentation, QLatin1Char(' '));
+    const QString indent = QString(indentation, ' ');
     QString formBaseClass;
     QString uiClassName;
 
@@ -79,11 +79,11 @@ bool QtDesignerFormClassCodeGenerator::generateCpp(const FormClassWizardParamete
     }
 
     // Build the ui class (Ui::Foo) name relative to the namespace (which is the same):
-    const QString colonColon = QLatin1String("::");
+    const QString colonColon = "::";
     const int lastSeparator = uiClassName.lastIndexOf(colonColon);
     if (lastSeparator != -1)
         uiClassName.remove(0, lastSeparator + colonColon.size());
-    uiClassName.insert(0, QLatin1String(uiNamespaceC) + colonColon);
+    uiClassName.insert(0, uiNamespaceC + colonColon);
 
     // Do we have namespaces?
     QStringList namespaceList = parameters.className.split(colonColon);
@@ -99,9 +99,7 @@ bool QtDesignerFormClassCodeGenerator::generateCpp(const FormClassWizardParamete
     // Include guards
     const QString guard = Utils::headerGuard(parameters.headerFile, namespaceList);
 
-    QString uiInclude = QLatin1String("ui_");
-    uiInclude += QFileInfo(parameters.uiFile).completeBaseName();
-    uiInclude += QLatin1String(".h");
+    const QString uiInclude = "ui_" + QFileInfo(parameters.uiFile).completeBaseName() + ".h";
 
     // 1) Header file
     QTextStream headerStr(header);
@@ -114,16 +112,16 @@ bool QtDesignerFormClassCodeGenerator::generateCpp(const FormClassWizardParamete
     } else {
         // Todo: Can we obtain the header from the code model for custom widgets?
         // Alternatively, from Designer.
-        if (formBaseClass.startsWith(QLatin1Char('Q'))) {
+        if (formBaseClass.startsWith('Q')) {
             if (generationParameters.includeQtModule) {
                 if (generationParameters.addQtVersionCheck) {
                     Utils::writeBeginQtVersionCheck(headerStr);
-                    Utils::writeIncludeFileDirective(QLatin1String("QtWidgets/") + formBaseClass, true, headerStr);
+                    Utils::writeIncludeFileDirective("QtWidgets/" + formBaseClass, true, headerStr);
                     headerStr << "#else\n";
-                    Utils::writeIncludeFileDirective(QLatin1String("QtGui/") + formBaseClass, true, headerStr);
+                    Utils::writeIncludeFileDirective("QtGui/" + formBaseClass, true, headerStr);
                     headerStr << "#endif\n";
                 } else {
-                    Utils::writeIncludeFileDirective(QLatin1String("QtGui/") + formBaseClass, true, headerStr);
+                    Utils::writeIncludeFileDirective("QtGui/" + formBaseClass, true, headerStr);
                 }
             } else {
                 Utils::writeIncludeFileDirective(formBaseClass, true, headerStr);
diff --git a/src/plugins/designer/qtdesignerformclasscodegenerator.h b/src/plugins/designer/qtdesignerformclasscodegenerator.h
index 96eb76e07f..1bf0621273 100644
--- a/src/plugins/designer/qtdesignerformclasscodegenerator.h
+++ b/src/plugins/designer/qtdesignerformclasscodegenerator.h
@@ -42,7 +42,7 @@ class QtDesignerFormClassCodeGenerator : public QObject
 {
     Q_OBJECT
 public:
-    explicit QtDesignerFormClassCodeGenerator(QObject *parent = 0);
+    explicit QtDesignerFormClassCodeGenerator(QObject *parent = nullptr);
 
     static bool generateCpp(const FormClassWizardParameters &parameters,
                             QString *header, QString *source, int indentation = 4);
diff --git a/src/plugins/designer/resourcehandler.cpp b/src/plugins/designer/resourcehandler.cpp
index 1f588095cd..11b6ead78a 100644
--- a/src/plugins/designer/resourcehandler.cpp
+++ b/src/plugins/designer/resourcehandler.cpp
@@ -34,6 +34,7 @@
 
 #include <QDesignerFormWindowInterface>
 
+#include <utils/asconst.h>
 #include <utils/qtcassert.h>
 
 using namespace ProjectExplorer;
@@ -108,7 +109,7 @@ void ResourceHandler::updateResourcesHelper(bool updateProjectResources)
         // Check if the user has chosen to update the lacking resource inside designer
         if (dirty && updateProjectResources) {
             QStringList qrcPathsToBeAdded;
-            foreach (const QString &originalQrcPath, m_originalUiQrcPaths) {
+            for (const QString &originalQrcPath : Utils::asConst(m_originalUiQrcPaths)) {
                 if (!projectQrcFiles.contains(originalQrcPath) && !qrcPathsToBeAdded.contains(originalQrcPath))
                     qrcPathsToBeAdded.append(originalQrcPath);
             }
diff --git a/src/plugins/designer/resourcehandler.h b/src/plugins/designer/resourcehandler.h
index bf5462c67c..81ce722f1f 100644
--- a/src/plugins/designer/resourcehandler.h
+++ b/src/plugins/designer/resourcehandler.h
@@ -59,7 +59,7 @@ private:
     void ensureInitialized();
     void updateResourcesHelper(bool updateProjectResources);
 
-    QDesignerFormWindowInterface * const m_form;
+    QDesignerFormWindowInterface * const m_form = nullptr;
     QStringList m_originalUiQrcPaths;
     bool m_initialized = false;
     bool m_handlingResources = false;
diff --git a/src/plugins/designer/settingsmanager.cpp b/src/plugins/designer/settingsmanager.cpp
index 710286b3ed..77f7e0977d 100644
--- a/src/plugins/designer/settingsmanager.cpp
+++ b/src/plugins/designer/settingsmanager.cpp
@@ -67,6 +67,6 @@ QString SettingsManager::addPrefix(const QString &name) const
 {
     QString result = name;
     if (Core::ICore::settings()->group().isEmpty())
-        result.prepend(QLatin1String("Designer"));
+        result.prepend("Designer");
     return result;
 }
diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp
index 137f9a66aa..488ee8ea5e 100644
--- a/src/plugins/designer/settingspage.cpp
+++ b/src/plugins/designer/settingspage.cpp
@@ -28,6 +28,7 @@
 
 #include <coreplugin/icontext.h>
 
+#include <utils/asconst.h>
 #include <utils/stringutils.h>
 
 #include <QDesignerOptionsPageInterface>
@@ -74,7 +75,7 @@ SettingsPageProvider::SettingsPageProvider(QObject *parent)
     setCategory(Designer::Constants::SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("Designer",
         Designer::Constants::SETTINGS_TR_CATEGORY));
-    setCategoryIcon(QLatin1String(Designer::Constants::SETTINGS_CATEGORY_ICON));
+    setCategoryIcon(Designer::Constants::SETTINGS_CATEGORY_ICON);
 }
 
 QList<Core::IOptionsPage *> SettingsPageProvider::pages() const
@@ -120,7 +121,7 @@ bool SettingsPageProvider::matches(const QString &searchKeyWord) const
         for (size_t i = 0; i < itemCount; ++i)
             m_keywords << Utils::stripAccelerator(QCoreApplication::translate(uitext[i].context, uitext[i].value));
     }
-    foreach (const QString &key, m_keywords) {
+    for (const QString &key : Utils::asConst(m_keywords)) {
         if (key.contains(searchKeyWord, Qt::CaseInsensitive))
             return true;
     }
diff --git a/src/plugins/designer/settingspage.h b/src/plugins/designer/settingspage.h
index 7e0a6b1836..6fc13cbb01 100644
--- a/src/plugins/designer/settingspage.h
+++ b/src/plugins/designer/settingspage.h
@@ -60,7 +60,7 @@ class SettingsPageProvider : public Core::IOptionsPageProvider
     Q_OBJECT
 
 public:
-    SettingsPageProvider(QObject *parent = 0);
+    explicit SettingsPageProvider(QObject *parent = nullptr);
 
     QList<Core::IOptionsPage *> pages() const override;
     bool matches(const QString &searchKeyWord) const override;