diff --git a/src/cli/Add.cpp b/src/cli/Add.cpp
index 6cbe2b1a1..5e722e888 100644
--- a/src/cli/Add.cpp
+++ b/src/cli/Add.cpp
@@ -62,10 +62,6 @@ Add::Add()
     positionalArguments.append({QString("entry"), QObject::tr("Path of the entry to add."), QString("")});
 }
 
-Add::~Add()
-{
-}
-
 int Add::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<QCommandLineParser> parser)
 {
     TextStream inputTextStream(Utils::STDIN, QIODevice::ReadOnly);
diff --git a/src/cli/Add.h b/src/cli/Add.h
index 7c8d40e32..2d9cf9710 100644
--- a/src/cli/Add.h
+++ b/src/cli/Add.h
@@ -24,9 +24,8 @@ class Add : public DatabaseCommand
 {
 public:
     Add();
-    ~Add();
 
-    int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser);
+    int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser) override;
 
     static const QCommandLineOption UsernameOption;
     static const QCommandLineOption UrlOption;
diff --git a/src/cli/Clip.cpp b/src/cli/Clip.cpp
index 72e6bfdca..2b1dfdc1b 100644
--- a/src/cli/Clip.cpp
+++ b/src/cli/Clip.cpp
@@ -43,10 +43,6 @@ Clip::Clip()
         {QString("timeout"), QObject::tr("Timeout in seconds before clearing the clipboard."), QString("[timeout]")});
 }
 
-Clip::~Clip()
-{
-}
-
 int Clip::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<QCommandLineParser> parser)
 {
     const QStringList args = parser->positionalArguments();
diff --git a/src/cli/Clip.h b/src/cli/Clip.h
index 692bb122f..b171c8689 100644
--- a/src/cli/Clip.h
+++ b/src/cli/Clip.h
@@ -24,9 +24,8 @@ class Clip : public DatabaseCommand
 {
 public:
     Clip();
-    ~Clip();
 
-    int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser);
+    int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser) override;
 
     static const QCommandLineOption TotpOption;
 };
diff --git a/src/cli/Command.cpp b/src/cli/Command.cpp
index 1ed18bb5a..b1d5881a0 100644
--- a/src/cli/Command.cpp
+++ b/src/cli/Command.cpp
@@ -80,14 +80,14 @@ QSharedPointer<QCommandLineParser> Command::getCommandLineParser(const QStringLi
 
     QSharedPointer<QCommandLineParser> parser = QSharedPointer<QCommandLineParser>(new QCommandLineParser());
     parser->setApplicationDescription(description);
-    for (CommandLineArgument positionalArgument : positionalArguments) {
+    for (const CommandLineArgument& positionalArgument : positionalArguments) {
         parser->addPositionalArgument(
             positionalArgument.name, positionalArgument.description, positionalArgument.syntax);
     }
-    for (CommandLineArgument optionalArgument : optionalArguments) {
+    for (const CommandLineArgument& optionalArgument : optionalArguments) {
         parser->addPositionalArgument(optionalArgument.name, optionalArgument.description, optionalArgument.syntax);
     }
-    for (QCommandLineOption option : options) {
+    for (const QCommandLineOption& option : options) {
         parser->addOption(option);
     }
     parser->addHelpOption();
diff --git a/src/cli/Create.cpp b/src/cli/Create.cpp
index 6e0296d39..ee3ac6054 100644
--- a/src/cli/Create.cpp
+++ b/src/cli/Create.cpp
@@ -38,10 +38,6 @@ Create::Create()
     options.append(Command::KeyFileOption);
 }
 
-Create::~Create()
-{
-}
-
 /**
  * Create a database file using the command line. A key file and/or
  * password can be specified to encrypt the password. If none is
diff --git a/src/cli/Create.h b/src/cli/Create.h
index 85993eaeb..26e1f22f8 100644
--- a/src/cli/Create.h
+++ b/src/cli/Create.h
@@ -27,12 +27,10 @@ class Create : public Command
 {
 public:
     Create();
-    ~Create();
-    int execute(const QStringList& arguments);
+    int execute(const QStringList& arguments) override;
 
 private:
     QSharedPointer<PasswordKey> getPasswordFromStdin();
-    QSharedPointer<FileKey> getFileKeyFromStdin();
     bool loadFileKey(const QString& path, QSharedPointer<FileKey>& fileKey);
 };
 
diff --git a/src/cli/Diceware.cpp b/src/cli/Diceware.cpp
index 25e03bdd0..ef1e10a80 100644
--- a/src/cli/Diceware.cpp
+++ b/src/cli/Diceware.cpp
@@ -44,10 +44,6 @@ Diceware::Diceware()
     options.append(Diceware::WordListOption);
 }
 
-Diceware::~Diceware()
-{
-}
-
 int Diceware::execute(const QStringList& arguments)
 {
     QSharedPointer<QCommandLineParser> parser = getCommandLineParser(arguments);
diff --git a/src/cli/Diceware.h b/src/cli/Diceware.h
index 8b2d6835d..efb2d56ef 100644
--- a/src/cli/Diceware.h
+++ b/src/cli/Diceware.h
@@ -24,9 +24,8 @@ class Diceware : public Command
 {
 public:
     Diceware();
-    ~Diceware();
 
-    int execute(const QStringList& arguments);
+    int execute(const QStringList& arguments) override;
 
     static const QCommandLineOption WordCountOption;
     static const QCommandLineOption WordListOption;
diff --git a/src/cli/Edit.cpp b/src/cli/Edit.cpp
index 6f65228e0..8459f5717 100644
--- a/src/cli/Edit.cpp
+++ b/src/cli/Edit.cpp
@@ -47,10 +47,6 @@ Edit::Edit()
     positionalArguments.append({QString("entry"), QObject::tr("Path of the entry to edit."), QString("")});
 }
 
-Edit::~Edit()
-{
-}
-
 int Edit::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<QCommandLineParser> parser)
 {
     TextStream outputTextStream(parser->isSet(Command::QuietOption) ? Utils::DEVNULL : Utils::STDOUT,
diff --git a/src/cli/Edit.h b/src/cli/Edit.h
index 46c1250c5..089a7d886 100644
--- a/src/cli/Edit.h
+++ b/src/cli/Edit.h
@@ -24,8 +24,7 @@ class Edit : public DatabaseCommand
 {
 public:
     Edit();
-    ~Edit();
-    int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser);
+    int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser) override;
 
     static const QCommandLineOption TitleOption;
 };
diff --git a/src/cli/Estimate.cpp b/src/cli/Estimate.cpp
index 4ea754f93..a84e23963 100644
--- a/src/cli/Estimate.cpp
+++ b/src/cli/Estimate.cpp
@@ -45,10 +45,6 @@ Estimate::Estimate()
     description = QObject::tr("Estimate the entropy of a password.");
 }
 
-Estimate::~Estimate()
-{
-}
-
 static void estimate(const char* pwd, bool advanced)
 {
     TextStream out(Utils::STDOUT, QIODevice::WriteOnly);
diff --git a/src/cli/Estimate.h b/src/cli/Estimate.h
index 27aec6036..ac88490df 100644
--- a/src/cli/Estimate.h
+++ b/src/cli/Estimate.h
@@ -24,7 +24,6 @@ class Estimate : public Command
 {
 public:
     Estimate();
-    ~Estimate();
     int execute(const QStringList& arguments) override;
 
     static const QCommandLineOption AdvancedOption;
diff --git a/src/cli/Extract.cpp b/src/cli/Extract.cpp
index b894277fe..9b863f015 100644
--- a/src/cli/Extract.cpp
+++ b/src/cli/Extract.cpp
@@ -30,10 +30,6 @@ Extract::Extract()
     description = QObject::tr("Extract and print the content of a database.");
 }
 
-Extract::~Extract()
-{
-}
-
 int Extract::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<QCommandLineParser>)
 {
     TextStream outputTextStream(Utils::STDOUT, QIODevice::WriteOnly);
diff --git a/src/cli/Extract.h b/src/cli/Extract.h
index 7a6061b98..929cbd722 100644
--- a/src/cli/Extract.h
+++ b/src/cli/Extract.h
@@ -24,9 +24,8 @@ class Extract : public DatabaseCommand
 {
 public:
     Extract();
-    ~Extract();
 
-    int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser);
+    int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser) override;
 };
 
 #endif // KEEPASSXC_EXTRACT_H
diff --git a/src/cli/Generate.cpp b/src/cli/Generate.cpp
index 8972942b8..27a5cf44e 100644
--- a/src/cli/Generate.cpp
+++ b/src/cli/Generate.cpp
@@ -75,10 +75,6 @@ Generate::Generate()
     options.append(Generate::IncludeEveryGroupOption);
 }
 
-Generate::~Generate()
-{
-}
-
 int Generate::execute(const QStringList& arguments)
 {
     QSharedPointer<QCommandLineParser> parser = getCommandLineParser(arguments);
diff --git a/src/cli/Generate.h b/src/cli/Generate.h
index f5e1638af..88477be99 100644
--- a/src/cli/Generate.h
+++ b/src/cli/Generate.h
@@ -24,7 +24,6 @@ class Generate : public Command
 {
 public:
     Generate();
-    ~Generate();
     int execute(const QStringList& arguments) override;
 
     static const QCommandLineOption PasswordLengthOption;
diff --git a/src/cli/List.cpp b/src/cli/List.cpp
index 7f6ea128f..62e67aed8 100644
--- a/src/cli/List.cpp
+++ b/src/cli/List.cpp
@@ -45,10 +45,6 @@ List::List()
         {QString("group"), QObject::tr("Path of the group to list. Default is /"), QString("[group]")});
 }
 
-List::~List()
-{
-}
-
 int List::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<QCommandLineParser> parser)
 {
     TextStream outputTextStream(Utils::STDOUT, QIODevice::WriteOnly);
diff --git a/src/cli/List.h b/src/cli/List.h
index 1b5797077..2f09b6727 100644
--- a/src/cli/List.h
+++ b/src/cli/List.h
@@ -24,9 +24,8 @@ class List : public DatabaseCommand
 {
 public:
     List();
-    ~List();
 
-    int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser);
+    int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser) override;
 
     static const QCommandLineOption RecursiveOption;
     static const QCommandLineOption FlattenOption;
diff --git a/src/cli/Locate.cpp b/src/cli/Locate.cpp
index 4edfa7519..eeb37d803 100644
--- a/src/cli/Locate.cpp
+++ b/src/cli/Locate.cpp
@@ -36,10 +36,6 @@ Locate::Locate()
     positionalArguments.append({QString("term"), QObject::tr("Search term."), QString("")});
 }
 
-Locate::~Locate()
-{
-}
-
 int Locate::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<QCommandLineParser> parser)
 {
 
diff --git a/src/cli/Locate.h b/src/cli/Locate.h
index 24a47731a..66419614e 100644
--- a/src/cli/Locate.h
+++ b/src/cli/Locate.h
@@ -24,9 +24,8 @@ class Locate : public DatabaseCommand
 {
 public:
     Locate();
-    ~Locate();
 
-    int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser);
+    int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser) override;
 };
 
 #endif // KEEPASSXC_LOCATE_H
diff --git a/src/cli/Merge.cpp b/src/cli/Merge.cpp
index d71ca9c95..f1c5efaf2 100644
--- a/src/cli/Merge.cpp
+++ b/src/cli/Merge.cpp
@@ -54,10 +54,6 @@ Merge::Merge()
     positionalArguments.append({QString("database2"), QObject::tr("Path of the database to merge from."), QString("")});
 }
 
-Merge::~Merge()
-{
-}
-
 int Merge::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<QCommandLineParser> parser)
 {
     TextStream outputTextStream(parser->isSet(Command::QuietOption) ? Utils::DEVNULL : Utils::STDOUT,
diff --git a/src/cli/Merge.h b/src/cli/Merge.h
index 236e39242..ff1d151e9 100644
--- a/src/cli/Merge.h
+++ b/src/cli/Merge.h
@@ -24,9 +24,8 @@ class Merge : public DatabaseCommand
 {
 public:
     Merge();
-    ~Merge();
 
-    int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser);
+    int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser) override;
 
     static const QCommandLineOption SameCredentialsOption;
     static const QCommandLineOption KeyFileFromOption;
diff --git a/src/cli/Remove.cpp b/src/cli/Remove.cpp
index 0baa16694..be3b88b93 100644
--- a/src/cli/Remove.cpp
+++ b/src/cli/Remove.cpp
@@ -35,10 +35,6 @@ Remove::Remove()
     positionalArguments.append({QString("entry"), QObject::tr("Path of the entry to remove."), QString("")});
 }
 
-Remove::~Remove()
-{
-}
-
 int Remove::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<QCommandLineParser> parser)
 {
     bool quiet = parser->isSet(Command::QuietOption);
diff --git a/src/cli/Remove.h b/src/cli/Remove.h
index 07697f8a3..6019bfa16 100644
--- a/src/cli/Remove.h
+++ b/src/cli/Remove.h
@@ -24,7 +24,6 @@ class Remove : public DatabaseCommand
 {
 public:
     Remove();
-    ~Remove();
 
     int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser);
 };
diff --git a/src/cli/Show.cpp b/src/cli/Show.cpp
index f33ee7d98..7da1c871c 100644
--- a/src/cli/Show.cpp
+++ b/src/cli/Show.cpp
@@ -49,10 +49,6 @@ Show::Show()
     positionalArguments.append({QString("entry"), QObject::tr("Name of the entry to show."), QString("")});
 }
 
-Show::~Show()
-{
-}
-
 int Show::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<QCommandLineParser> parser)
 {
     TextStream outputTextStream(Utils::STDOUT, QIODevice::WriteOnly);
diff --git a/src/cli/Show.h b/src/cli/Show.h
index dc496c194..03700b465 100644
--- a/src/cli/Show.h
+++ b/src/cli/Show.h
@@ -24,7 +24,6 @@ class Show : public DatabaseCommand
 {
 public:
     Show();
-    ~Show();
 
     int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser);