Cleaning #includes

main/main.cpp

@@ -1,4 +1,8 @@
 #include "mainwindow.h"
+#if SINGLE_APP
+#include "singleapplication.h"
+#endif
+
 #include <QApplication>
 #include <QTranslator>
 
@@ -72,8 +76,7 @@ int main(int argc, char *argv[]) {
   // locale = "nl_NL";
   // locale = "he_IL";
   // locale = "ar_MA";
-  translator.load(QString(":localization/localization_") + locale +
-                  QString(".qm"));
+  translator.load(QString(":localization/localization_%1.qm").arg(locale));
   app.installTranslator(&translator);
   app.setLayoutDirection(QObject::tr("LTR") == "RTL" ? Qt::RightToLeft
                                                      : Qt::LeftToRight);

src/configdialog.cpp

@@ -6,6 +6,7 @@
 #include "ui_configdialog.h"
 #include <QClipboard>
 #include <QDir>
+#include <QFileDialog>
 #include <QMessageBox>
 #ifdef Q_OS_WIN
 #include <windows.h>

src/configdialog.h

@@ -1,16 +1,15 @@
 #ifndef CONFIGDIALOG_H_
 #define CONFIGDIALOG_H_
 
-#include "mainwindow.h"
-#include <QCloseEvent>
+#include "enums.h"
+#include "passwordconfiguration.h"
+
 #include <QDialog>
-#include <QFileDialog>
-#include <QTableWidgetItem>
 
 namespace Ui {
-struct UserInfo;
+    struct UserInfo;
 
-class ConfigDialog;
+    class ConfigDialog;
 } // namespace Ui
 
 /*!
@@ -19,6 +18,8 @@ class ConfigDialog;
 
     This class should also take the handling from the MainWindow class.
 */
+class MainWindow;
+class QCloseEvent;
 class ConfigDialog : public QDialog {
   Q_OBJECT
 

src/deselectabletreeview.h

@@ -1,8 +1,11 @@
 #ifndef DESELECTABLETREEVIEW_H
 #define DESELECTABLETREEVIEW_H
-#include "QMouseEvent"
-#include "QTreeView"
-#include "mainwindow.h"
+
+//#include "mainwindow.h"
+
+#include <QCoreApplication>
+#include <QMouseEvent>
+#include <QTreeView>
 #include <QTime>
 
 /**

src/enums.h

@@ -7,31 +7,32 @@
 */
 namespace Enums {
 
-enum clipBoardType {
-  CLIPBOARD_NEVER = 0,
-  CLIPBOARD_ALWAYS = 1,
-  CLIPBOARD_ON_DEMAND = 2
-};
+    enum clipBoardType {
+      CLIPBOARD_NEVER = 0,
+      CLIPBOARD_ALWAYS = 1,
+      CLIPBOARD_ON_DEMAND = 2
+    };
+
+    enum PROCESS {
+      GIT_INIT = 0,
+      GIT_ADD,
+      GIT_COMMIT,
+      GIT_RM,
+      GIT_PULL,
+      GIT_PUSH,
+      PASS_SHOW,
+      PASS_INSERT,
+      PASS_REMOVE,
+      PASS_INIT,
+      GPG_GENKEYS,
+      PASS_MOVE,
+      PASS_COPY,
+      GIT_MOVE,
+      GIT_COPY,
+      PROCESS_COUNT,
+      INVALID
+    };
 
-enum PROCESS {
-  GIT_INIT = 0,
-  GIT_ADD,
-  GIT_COMMIT,
-  GIT_RM,
-  GIT_PULL,
-  GIT_PUSH,
-  PASS_SHOW,
-  PASS_INSERT,
-  PASS_REMOVE,
-  PASS_INIT,
-  GPG_GENKEYS,
-  PASS_MOVE,
-  PASS_COPY,
-  GIT_MOVE,
-  GIT_COPY,
-  PROCESS_COUNT,
-  INVALID
-};
 } // namespace Enums
 
 #endif // ENUMS_H

src/filecontent.h

@@ -1,68 +1,68 @@
 #ifndef FILECONTENT_H
 #define FILECONTENT_H
 
-#include <utility>
+//#include <utility>
 #include <QList>
 #include <QString>
 
 struct NamedValue {
-  QString name;
-  QString value;
+    QString name;
+    QString value;
 };
 
 /**
  * @brief The NamedValues class is mostly a list of \link NamedValue
  * but also has a method to take a specific NamedValue pair out of the list.
  */
 class NamedValues : public QList<NamedValue> {
-public:
-  NamedValues();
-  NamedValues(std::initializer_list<NamedValue> values);
+    public:
+      NamedValues();
+      NamedValues(std::initializer_list<NamedValue> values);
 
-  QString takeValue(const QString &name);
+      QString takeValue(const QString &name);
 };
 
-class FileContent
-{
-public:
-  /**
-   * @brief parse parses the given fileContent in a FileContent object.
-   * The password is accessible through getPassword.
-   * The named value pairs (name: value) are parsed and depeding on the templateFields and allFields parameters
-   * accessible through getNamedValues or getRemainingData.
-   *
-   * @param fileContent the file content to parse.
-   *
-   * @param templateFields the fields in the template.
-   * Fields in the template will always be in getNamedValues() at the beginning of the list in the same order.
-   *
-   * @param allFields whether all fields should be considered as named values.
-   * If set to false only templateFields are returned in getNamedValues().
-   *
-   * @return
-   */
-  static FileContent parse(const QString &fileContent, const QStringList& templateFields, bool allFields);
+class FileContent {
+    public:
+      /**
+       * @brief parse parses the given fileContent in a FileContent object.
+       * The password is accessible through getPassword.
+       * The named value pairs (name: value) are parsed and depeding on the templateFields and allFields parameters
+       * accessible through getNamedValues or getRemainingData.
+       *
+       * @param fileContent the file content to parse.
+       *
+       * @param templateFields the fields in the template.
+       * Fields in the template will always be in getNamedValues() at the beginning of the list in the same order.
+       *
+       * @param allFields whether all fields should be considered as named values.
+       * If set to false only templateFields are returned in getNamedValues().
+       *
+       * @return
+       */
+      static FileContent parse(const QString &fileContent, const QStringList& templateFields, bool allFields);
 
-  /**
-   * @return the password from the parsed file.
-   */
-  QString getPassword() const;
+      /**
+       * @return the password from the parsed file.
+       */
+      QString getPassword() const;
 
-  /**
-   * @return the named values in the file in the order of appearence, with template values first.
-   */
-  NamedValues getNamedValues() const;
+      /**
+       * @return the named values in the file in the order of appearence, with template values first.
+       */
+      NamedValues getNamedValues() const;
 
-  /**
-   * @return the data that is not the password and not in getNamedValues.
-   */
-  QString getRemainingData() const;
-private:
-  FileContent(const QString &password, const NamedValues &namedValues, const QString &remainingData);
+      /**
+       * @return the data that is not the password and not in getNamedValues.
+       */
+      QString getRemainingData() const;
 
-  QString password;
-  NamedValues namedValues;
-  QString remainingData;
+    private:
+      FileContent(const QString &password, const NamedValues &namedValues, const QString &remainingData);
+
+      QString password;
+      NamedValues namedValues;
+      QString remainingData;
 };
 
 #endif // FILECONTENT_H

src/keygendialog.cpp

@@ -1,3 +1,4 @@
+#include "configdialog.h"
 #include "keygendialog.h"
 #include "debughelper.h"
 #include "qprogressindicator.h"

src/keygendialog.h

@@ -1,18 +1,18 @@
 #ifndef KEYGENDIALOG_H_
 #define KEYGENDIALOG_H_
 
-#include "configdialog.h"
-#include <QCloseEvent>
 #include <QDialog>
 
 namespace Ui {
-class KeygenDialog;
+    class KeygenDialog;
 }
 
 /*!
     \class KeygenDialog
     \brief Handles GPG keypair generation.
  */
+class ConfigDialog;
+class QCloseEvent;
 class KeygenDialog : public QDialog {
   Q_OBJECT
 

src/mainwindow.cpp

@@ -7,10 +7,11 @@
 #include <QInputDialog>
 #include <QLabel>
 #include <QMessageBox>
+#include <QMenu>
 #include <QQueue>
 #include <QShortcut>
+#include <QSystemTrayIcon>
 #include <QTextCodec>
-#include <QTimer>
 #ifdef Q_OS_WIN
 #define WIN32_LEAN_AND_MEAN /*_KILLING_MACHINE*/
 #define WIN32_EXTRA_LEAN
@@ -28,6 +29,11 @@
 #include "usersdialog.h"
 #include "util.h"
 #include "filecontent.h"
+#include "trayicon.h"
+
+#if SINGLE_APP
+#include "singleapplication.h"
+#endif
 
 /**
  * @brief MainWindow::MainWindow handles all of the main functionality and also

src/mainwindow.h

@@ -1,23 +1,16 @@
 #ifndef MAINWINDOW_H_
 #define MAINWINDOW_H_
 
-#include "passwordconfiguration.h"
-#include "userinfo.h"
-#include "enums.h"
-#include "imitatepass.h"
-#include "pass.h"
-#include "realpass.h"
 #include "storemodel.h"
-#include "trayicon.h"
+
 #include <QFileSystemModel>
+#include <QItemSelectionModel>
 #include <QMainWindow>
 #include <QProcess>
-#include <QQueue>
 #include <QTimer>
-#include <QTreeView>
 
 #if SINGLE_APP
-#include "singleapplication.h"
+class SingleApplication;
 #else
 #define SingleApplication QApplication
 #endif
@@ -40,6 +33,8 @@ class MainWindow;
 
     This class could really do with an overhaul.
  */
+class Pass;
+class TrayIcon;
 class MainWindow : public QMainWindow {
   Q_OBJECT
 

src/pass.h

@@ -4,21 +4,19 @@
 #include "userinfo.h"
 #include "enums.h"
 #include "executor.h"
-#include <QDebug>
-#include <QDir>
-#include <QList>
+
 #include <QProcess>
 #include <QQueue>
+#include <QString>
+#include <cassert>
+#include <map>
+
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #include <QRandomGenerator>
 #else
 #include <fcntl.h>
 #include <unistd.h>
 #endif
-#include <QString>
-#include <QTextCodec>
-#include <cassert>
-#include <map>
 
 /*!
     \class Pass

src/passworddialog.cpp

@@ -4,7 +4,7 @@
 #include "qtpasssettings.h"
 #include "filecontent.h"
 #include "ui_passworddialog.h"
-#include <QDebug>
+
 #include <QLabel>
 #include <QLineEdit>
 

src/passworddialog.h

@@ -1,16 +1,16 @@
 #ifndef PASSWORDDIALOG_H_
 #define PASSWORDDIALOG_H_
 
-#include "pass.h"
+//#include "pass.h"
 #include <QDialog>
-#include <QWidget>
 
 namespace Ui {
 class PasswordDialog;
 }
 
 struct PasswordConfiguration;
 class QLineEdit;
+class QWidget;
 
 /*!
     \class PasswordDialog