diff --git a/add-printer/AddPrinter.h b/add-printer/AddPrinter.h
--- a/add-printer/AddPrinter.h
+++ b/add-printer/AddPrinter.h
@@ -55,7 +55,7 @@
 private:
     void show(QWidget *widget, qulonglong wid) const;
 
-    AddPrinterInterface *m_pqInterface;
+    AddPrinterInterface *m_pqInterface {nullptr};
 };
 
 #endif //ADDPRINTER_H
diff --git a/add-printer/ChooseLpd.cpp b/add-printer/ChooseLpd.cpp
--- a/add-printer/ChooseLpd.cpp
+++ b/add-printer/ChooseLpd.cpp
@@ -22,6 +22,7 @@
 #include "ui_ChooseLpd.h"
 
 #include <KCupsRequest.h>
+#include <KLocalizedString>
 
 #include <QPainter>
 
@@ -45,7 +46,7 @@
 
 void ChooseLpd::on_addressLE_textChanged(const QString &text)
 {
-    Q_UNUSED(text);
+    Q_UNUSED(text)
 //    qDebug() << text;
 }
 
diff --git a/add-printer/ChooseSamba.cpp b/add-printer/ChooseSamba.cpp
--- a/add-printer/ChooseSamba.cpp
+++ b/add-printer/ChooseSamba.cpp
@@ -22,6 +22,7 @@
 #include "ui_ChooseSamba.h"
 
 #include <KCupsRequest.h>
+#include <KLocalizedString>
 
 #include <QPainter>
 #include <QDebug>
diff --git a/add-printer/ChooseSerial.cpp b/add-printer/ChooseSerial.cpp
--- a/add-printer/ChooseSerial.cpp
+++ b/add-printer/ChooseSerial.cpp
@@ -22,6 +22,7 @@
 #include "ui_ChooseSerial.h"
 
 #include <KCupsRequest.h>
+#include <KLocalizedString>
 
 #include <QPainter>
 
@@ -58,7 +59,7 @@
 void ChooseSerial::setValues(const QVariantHash &args)
 {
     m_args = args;
-    QString deviceUri = args[KCUPS_DEVICE_URI].toString();
+    const QString deviceUri = args[KCUPS_DEVICE_URI].toString();
     if (!deviceUri.startsWith(QLatin1String("serial:"))) {
         m_isValid = false;
         return;
diff --git a/add-printer/ChooseSocket.cpp b/add-printer/ChooseSocket.cpp
--- a/add-printer/ChooseSocket.cpp
+++ b/add-printer/ChooseSocket.cpp
@@ -22,6 +22,7 @@
 #include "ui_ChooseSocket.h"
 
 #include <KCupsRequest.h>
+#include <KLocalizedString>
 
 #include <QPainter>
 #include <QUrl>
diff --git a/add-printer/ChooseUri.cpp b/add-printer/ChooseUri.cpp
--- a/add-printer/ChooseUri.cpp
+++ b/add-printer/ChooseUri.cpp
@@ -22,6 +22,7 @@
 #include "ui_ChooseUri.h"
 
 #include <KCupsRequest.h>
+#include <KLocalizedString>
 
 #include <QLoggingCategory>
 
diff --git a/add-printer/DevicesModel.cpp b/add-printer/DevicesModel.cpp
--- a/add-printer/DevicesModel.cpp
+++ b/add-printer/DevicesModel.cpp
@@ -339,7 +339,7 @@
 {
     qWarning() << error <<  message;
     groupedDevicesFallback();
-    emit errorMessage(i18n("Failed to group devices: '%1'",error.message()));
+    emit errorMessage(i18n("Failed to group devices: '%1'", error.message()));
     emit loaded();
 }
 
diff --git a/add-printer/PageAddPrinter.cpp b/add-printer/PageAddPrinter.cpp
--- a/add-printer/PageAddPrinter.cpp
+++ b/add-printer/PageAddPrinter.cpp
@@ -22,6 +22,7 @@
 #include "ui_PageAddPrinter.h"
 
 #include <KCupsRequest.h>
+#include <KLocalizedString>
 
 #include <QPainter>
 #include <QPointer>
@@ -54,10 +55,9 @@
                                              KIconLoader::DefaultState);
     // the emblem icon to size 32
     int overlaySize = KIconLoader::SizeLarge;
-    QPoint startPoint;
     // bottom right corner
-    startPoint = QPoint(KIconLoader::SizeEnormous - overlaySize - 2,
-                        KIconLoader::SizeEnormous - overlaySize - 2);
+    const QPoint startPoint = QPoint(KIconLoader::SizeEnormous - overlaySize - 2,
+                              KIconLoader::SizeEnormous - overlaySize - 2);
     painter.drawPixmap(startPoint, pixmap);
     ui->printerL->setPixmap(icon);
 
diff --git a/add-printer/PageChoosePPD.cpp b/add-printer/PageChoosePPD.cpp
--- a/add-printer/PageChoosePPD.cpp
+++ b/add-printer/PageChoosePPD.cpp
@@ -25,6 +25,7 @@
 
 #include <SelectMakeModel.h>
 #include <KCupsRequest.h>
+#include <KLocalizedString>
 
 #include <QFileInfo>
 #include <QFile>
@@ -74,10 +75,10 @@
         qDebug() << args;
         working();
         removeTempPPD();
-        QString deviceId = args[KCUPS_DEVICE_ID].toString();
+        const QString deviceId = args[KCUPS_DEVICE_ID].toString();
         QString make;
         QString makeAndModel = args[KCUPS_DEVICE_MAKE_AND_MODEL].toString();
-        QString deviceURI = args[KCUPS_DEVICE_URI].toString();
+        const QString deviceURI = args[KCUPS_DEVICE_URI].toString();
 
         // If
         QUrl url(deviceURI + QLatin1String(".ppd"));
diff --git a/add-printer/PageChoosePrinters.cpp b/add-printer/PageChoosePrinters.cpp
--- a/add-printer/PageChoosePrinters.cpp
+++ b/add-printer/PageChoosePrinters.cpp
@@ -24,6 +24,7 @@
 #include <ClassListWidget.h>
 
 #include <KCupsRequest.h>
+#include <KLocalizedString>
 
 #include <QPainter>
 
@@ -51,11 +52,10 @@
                                              KIconLoader::SizeLarge, // a not so huge icon
                                              KIconLoader::DefaultState);
     // the emblem icon to size 32
-    int overlaySize = KIconLoader::SizeLarge;
-    QPoint startPoint;
+    const int overlaySize = KIconLoader::SizeLarge;
     // bottom right corner
-    startPoint = QPoint(KIconLoader::SizeEnormous - overlaySize - 2,
-                        KIconLoader::SizeEnormous - overlaySize - 2);
+    const QPoint startPoint = QPoint(KIconLoader::SizeEnormous - overlaySize - 2,
+                              KIconLoader::SizeEnormous - overlaySize - 2);
     painter.drawPixmap(startPoint, pixmap);
     ui->printerL->setPixmap(icon);
 
diff --git a/add-printer/PageDestinations.cpp b/add-printer/PageDestinations.cpp
--- a/add-printer/PageDestinations.cpp
+++ b/add-printer/PageDestinations.cpp
@@ -30,6 +30,7 @@
 #include "ChooseUri.h"
 
 #include <KCupsRequest.h>
+#include <KLocalizedString>
 #include <NoSelectionRectDelegate.h>
 
 #include <QItemSelectionModel>
@@ -182,7 +183,7 @@
         }
     } else {
         ui->connectionsGB->setVisible(false);
-        setCurrentPage(0, selectedItemValues());
+        setCurrentPage(nullptr, selectedItemValues());
         return;
     }
 
@@ -320,7 +321,7 @@
     auto page = qobject_cast<GenericPage*>(widget);
     if (page) {
         page->setValues(args);
-        if (ui->stackedWidget->currentWidget() != page) {;
+        if (ui->stackedWidget->currentWidget() != page) {
             ui->stackedWidget->setCurrentWidget(page);
         }
     } else if (qobject_cast<QLabel*>(widget)) {
@@ -330,7 +331,7 @@
             m_chooseLabel->clear();
         }
 
-        if (ui->stackedWidget->currentWidget() != widget) {;
+        if (ui->stackedWidget->currentWidget() != widget) {
             ui->stackedWidget->setCurrentWidget(widget);
         }
     } else {