Rearrange source file locations

36 files changed, 75 insertions, 64 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f69e5b..35125b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,49 +56,65 @@ foreach(X ${qt_components})
 	list(APPEND qt_libraries "Qt${QT_VERSION_MAJOR}::${X}")
 endforeach()
 
-set(project_sources
-	"src/addEntryForm.cpp"
-	"src/addGroupForm.cpp"
+set(project_sources_frontend
+	"src/frontend/qtwidgets/addEntryForm.cpp"
+	"src/frontend/qtwidgets/addGroupForm.cpp"
+	"src/frontend/qtwidgets/assignmentList.cpp"
+	"src/frontend/qtwidgets/editGroupForm.cpp"
+	"src/frontend/qtwidgets/editEntryForm.cpp"
+	"src/frontend/qtwidgets/entry.cpp"
+	"src/frontend/qtwidgets/entryLayout.cpp"
+	"src/frontend/qtwidgets/group.cpp"
+	"src/frontend/qtwidgets/groupLayout.cpp"
+	"src/frontend/qtwidgets/lib.cpp"
+	"src/frontend/qtwidgets/main.cpp"
+	"src/frontend/qtwidgets/preferencesDialog.cpp"
+	"src/frontend/qtwidgets/rule.cpp"
+	"src/frontend/qtwidgets/ruleLayout.cpp"
+	"src/frontend/qtwidgets/rulesDialog.cpp"
+)
+
+set(project_sources_backend
 	"src/backend/db_sqlite.cpp"
-	"src/assignmentList.cpp"
-	"src/editGroupForm.cpp"
-	"src/editEntryForm.cpp"
-	"src/entry.cpp"
-	"src/entryLayout.cpp"
-	"src/group.cpp"
-	"src/groupLayout.cpp"
-	"src/lib.cpp"
-	"src/main.cpp"
-	"src/preferencesDialog.cpp"
-	"src/rule.cpp"
-	"src/ruleLayout.cpp"
-	"src/rulesDialog.cpp"
 )
 
-set(project_headers
-	"src/addEntryForm.h"
-	"src/addGroupForm.h"
+set(project_sources
+	${project_sources_frontend}
+	${project_sources_backend}
+)
+
+set(project_headers_frontend
+	"src/frontend/qtwidgets/addEntryForm.h"
+	"src/frontend/qtwidgets/addGroupForm.h"
+	"src/frontend/qtwidgets/assignmentList.h"
+	"src/frontend/qtwidgets/editGroupForm.h"
+	"src/frontend/qtwidgets/editEntryForm.h"
+	"src/frontend/qtwidgets/entry.h"
+	"src/frontend/qtwidgets/entryLayout.h"
+	"src/frontend/qtwidgets/group.h"
+	"src/frontend/qtwidgets/groupLayout.h"
+	"src/frontend/qtwidgets/lib.h"
+	"src/frontend/qtwidgets/preferencesDialog.h"
+	"src/frontend/qtwidgets/rule.h"
+	"src/frontend/qtwidgets/ruleLayout.h"
+	"src/frontend/qtwidgets/rulesDialog.h"
+)
+
+set(project_headers_backend
 	"src/backend/db_sqlite.h"
-	"src/assignmentList.h"
-	"src/editGroupForm.h"
-	"src/editEntryForm.h"
-	"src/entry.h"
-	"src/entryLayout.h"
-	"src/group.h"
-	"src/groupLayout.h"
-	"src/lib.h"
-	"src/preferencesDialog.h"
-	"src/rule.h"
-	"src/ruleLayout.h"
-	"src/rulesDialog.h"
+)
+
+set(project_headers
+	${project_headers_frontend}
+	${project_headers_backend}
 )
 
 set(project_uis
-	"src/assignmentList.ui"
-	"src/entryForm.ui"
-	"src/groupForm.ui"
-	"src/preferencesDialog.ui"
-	"src/rulesDialog.ui"
+	"src/frontend/qtwidgets/assignmentList.ui"
+	"src/frontend/qtwidgets/entryForm.ui"
+	"src/frontend/qtwidgets/groupForm.ui"
+	"src/frontend/qtwidgets/preferencesDialog.ui"
+	"src/frontend/qtwidgets/rulesDialog.ui"
 )
 
 set(project_misc
@@ -106,22 +122,23 @@ set(project_misc
 	"src/icon/assignment-list.rc"
 )
 
+set(project_sources_full
+	${project_sources}
+	${project_headers}
+	${project_uis}
+	${project_misc}
+)
+
 configure_file(config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h @ONLY)
 
 #add_executable(assignment-list
-#	${project_sources}
-#	${project_headers}
-#	${project_uis}
-#	${project_misc}
+#	${project_sources_full}
 #)
 
 if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
     qt_add_executable(assignment-list
         MANUAL_FINALIZATION
-        ${project_sources}
-		${project_headers}
-		${project_uis}
-		${project_misc}
+		${project_sources_full}
     )
 # Define target properties for Android with Qt 6 as:
 #    set_property(TARGET qt_quick_hello APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
@@ -130,19 +147,13 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
 else()
     if(ANDROID)
         add_library(assignment-list SHARED
-			${project_sources}
-			${project_headers}
-			${project_uis}
-			${project_misc}
+			${project_sources_full}
         )
 # Define properties for Android with Qt 5 after find_package() calls as:
 #    set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
     else()
         add_executable(assignment-list
-			${project_sources}
-			${project_headers}
-			${project_uis}
-			${project_misc}
+			${project_sources_full}
         )
     endif()
 endif()
diff --git a/src/backend/db_sqlite.h b/src/backend/db_sqlite.h
index b23f208..51c9e64 100644
--- a/src/backend/db_sqlite.h
+++ b/src/backend/db_sqlite.h
@@ -5,9 +5,9 @@
 #include <QStringList>
 #include <qsqldatabase.h>
 
-#include "../entry.h"
-#include "../group.h"
-#include "../rule.h"
+#include "../frontend/qtwidgets/entry.h"
+#include "../frontend/qtwidgets/group.h"
+#include "../frontend/qtwidgets/rule.h"
 
 class BackendDB : QSqlDatabase {
 	public:
diff --git a/src/addEntryForm.cpp b/src/frontend/qtwidgets/addEntryForm.cpp
index adca32e..7402167 100644
--- a/src/addEntryForm.cpp
+++ b/src/frontend/qtwidgets/addEntryForm.cpp
@@ -3,7 +3,7 @@
 #include <QString>
 
 #include "addEntryForm.h"
-#include "backend/db_sqlite.h"
+#include "../../backend/db_sqlite.h"
 
 AddEntryForm::AddEntryForm(const Group &g) :
 	parent_group(g)
diff --git a/src/addEntryForm.h b/src/frontend/qtwidgets/addEntryForm.h
index 81535f1..81535f1 100644
--- a/src/addEntryForm.h
+++ b/src/frontend/qtwidgets/addEntryForm.h
diff --git a/src/addGroupForm.cpp b/src/frontend/qtwidgets/addGroupForm.cpp
index 06e1f7c..c7d5faa 100644
--- a/src/addGroupForm.cpp
+++ b/src/frontend/qtwidgets/addGroupForm.cpp
@@ -1,7 +1,7 @@
 #include <QMessageBox>
 
 #include "addGroupForm.h"
-#include "backend/db_sqlite.h"
+#include "../../backend/db_sqlite.h"
 
 AddGroupForm::AddGroupForm() {
 	// load uic
diff --git a/src/addGroupForm.h b/src/frontend/qtwidgets/addGroupForm.h
index b181408..b181408 100644
--- a/src/addGroupForm.h
+++ b/src/frontend/qtwidgets/addGroupForm.h
diff --git a/src/assignmentList.cpp b/src/frontend/qtwidgets/assignmentList.cpp
index 270eba6..dc89544 100644
--- a/src/assignmentList.cpp
+++ b/src/frontend/qtwidgets/assignmentList.cpp
@@ -14,10 +14,10 @@
 #include <QDebug>
 #include <QErrorMessage>
 
-#include "../config.h"
+#include "../../../config.h"
 #include "addGroupForm.h"
 #include "assignmentList.h"
-#include "backend/db_sqlite.h"
+#include "../../backend/db_sqlite.h"
 #include "entryLayout.h"
 #include "groupLayout.h"
 #include "lib.h"
diff --git a/src/assignmentList.h b/src/frontend/qtwidgets/assignmentList.h
index 4b792fa..4b792fa 100644
--- a/src/assignmentList.h
+++ b/src/frontend/qtwidgets/assignmentList.h
diff --git a/src/assignmentList.ui b/src/frontend/qtwidgets/assignmentList.ui
index 60c66da..60c66da 100644
--- a/src/assignmentList.ui
+++ b/src/frontend/qtwidgets/assignmentList.ui
diff --git a/src/editEntryForm.cpp b/src/frontend/qtwidgets/editEntryForm.cpp
index a36afa7..ca788ca 100644
--- a/src/editEntryForm.cpp
+++ b/src/frontend/qtwidgets/editEntryForm.cpp
@@ -1,6 +1,6 @@
 #include <QMessageBox>
 
-#include "backend/db_sqlite.h"
+#include "../../backend/db_sqlite.h"
 #include "editEntryForm.h"
 
 EditEntryForm::EditEntryForm(const Entry &e) :
diff --git a/src/editEntryForm.h b/src/frontend/qtwidgets/editEntryForm.h
index 6231478..6231478 100644
--- a/src/editEntryForm.h
+++ b/src/frontend/qtwidgets/editEntryForm.h
diff --git a/src/editGroupForm.cpp b/src/frontend/qtwidgets/editGroupForm.cpp
index 52c45ac..fa17467 100644
--- a/src/editGroupForm.cpp
+++ b/src/frontend/qtwidgets/editGroupForm.cpp
@@ -1,6 +1,6 @@
 #include <QMessageBox>
 
-#include "backend/db_sqlite.h"
+#include "../../backend/db_sqlite.h"
 #include "editGroupForm.h"
 
 EditGroupForm::EditGroupForm(const Group &g) :
diff --git a/src/editGroupForm.h b/src/frontend/qtwidgets/editGroupForm.h
index e04b46e..e04b46e 100644
--- a/src/editGroupForm.h
+++ b/src/frontend/qtwidgets/editGroupForm.h
diff --git a/src/entry.cpp b/src/frontend/qtwidgets/entry.cpp
index c95bbb0..c95bbb0 100644
--- a/src/entry.cpp
+++ b/src/frontend/qtwidgets/entry.cpp
diff --git a/src/entry.h b/src/frontend/qtwidgets/entry.h
index 294df7b..294df7b 100644
--- a/src/entry.h
+++ b/src/frontend/qtwidgets/entry.h
diff --git a/src/entryForm.ui b/src/frontend/qtwidgets/entryForm.ui
index bce8ce3..bce8ce3 100644
--- a/src/entryForm.ui
+++ b/src/frontend/qtwidgets/entryForm.ui
diff --git a/src/entryLayout.cpp b/src/frontend/qtwidgets/entryLayout.cpp
index 121426e..578ec23 100644
--- a/src/entryLayout.cpp
+++ b/src/frontend/qtwidgets/entryLayout.cpp
@@ -3,7 +3,7 @@
 
 #include <QDebug>
 
-#include "backend/db_sqlite.h"
+#include "../../backend/db_sqlite.h"
 #include "editEntryForm.h"
 #include "entryLayout.h"
 #include "lib.h"
diff --git a/src/entryLayout.h b/src/frontend/qtwidgets/entryLayout.h
index 54e523f..54e523f 100644
--- a/src/entryLayout.h
+++ b/src/frontend/qtwidgets/entryLayout.h
diff --git a/src/group.cpp b/src/frontend/qtwidgets/group.cpp
index ddb3b13..ddb3b13 100644
--- a/src/group.cpp
+++ b/src/frontend/qtwidgets/group.cpp
diff --git a/src/group.h b/src/frontend/qtwidgets/group.h
index 9c7bfa4..9c7bfa4 100644
--- a/src/group.h
+++ b/src/frontend/qtwidgets/group.h
diff --git a/src/groupForm.ui b/src/frontend/qtwidgets/groupForm.ui
index 4f58e1d..4f58e1d 100644
--- a/src/groupForm.ui
+++ b/src/frontend/qtwidgets/groupForm.ui
diff --git a/src/groupLayout.cpp b/src/frontend/qtwidgets/groupLayout.cpp
index e99ddf6..e67d3a5 100644
--- a/src/groupLayout.cpp
+++ b/src/frontend/qtwidgets/groupLayout.cpp
@@ -5,7 +5,7 @@
 #include <QDebug>
 
 #include "addEntryForm.h"
-#include "backend/db_sqlite.h"
+#include "../../backend/db_sqlite.h"
 #include "editGroupForm.h"
 #include "groupLayout.h"
 #include "lib.h"
diff --git a/src/groupLayout.h b/src/frontend/qtwidgets/groupLayout.h
index cfd33cf..cfd33cf 100644
--- a/src/groupLayout.h
+++ b/src/frontend/qtwidgets/groupLayout.h
diff --git a/src/lib.cpp b/src/frontend/qtwidgets/lib.cpp
index 2290472..2290472 100644
--- a/src/lib.cpp
+++ b/src/frontend/qtwidgets/lib.cpp
diff --git a/src/lib.h b/src/frontend/qtwidgets/lib.h
index 14f63c1..14f63c1 100644
--- a/src/lib.h
+++ b/src/frontend/qtwidgets/lib.h
diff --git a/src/main.cpp b/src/frontend/qtwidgets/main.cpp
index f7d69ee..f7d69ee 100644
--- a/src/main.cpp
+++ b/src/frontend/qtwidgets/main.cpp
diff --git a/src/preferencesDialog.cpp b/src/frontend/qtwidgets/preferencesDialog.cpp
index d3b3dff..d3b3dff 100644
--- a/src/preferencesDialog.cpp
+++ b/src/frontend/qtwidgets/preferencesDialog.cpp
diff --git a/src/preferencesDialog.h b/src/frontend/qtwidgets/preferencesDialog.h
index ac9b88e..ac9b88e 100644
--- a/src/preferencesDialog.h
+++ b/src/frontend/qtwidgets/preferencesDialog.h
diff --git a/src/preferencesDialog.ui b/src/frontend/qtwidgets/preferencesDialog.ui
index 343ba33..343ba33 100644
--- a/src/preferencesDialog.ui
+++ b/src/frontend/qtwidgets/preferencesDialog.ui
diff --git a/src/rule.cpp b/src/frontend/qtwidgets/rule.cpp
index 85da13a..85da13a 100644
--- a/src/rule.cpp
+++ b/src/frontend/qtwidgets/rule.cpp
diff --git a/src/rule.h b/src/frontend/qtwidgets/rule.h
index cf9abfe..cf9abfe 100644
--- a/src/rule.h
+++ b/src/frontend/qtwidgets/rule.h
diff --git a/src/ruleLayout.cpp b/src/frontend/qtwidgets/ruleLayout.cpp
index 11abf80..11abf80 100644
--- a/src/ruleLayout.cpp
+++ b/src/frontend/qtwidgets/ruleLayout.cpp
diff --git a/src/ruleLayout.h b/src/frontend/qtwidgets/ruleLayout.h
index 29a4deb..29a4deb 100644
--- a/src/ruleLayout.h
+++ b/src/frontend/qtwidgets/ruleLayout.h
diff --git a/src/rulesDialog.cpp b/src/frontend/qtwidgets/rulesDialog.cpp
index 7d5705e..cd62342 100644
--- a/src/rulesDialog.cpp
+++ b/src/frontend/qtwidgets/rulesDialog.cpp
@@ -4,7 +4,7 @@
 
 #include <QDebug>
 
-#include "backend/db_sqlite.h"
+#include "../../backend/db_sqlite.h"
 #include "lib.h"
 #include "ruleLayout.h"
 #include "rulesDialog.h"
diff --git a/src/rulesDialog.h b/src/frontend/qtwidgets/rulesDialog.h
index 7e74dc2..7e74dc2 100644
--- a/src/rulesDialog.h
+++ b/src/frontend/qtwidgets/rulesDialog.h
diff --git a/src/rulesDialog.ui b/src/frontend/qtwidgets/rulesDialog.ui
index c362887..c362887 100644
--- a/src/rulesDialog.ui
+++ b/src/frontend/qtwidgets/rulesDialog.ui