Some cleanup with help of Clang-Tidy and Clazy (part 1 of x)

10 files changed, 43 insertions, 35 deletions

diff --git a/main/main.cpp b/main/main.cpp
index 2632769d..fefe570f 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -79,13 +79,13 @@ int main(int argc, char *argv[]) {
   // locale = "he_IL";
   // locale = "ar_MA";
   translator.load(QString(":localization/localization_%1.qm").arg(locale));
-  app.installTranslator(&translator);
-  app.setLayoutDirection(QObject::tr("LTR") == "RTL" ? Qt::RightToLeft
-                                                     : Qt::LeftToRight);
+  SingleApplication::installTranslator(&translator);
+  SingleApplication::setLayoutDirection(
+      QObject::tr("LTR") == "RTL" ? Qt::RightToLeft : Qt::LeftToRight);
   MainWindow w(text);
 
-  app.setActiveWindow(&w);
-  app.setWindowIcon(QIcon(":artwork/icon.png"));
+  SingleApplication::setActiveWindow(&w);
+  SingleApplication::setWindowIcon(QIcon(":artwork/icon.png"));
 
 #if SINGLE_APP
   QObject::connect(&app, &SingleApplication::messageAvailable, &w,
@@ -94,5 +94,5 @@ int main(int argc, char *argv[]) {
 
   w.show();
 
-  return app.exec();
+  return SingleApplication::exec();
 }
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index ae07ad2c..4d126ed2 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -39,7 +39,7 @@ ConfigDialog::ConfigDialog(MainWindow *parent)
   ui->checkBoxHideContent->setChecked(QtPassSettings::isHideContent());
   ui->checkBoxAddGPGId->setChecked(QtPassSettings::isAddGPGId(true));
 
-  if (QSystemTrayIcon::isSystemTrayAvailable() == true) {
+  if (QSystemTrayIcon::isSystemTrayAvailable()) {
     ui->checkBoxHideOnClose->setChecked(QtPassSettings::isHideOnClose());
     ui->checkBoxStartMinimized->setChecked(QtPassSettings::isStartMinimized());
   } else {
@@ -238,7 +238,7 @@ QStringList ConfigDialog::getSecretKeys() {
   QList<UserInfo> keys = QtPassSettings::getPass()->listKeys("", true);
   QStringList names;
 
-  if (keys.size() == 0)
+  if (keys.empty())
     return names;
 
   foreach (const UserInfo &sec, keys)
@@ -266,8 +266,8 @@ QString ConfigDialog::selectExecutable() {
   dialog.setOption(QFileDialog::ReadOnly);
   if (dialog.exec())
     return dialog.selectedFiles().first();
-  else
-    return QString();
+
+  return QString();
 }
 
 /**
@@ -281,8 +281,8 @@ QString ConfigDialog::selectFolder() {
   dialog.setOption(QFileDialog::ShowDirsOnly);
   if (dialog.exec())
     return dialog.selectedFiles().first();
-  else
-    return QString();
+
+  return QString();
 }
 
 /**
@@ -615,7 +615,7 @@ void ConfigDialog::wizard() {
  * @param useSystray
  */
 void ConfigDialog::useTrayIcon(bool useSystray) {
-  if (QSystemTrayIcon::isSystemTrayAvailable() == true) {
+  if (QSystemTrayIcon::isSystemTrayAvailable()) {
     ui->checkBoxUseTrayIcon->setChecked(useSystray);
     ui->checkBoxHideOnClose->setEnabled(useSystray);
     ui->checkBoxStartMinimized->setEnabled(useSystray);
diff --git a/src/executor.cpp b/src/executor.cpp
index cd20f11c..d536068c 100644
--- a/src/executor.cpp
+++ b/src/executor.cpp
@@ -155,10 +155,9 @@ int Executor::executeBlocking(QString app, const QStringList &args,
     if (process_err != Q_NULLPTR)
       *process_err = perr;
     return internal.exitCode();
-  } else {
-    //  TODO(bezet): emit error() ?
-    return -1; //    QProcess error code + qDebug error?
   }
+  //  TODO(bezet): emit error() ?
+  return -1; //    QProcess error code + qDebug error?
 }
 
 /**
diff --git a/src/qtpass.cpp b/src/qtpass.cpp
index 2239e86d..fda99cad 100644
--- a/src/qtpass.cpp
+++ b/src/qtpass.cpp
@@ -23,6 +23,7 @@ QtPass::QtPass() : clippedText(QString()), freshStart(true) {
   if (!setup()) {
     // no working config so this should quit without config anything
     QApplication::quit();
+    {}
   }
 
   setClipboardTimer();
@@ -273,7 +274,7 @@ void QtPass::processErrorExit(int exitCode, const QString &p_error) {
 
     output.replace(
         QRegExp("((?:https?|ftp|ssh|sftp|ftps|webdav|webdavs)://\\S+)"),
-        "<a href=\"\\1\">\\1</a>");
+        R"(<a href="\1">\1</a>)");
     output.replace(QRegExp("\n"), "<br />");
 
     m_mainWindow->flashText(output, false, true);
@@ -335,7 +336,7 @@ void QtPass::showInTextBrowser(QString output, QString prefix,
 
   output.replace(
       QRegExp("((?:https?|ftp|ssh|sftp|ftps|webdav|webdavs)://\\S+)"),
-      "<a href=\"\\1\">\\1</a>");
+      R"(<a href="\1">\1</a>)");
   output.replace(QRegExp("\n"), "<br />");
   output = prefix + output + postfix;
 
diff --git a/src/qtpasssettings.cpp b/src/qtpasssettings.cpp
index fadb37fc..77be99ad 100644
--- a/src/qtpasssettings.cpp
+++ b/src/qtpasssettings.cpp
@@ -531,5 +531,13 @@ void QtPassSettings::setTemplateAllFields(const bool &templateAllFields) {
                           templateAllFields);
 }
 
-RealPass *QtPassSettings::getRealPass() { if (realPass.isNull()) realPass.reset(new RealPass()); return realPass.data(); }
-ImitatePass *QtPassSettings::getImitatePass() { if (imitatePass.isNull()) imitatePass.reset(new ImitatePass()); return imitatePass.data(); }
+RealPass *QtPassSettings::getRealPass() {
+  if (realPass.isNull())
+    realPass.reset(new RealPass());
+  return realPass.data();
+}
+ImitatePass *QtPassSettings::getImitatePass() {
+  if (imitatePass.isNull())
+    imitatePass.reset(new ImitatePass());
+  return imitatePass.data();
+}
diff --git a/src/realpass.cpp b/src/realpass.cpp
index 476757ee..071f618b 100644
--- a/src/realpass.cpp
+++ b/src/realpass.cpp
@@ -104,7 +104,7 @@ void RealPass::Move(const QString src, const QString dest, const bool force) {
   // pass uses always the force mode, when call from eg. QT. so we have to check
   // if this are to files
   // and the user didnt want to move force
-  if (force == false && srcFileInfo.isFile() && destFileInfo.isFile()) {
+  if (!force && srcFileInfo.isFile() && destFileInfo.isFile()) {
     return;
   }
 
@@ -144,7 +144,7 @@ void RealPass::Copy(const QString src, const QString dest, const bool force) {
   // pass uses always the force mode, when call from eg. QT. so we have to check
   // if this are to files
   // and the user didnt want to move force
-  if (force == false && srcFileInfo.isFile() && destFileInfo.isFile()) {
+  if (!force && srcFileInfo.isFile() && destFileInfo.isFile()) {
     return;
   }
 
diff --git a/src/util.cpp b/src/util.cpp
index ac69bae7..db8478e4 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -149,9 +149,9 @@ QString Util::getDir(const QModelIndex &index, bool forPass,
   return filePath;
 }
 
-void Util::copyDir(const QString src, const QString dest) {
+void Util::copyDir(const QString &src, const QString &dest) {
   QDir srcDir(src);
-  if (srcDir.exists() == false) {
+  if (!srcDir.exists()) {
     return;
   }
   srcDir.mkpath(dest);
diff --git a/src/util.h b/src/util.h
index b65d7099..f0dca51f 100644
--- a/src/util.h
+++ b/src/util.h
@@ -21,7 +21,7 @@ public:
   static QString getDir(const QModelIndex &index, bool forPass,
                         const QFileSystemModel &model,
                         const StoreModel &storeModel);
-  static void copyDir(const QString src, const QString dest);
+  static void copyDir(const QString &src, const QString &dest);
 
 private:
   static void initialiseEnvironment();
diff --git a/tests/auto/ui/tst_ui.cpp b/tests/auto/ui/tst_ui.cpp
index 065a2143..ae05fac7 100644
--- a/tests/auto/ui/tst_ui.cpp
+++ b/tests/auto/ui/tst_ui.cpp
@@ -20,40 +20,40 @@ private Q_SLOTS:
  */
 void tst_ui::contentRemainsSame() {
   QScopedPointer<PasswordDialog> d(
-      new PasswordDialog(PasswordConfiguration{}, NULL));
+      new PasswordDialog(PasswordConfiguration{}, nullptr));
   d->setTemplate("", false);
   QString input = "pw\n";
   d->setPass(input);
   QCOMPARE(d->getPassword(), input);
 
-  d.reset(new PasswordDialog(PasswordConfiguration{}, NULL));
+  d.reset(new PasswordDialog(PasswordConfiguration{}, nullptr));
   input = "pw\nname: value\n";
   d->setPass(input);
   QCOMPARE(d->getPassword(), input);
 
-  d.reset(new PasswordDialog(PasswordConfiguration{}, NULL));
+  d.reset(new PasswordDialog(PasswordConfiguration{}, nullptr));
   d->setTemplate("name", false);
   d->setPass(input);
   QCOMPARE(d->getPassword(), input);
 
-  d.reset(new PasswordDialog(PasswordConfiguration{}, NULL));
+  d.reset(new PasswordDialog(PasswordConfiguration{}, nullptr));
   d->setTemplate("name", true);
   d->setPass(input);
   QCOMPARE(d->getPassword(), input);
 
-  d.reset(new PasswordDialog(PasswordConfiguration{}, NULL));
+  d.reset(new PasswordDialog(PasswordConfiguration{}, nullptr));
   d->setTemplate("", false);
   d->templateAll(true);
   d->setPass(input);
   QCOMPARE(d->getPassword(), input);
 
-  d.reset(new PasswordDialog(PasswordConfiguration{}, NULL));
+  d.reset(new PasswordDialog(PasswordConfiguration{}, nullptr));
   d->setTemplate("", true);
   d->templateAll(true);
   d->setPass(input);
   QCOMPARE(d->getPassword(), input);
 
-  d.reset(new PasswordDialog(PasswordConfiguration{}, NULL));
+  d.reset(new PasswordDialog(PasswordConfiguration{}, nullptr));
   d->setTemplate("name", true);
   d->templateAll(true);
   d->setPass(input);
diff --git a/tests/auto/util/tst_util.cpp b/tests/auto/util/tst_util.cpp
index cce06664..ae2bd9e1 100644
--- a/tests/auto/util/tst_util.cpp
+++ b/tests/auto/util/tst_util.cpp
@@ -12,7 +12,7 @@ class tst_util : public QObject {
 
 public:
   tst_util();
-  ~tst_util();
+  ~tst_util() override;
 
 public Q_SLOTS:
   void init();
@@ -32,12 +32,12 @@ bool operator==(const NamedValue &a, const NamedValue &b) {
 /**
  * @brief tst_util::tst_util basic constructor
  */
-tst_util::tst_util() {}
+tst_util::tst_util() = default;
 
 /**
  * @brief tst_util::~tst_util basic destructor
  */
-tst_util::~tst_util() {}
+tst_util::~tst_util() = default;
 
 /**
  * @brief tst_util::init unit test init method