diff --git a/src/format/KeePass2Repair.cpp b/src/format/KeePass2Repair.cpp
index 4eff3d806..1b2d80d54 100644
--- a/src/format/KeePass2Repair.cpp
+++ b/src/format/KeePass2Repair.cpp
@@ -25,13 +25,13 @@
 #include "format/KeePass2XmlReader.h"
 
 KeePass2Repair::KeePass2Repair()
-    : m_db(Q_NULLPTR)
+    : m_db(nullptr)
 {
 }
 
 KeePass2Repair::RepairResult KeePass2Repair::repairDatabase(QIODevice* device, const CompositeKey& key)
 {
-    m_db = Q_NULLPTR;
+    m_db = nullptr;
     m_errorStr.clear();
 
     KeePass2Reader reader;
diff --git a/src/gui/DatabaseRepairWidget.h b/src/gui/DatabaseRepairWidget.h
index 56c5c9609..6775d2dc1 100644
--- a/src/gui/DatabaseRepairWidget.h
+++ b/src/gui/DatabaseRepairWidget.h
@@ -25,14 +25,14 @@ class DatabaseRepairWidget : public DatabaseOpenWidget
     Q_OBJECT
 
 public:
-    explicit DatabaseRepairWidget(QWidget* parent = Q_NULLPTR);
+    explicit DatabaseRepairWidget(QWidget* parent = nullptr);
 
 Q_SIGNALS:
     void success();
     void error();
 
 protected:
-    void openDatabase() Q_DECL_OVERRIDE;
+    void openDatabase() override;
 
 private Q_SLOTS:
     void processEditFinished(bool result);
diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
index 756c14832..38a685cc6 100644
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -102,7 +102,7 @@ Q_SIGNALS:
     void entryColumnSizesChanged();
 
 protected:
-    bool eventFilter(QObject* object, QEvent* event) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject* object, QEvent* event) override;
 
 public Q_SLOTS:
     void createEntry();
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 7cc59ee53..6245dc79a 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -623,7 +623,7 @@ void MainWindow::repairDatabase()
     if (dialog->exec() == QDialog::Accepted && dbRepairWidget->database()) {
         QString saveFileName = fileDialog()->getSaveFileName(this, tr("Save repaired database"), QString(),
                                                              tr("KeePass 2 Database").append(" (*.kdbx)"),
-                                                             Q_NULLPTR, 0, "kdbx");
+                                                             nullptr, 0, "kdbx");
 
         if (!saveFileName.isEmpty()) {
             KeePass2Writer writer;