diff --git a/runners/spellchecker/spellcheck.cpp b/runners/spellchecker/spellcheck.cpp
--- a/runners/spellchecker/spellcheck.cpp
+++ b/runners/spellchecker/spellcheck.cpp
@@ -54,8 +54,8 @@
     Plasma::AbstractRunner::init();
 
     //Connect prepare and teardown signals
-    connect(this, SIGNAL(prepare()), this, SLOT(loaddata()));
-    connect(this, SIGNAL(teardown()), this, SLOT(destroydata()));
+    connect(this, &SpellCheckRunner::prepare, this, &SpellCheckRunner::loaddata);
+    connect(this, &SpellCheckRunner::teardown, this, &SpellCheckRunner::destroydata);
 }
 
 //Load a default dictionary and some locale names
@@ -75,12 +75,12 @@
     //name (eg. 'german') with one sub-code.
     QSet<QString> families;
     //First get the families
-    foreach (const QString &code, avail) {
+    for (const QString &code: avail) {
         families +=code.left(2);
     }
     //Now for each family figure out which is the main code.
-    foreach (const QString &fcode,families) {
-        QStringList family = avail.filter(fcode);
+    for (const QString &fcode: qAsConst(families)) {
+        const QStringList family = avail.filter(fcode);
         QString code;
         //If we only have one code, use it.
         //If a string is the default language, use it
@@ -142,7 +142,7 @@
  * Return the empty string if we can't match a language. */
 QString SpellCheckRunner::findlang(const QStringList& terms)
 {
-    auto defaultSpeller = m_spellers[QString()];
+    auto &defaultSpeller = m_spellers[QString()];
     //If first term is a language code (like en_GB), set it as the spell-check language
     if (terms.count() >= 1 && defaultSpeller->availableLanguages().contains(terms[0])) {
         return terms[0];
diff --git a/runners/spellchecker/spellcheck_config.cpp b/runners/spellchecker/spellcheck_config.cpp
--- a/runners/spellchecker/spellcheck_config.cpp
+++ b/runners/spellchecker/spellcheck_config.cpp
@@ -43,27 +43,21 @@
 
     layout->addWidget(m_ui, 0, 0);
 
-    connect(m_ui->m_requireTriggerWord, SIGNAL(stateChanged(int)), this, SLOT(changed()));
-    connect(m_ui->m_requireTriggerWord, SIGNAL(stateChanged(int)), this, SLOT(toggleTriggerWord(int)));
-    connect(m_ui->m_triggerWord, SIGNAL(textChanged(QString)), this, SLOT(changed()));
-
-    m_ui->m_openKcmButton->setIcon(QIcon::fromTheme(QStringLiteral("tools-check-spelling")));
+    connect(m_ui->m_requireTriggerWord, &QCheckBox::stateChanged, this, &SpellCheckConfig::markAsChanged);
+    connect(m_ui->m_requireTriggerWord, &QCheckBox::stateChanged, this, &SpellCheckConfig::toggleTriggerWord);
+    connect(m_ui->m_triggerWord, &QLineEdit::textChanged, this, &SpellCheckConfig::markAsChanged);
     connect(m_ui->m_openKcmButton, &QPushButton::clicked, this, &SpellCheckConfig::openKcm);
 
-    load();
+    m_ui->m_openKcmButton->setIcon(QIcon::fromTheme(QStringLiteral("tools-check-spelling")));
 }
 
 SpellCheckConfig::~SpellCheckConfig()
 {
 }
 
 void SpellCheckConfig::toggleTriggerWord(int state)
 {
-    if (state == Qt::Unchecked) {
-        m_ui->m_triggerWord->setEnabled(false);
-    } else {
-        m_ui->m_triggerWord->setEnabled(true);
-    }
+    m_ui->m_triggerWord->setEnabled(state == Qt::Checked);
 }
 
 void SpellCheckConfig::openKcm()
@@ -76,29 +70,27 @@
     KCModule::load();
 
     //FIXME: This shouldn't be hardcoded!
-    KSharedConfig::Ptr cfg = KSharedConfig::openConfig( QLatin1String( "krunnerrc" ) );
-    KConfigGroup conf = cfg->group( "Runners" );
-    KConfigGroup grp = KConfigGroup( &conf, "Spell Checker");
+    const KSharedConfig::Ptr cfg = KSharedConfig::openConfig(QStringLiteral("krunnerrc"));
+    const KConfigGroup grp = cfg->group("Runners").group("Spell Checker");
 
     const bool requireTrigger = grp.readEntry("requireTriggerWord", true);
     const QString trigger = grp.readEntry("trigger", i18n("spell"));
 
     if (!requireTrigger) {
         m_ui->m_triggerWord->setEnabled(false);
     }
 
-    m_ui->m_requireTriggerWord->setCheckState( (requireTrigger) ? Qt::Checked : Qt::Unchecked );
-    m_ui->m_triggerWord->setText( trigger );
+    m_ui->m_requireTriggerWord->setCheckState((requireTrigger) ? Qt::Checked : Qt::Unchecked);
+    m_ui->m_triggerWord->setText(trigger);
 
     emit changed(false);
 }
 
 void SpellCheckConfig::save()
 {
     //FIXME: This shouldn't be hardcoded!
-    KSharedConfig::Ptr cfg = KSharedConfig::openConfig( QLatin1String( "krunnerrc" ) );
-    KConfigGroup conf = cfg->group( "Runners" );
-    KConfigGroup grp = KConfigGroup( &conf, "Spell Checker");
+    KSharedConfig::Ptr cfg = KSharedConfig::openConfig(QStringLiteral("krunnerrc"));
+    KConfigGroup grp = cfg->group("Runners").group("Spell Checker");
 
     bool requireTrigger = m_ui->m_requireTriggerWord->checkState() == Qt::Checked;
     if (requireTrigger) {