Restructure update

logdoctor/CMakeLists.txt

@@ -22,12 +22,15 @@ set(TS_FILES
         translations/LogDoctor_it.ts
 )
 
+
 set(PROJECT_SOURCES
         main.cpp
         mainwindow.ui
         mainwindow.h
         mainwindow.cpp
 
+        utilities/checks.h
+        utilities/checks.cpp
         utilities/colors.h
         utilities/colors.cpp
         utilities/gzip.h
@@ -41,10 +44,6 @@ set(PROJECT_SOURCES
         utilities/vectors.h
         utilities/vectors.cpp
 
-        modules/charts/donuts.h
-        modules/charts/donuts.cpp
-        modules/checks.h
-        modules/checks.cpp
         modules/dialogs.h
         modules/dialogs.cpp
         modules/exceptions.h
@@ -52,44 +51,46 @@ set(PROJECT_SOURCES
         modules/tb.h
         modules/tb.cpp
 
-        tools/shared.h
-        tools/shared.cpp
+        modules/shared.h
+        modules/shared.cpp
 
-        tools/craplog/craplog.h
-        tools/craplog/craplog.cpp
-        tools/craplog/modules/datetime.h
-        tools/craplog/modules/datetime.cpp
-        tools/craplog/modules/formats.h
-        tools/craplog/modules/formats.cpp
-        tools/craplog/modules/hash.h
-        tools/craplog/modules/hash.cpp
-        tools/craplog/modules/logs.h
-        tools/craplog/modules/logs.cpp
-        tools/craplog/modules/sha256.h
-        tools/craplog/modules/sha256.cpp
-        tools/craplog/modules/store.h
-        tools/craplog/modules/store.cpp
+        modules/craplog/craplog.h
+        modules/craplog/craplog.cpp
+        modules/craplog/modules/datetime.h
+        modules/craplog/modules/datetime.cpp
+        modules/craplog/modules/donuts.h
+        modules/craplog/modules/donuts.cpp
+        modules/craplog/modules/formats.h
+        modules/craplog/modules/formats.cpp
+        modules/craplog/modules/hash.h
+        modules/craplog/modules/hash.cpp
+        modules/craplog/modules/logs.h
+        modules/craplog/modules/logs.cpp
+        modules/craplog/modules/sha256.h
+        modules/craplog/modules/sha256.cpp
+        modules/craplog/modules/store.h
+        modules/craplog/modules/store.cpp
 
-        tools/crapview/crapview.h
-        tools/crapview/crapview.cpp
-        tools/crapview/modules/query.h
-        tools/crapview/modules/query.cpp
+        modules/crapview/crapview.h
+        modules/crapview/crapview.cpp
+        modules/crapview/modules/query.h
+        modules/crapview/modules/query.cpp
 
-        tools/craphelp/craphelp.ui
-        tools/craphelp/craphelp.h
-        tools/craphelp/craphelp.cpp
+        modules/craphelp/craphelp.ui
+        modules/craphelp/craphelp.h
+        modules/craphelp/craphelp.cpp
 
-        tools/crapup/crapup.h
-        tools/crapup/crapup.cpp
+        modules/crapup/crapup.h
+        modules/crapup/crapup.cpp
+
+        modules/crapinfo/crapinfo.ui
+        modules/crapinfo/crapinfo.h
+        modules/crapinfo/crapinfo.cpp
 
         tools/crapnote/crapnote.ui
         tools/crapnote/crapnote.h
         tools/crapnote/crapnote.cpp
 
-        tools/crapinfo/crapinfo.ui
-        tools/crapinfo/crapinfo.h
-        tools/crapinfo/crapinfo.cpp
-
         resources/resources.qrc
         ${TS_FILES}
 )

logdoctor/mainwindow.h

@@ -14,23 +14,25 @@
 
 #include <thread>
 
+#include "utilities/checks.h"
 #include "utilities/colors.h"
 #include "utilities/io.h"
 #include "utilities/rtf.h"
 #include "utilities/strings.h"
 #include "utilities/vectors.h"
 
-#include "modules/checks.h"
 #include "modules/dialogs.h"
 #include "modules/tb.h"
 
-#include "tools/shared.h"
-#include "tools/craplog/craplog.h"
-#include "tools/crapview/crapview.h"
-#include "tools/craphelp/craphelp.h"
-#include "tools/crapup/crapup.h"
+#include "modules/shared.h"
+#include "modules/craplog/craplog.h"
+#include "modules/crapview/crapview.h"
+#include "modules/craphelp/craphelp.h"
+#include "modules/crapup/crapup.h"
+#include "modules/crapinfo/crapinfo.h"
+
 #include "tools/crapnote/crapnote.h"
-#include "tools/crapinfo/crapinfo.h"
+
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }

logdoctor/modules/craplog/craplog.cpp

@@ -1,16 +1,16 @@
 
 #include "craplog.h"
 
-#include "modules/checks.h"
-#include "modules/charts/donuts.h"
-#include "modules/exceptions.h"
-#include "modules/dialogs.h"
-
+#include "utilities/checks.h"
 #include "utilities/gzip.h"
 #include "utilities/io.h"
 
-#include "tools/shared.h"
-#include "tools/craplog/modules/store.h"
+#include "modules/dialogs.h"
+#include "modules/exceptions.h"
+#include "modules/shared.h"
+
+#include "modules/craplog/modules/donuts.h"
+#include "modules/craplog/modules/store.h"
 
 #include <QPainter>
 

logdoctor/modules/craplog/craplog.h

@@ -7,9 +7,9 @@
 #include <QMainWindow>
 #include <QtCharts>
 
-#include "tools/craplog/modules/formats.h"
-#include "tools/craplog/modules/hash.h"
-#include "tools/craplog/modules/logs.h"
+#include "modules/craplog/modules/formats.h"
+#include "modules/craplog/modules/hash.h"
+#include "modules/craplog/modules/logs.h"
 
 
 class Craplog

logdoctor/modules/craplog/modules/datetime.cpp

@@ -4,7 +4,7 @@
 #include "modules/exceptions.h"
 #include "utilities/strings.h"
 
-#include "time.h"
+#include <ctime>
 
 
 DateTimeOps::DateTimeOps()

logdoctor/modules/craplog/modules/hash.cpp

@@ -1,14 +1,14 @@
 
 #include "hash.h"
 
-#include "modules/dialogs.h"
-#include "modules/exceptions.h"
 
 #include "utilities/gzip.h"
 #include "utilities/io.h"
 #include "utilities/vectors.h"
 
-#include "tools/craplog/modules/sha256.h"
+#include "modules/dialogs.h"
+#include "modules/exceptions.h"
+#include "modules/craplog/modules/sha256.h"
 
 
 
@@ -250,7 +250,7 @@ bool HashOps::insertUsedHashes( const std::string& db_path, const std::vector<st
                 }
                 if ( ! err_shown ) {
                     // show a message
-                    QString msg = QMessageBox::tr("An error occured while working on the database\n\nAborting");
+                    QString msg = DialogSec::tr("An error occured while working on the database\n\nAborting");
                     DialogSec::errGeneric( nullptr, msg );
                 }
             }

logdoctor/modules/craplog/modules/logs.cpp

@@ -1,9 +1,8 @@
 
 #include "logs.h"
 
-#include "datetime.h"
-
 #include "modules/exceptions.h"
+#include "modules/craplog/modules/datetime.h"
 
 
 LogOps::LogOps()

logdoctor/modules/craplog/modules/logs.h

@@ -6,7 +6,7 @@
 #include <unordered_map>
 
 #include "utilities/strings.h"
-#include "tools/craplog/modules/formats.h"
+#include "modules/craplog/modules/formats.h"
 
 
 class LogOps

logdoctor/modules/craplog/modules/store.h

@@ -1,7 +1,7 @@
 #ifndef STORE_H
 #define STORE_H
 
-#include "tools/craplog/craplog.h"
+#include "modules/craplog/craplog.h"
 
 
 class StoreOps

logdoctor/modules/crapup/crapup.h

@@ -2,7 +2,6 @@
 #define CRAPUP_H
 
 #include <string>
-#include <tuple>
 
 
 class Crapup

logdoctor/modules/crapview/crapview.cpp

@@ -1,5 +1,6 @@
 
 #include "crapview.h"
+
 #include "utilities/strings.h"
 
 #include <QGraphicsItem>

logdoctor/modules/crapview/crapview.h

@@ -5,7 +5,7 @@
 #include <QtCharts>
 #include <QTableWidget>
 
-#include "tools/crapview/modules/query.h"
+#include "modules/crapview/modules/query.h"
 
 #include <string>
 

logdoctor/modules/crapview/modules/query.h

@@ -1,10 +1,9 @@
 #ifndef QUERY_H
 #define QUERY_H
 
-#include "tools/shared.h"
+#include "modules/shared.h"
 
 #include <QString>
-#include <QHash>
 
 #include <vector>
 #include <unordered_map>

logdoctor/modules/dialogs.cpp

@@ -1,6 +1,7 @@
 
 #include "dialogs.h"
-#include "mainwindow.h"
+
+#include <QMessageBox>
 
 
 DialogSec::DialogSec()

logdoctor/modules/dialogs.h

@@ -3,7 +3,6 @@
 
 #include <QWidget>
 #include <QString>
-#include <QMessageBox>
 
 #include <string>
 

logdoctor/modules/shared.cpp

@@ -1,5 +1,7 @@
+
 #include "shared.h"
 
+
 TR::TR(QObject *parent)
     : QObject{parent}
 {

logdoctor/modules/tb.h

@@ -1,8 +1,7 @@
 #ifndef LOGFILESTB_H
 #define LOGFILESTB_H
 
-
-#include "qfont.h"
+#include <QFont>
 
 
 class TextBrowser

logdoctor/utilities/checks.cpp

@@ -5,6 +5,10 @@
 
 #include "utilities/io.h"
 
+#include <QSqlQuery>
+#include <QSqlError>
+#include <QVariant>
+
 
 CheckSec::CheckSec()
 {

logdoctor/utilities/checks.h

@@ -1,7 +1,11 @@
 #ifndef CHECKS_H
 #define CHECKS_H
 
-#include "tools/craplog/craplog.h"
+#include <QString>
+#include <QSqlDatabase>
+
+#include <string>
+#include <vector>
 
 
 class CheckSec

logdoctor/utilities/gzip.cpp

@@ -3,9 +3,7 @@
 
 #include "modules/exceptions.h"
 
-//#include <stdio.h>
-//#include <stdlib.h>
-#include <string.h>
+#include <string>
 #include <errno.h>
 #include <zlib.h>
 

logdoctor/utilities/rtf.h

@@ -1,14 +1,13 @@
 #ifndef RTF_H
 #define RTF_H
 
-#include "qfont.h"
-#include "qstring.h"
+#include <QFont>
+#include <QString>
 
 #include "utilities/strings.h"
 
 #include "modules/tb.h"
-
-#include "tools/craplog/modules/formats.h"
+#include "modules/craplog/modules/formats.h"
 
 
 class RichText : public QObject