Rename TransactionsModel to MainDatabase

6 files changed, 32 insertions, 32 deletions

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 040eaac..520210d 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -33,11 +33,11 @@ set(ENTRYPOINT_MODULE_SOURCES
 )
 
 add_source_group(MODEL_MODULE_SOURCES
+	src/Model/Database.cpp
 	src/Model/Filter.cpp
 	src/Model/GlobalStates.cpp
 	src/Model/Items.cpp
 	src/Model/Project.cpp
-	src/Model/TransactionsModel.cpp
 )
 
 add_source_group(MODEL_TEMPLATE_SOURCES
diff --git a/core/src/Model/TransactionsModel.cpp b/core/src/Model/Database.cpp
index 7d53f89..569b949 100644
--- a/core/src/Model/TransactionsModel.cpp
+++ b/core/src/Model/Database.cpp
@@ -1,4 +1,4 @@
-#include "TransactionsModel.hpp"
+#include "Database.hpp"
 
 #include "Model/Project.hpp"
 
@@ -7,7 +7,7 @@
 
 namespace fs = std::filesystem;
 
-SalesTable::SalesTable(TransactionModel& db)
+SalesTable::SalesTable(MainDatabase& db)
 	// language=SQLite
 	: GetRowCount(db.GetSQLite(), "SELECT Count(*) FROM Sales")
 	// language=SQLite
@@ -17,7 +17,7 @@ SalesTable::SalesTable(TransactionModel& db)
 {
 }
 
-PurchasesTable::PurchasesTable(TransactionModel& db)
+PurchasesTable::PurchasesTable(MainDatabase& db)
 	// language=SQLite
 	: GetRowCount(db.GetSQLite(), "SELECT Count(*) FROM Purchases")
 	// language=SQLite
@@ -27,7 +27,7 @@ PurchasesTable::PurchasesTable(TransactionModel& db)
 {
 }
 
-DeliveryTable::DeliveryTable(TransactionModel& db)
+DeliveryTable::DeliveryTable(MainDatabase& db)
 	// language=SQLite
 	: FilterByTypeAndId(db.GetSQLite(), "SELECT * FROM Deliveries WHERE AssociatedOrder == ? AND Outgoing = ?")
 	// language=SQLite
@@ -45,7 +45,7 @@ static std::string GetDatabaseFilePath(const Project& project)
 }
 
 /// Wrapper for SQLite::Database that creates the default tables
-TransactionModel::DatabaseWrapper::DatabaseWrapper(TransactionModel& self)
+MainDatabase::DatabaseWrapper::DatabaseWrapper(MainDatabase& self)
 	: mSqlite(GetDatabaseFilePath(*self.mProject), SQLite::OPEN_READWRITE | SQLite::OPEN_CREATE)
 {
 	// If this table doesn't exist, the database probably just got initialized
@@ -113,7 +113,7 @@ CREATE TABLE IF NOT EXISTS DeliveriesItems(
 )""");
 }
 
-TransactionModel::TransactionModel(Project& project)
+MainDatabase::MainDatabase(Project& project)
 	: mProject{ &project }
 	, mDbWrapper(*this)
 	, mSales(*this)
@@ -122,42 +122,42 @@ TransactionModel::TransactionModel(Project& project)
 {
 }
 
-const SQLite::Database& TransactionModel::GetSQLite() const
+const SQLite::Database& MainDatabase::GetSQLite() const
 {
 	return mDbWrapper.mSqlite;
 }
 
-SQLite::Database& TransactionModel::GetSQLite()
+SQLite::Database& MainDatabase::GetSQLite()
 {
 	return mDbWrapper.mSqlite;
 }
 
-const SalesTable& TransactionModel::GetSales() const
+const SalesTable& MainDatabase::GetSales() const
 {
 	return mSales;
 }
 
-SalesTable& TransactionModel::GetSales()
+SalesTable& MainDatabase::GetSales()
 {
 	return mSales;
 }
 
-const PurchasesTable& TransactionModel::GetPurchases() const
+const PurchasesTable& MainDatabase::GetPurchases() const
 {
 	return mPurchases;
 }
 
-PurchasesTable& TransactionModel::GetPurchases()
+PurchasesTable& MainDatabase::GetPurchases()
 {
 	return mPurchases;
 }
 
-const DeliveryTable& TransactionModel::GetDeliveries() const
+const DeliveryTable& MainDatabase::GetDeliveries() const
 {
 	return mDeliveries;
 }
 
-DeliveryTable& TransactionModel::GetDeliveries()
+DeliveryTable& MainDatabase::GetDeliveries()
 {
 	return mDeliveries;
 }
diff --git a/core/src/Model/TransactionsModel.hpp b/core/src/Model/Database.hpp
index c9b33f1..90914a0 100644
--- a/core/src/Model/TransactionsModel.hpp
+++ b/core/src/Model/Database.hpp
@@ -24,7 +24,7 @@ public:
 	SQLite::Statement GetItems;
 
 public:
-	SalesTable(TransactionModel& db);
+	SalesTable(MainDatabase& db);
 };
 
 class PurchasesTable
@@ -35,7 +35,7 @@ public:
 	SQLite::Statement GetItems;
 
 public:
-	PurchasesTable(TransactionModel& db);
+	PurchasesTable(MainDatabase& db);
 };
 
 class DeliveryTable
@@ -45,18 +45,18 @@ public:
 	SQLite::Statement GetItems;
 
 public:
-	DeliveryTable(TransactionModel& db);
+	DeliveryTable(MainDatabase& db);
 };
 
 // TODO fuck SQLite::Statement has move ctor but not move assignment operator
-class TransactionModel
+class MainDatabase
 {
 private:
 	class DatabaseWrapper
 	{
 	public:
 		SQLite::Database mSqlite;
-		DatabaseWrapper(TransactionModel& self);
+		DatabaseWrapper(MainDatabase& self);
 	};
 
 	Project* mProject;
@@ -66,7 +66,7 @@ private:
 	DeliveryTable mDeliveries;
 
 public:
-	TransactionModel(Project& project);
+	MainDatabase(Project& project);
 
 	const SQLite::Database& GetSQLite() const;
 	SQLite::Database& GetSQLite();
diff --git a/core/src/Model/Project.hpp b/core/src/Model/Project.hpp
index 1eca09d..c971445 100644
--- a/core/src/Model/Project.hpp
+++ b/core/src/Model/Project.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "Model/Database.hpp"
 #include "Model/Items.hpp"
 #include "Model/Template/Template.hpp"
-#include "Model/TransactionsModel.hpp"
 #include "Model/Workflow/Workflow.hpp"
 
 #include <json/forwards.h>
@@ -25,9 +25,9 @@ private:
 	std::string mRootPathString;
 	std::string mName;
 
-	// This is put after the private fields, so that when TransactionModel's constructor runs, all of them will be initialized
+	// This is put after the private fields, so that when XxxDatabase's constructor runs, all of them will be initialized
 public:
-	TransactionModel Database;
+	MainDatabase Database;
 
 public:
 	/// Load the project from a directory containing the cplt_project.json file.
diff --git a/core/src/Model/Workflow/Values/Database.cpp b/core/src/Model/Workflow/Values/Database.cpp
index 12d2b80..cdc2b4f 100644
--- a/core/src/Model/Workflow/Values/Database.cpp
+++ b/core/src/Model/Workflow/Values/Database.cpp
@@ -1,6 +1,6 @@
 #include "Database.hpp"
 
-#include "Model/TransactionsModel.hpp"
+#include "Model/Database.hpp"
 #include "Model/Workflow/ValueInternals.hpp"
 
 #include <limits>
diff --git a/core/src/Model/fwd.hpp b/core/src/Model/fwd.hpp
index 8f6fc73..cb7c7dd 100644
--- a/core/src/Model/fwd.hpp
+++ b/core/src/Model/fwd.hpp
@@ -3,6 +3,13 @@
 #include "Model/Template/fwd.hpp"
 #include "Model/Workflow/fwd.hpp"
 
+// Database.hpp
+enum class TableKind;
+class SalesTable;
+class PurchasesTable;
+class DeliveryTable;
+class MainDatabase;
+
 // Assets.hpp
 
 // Filter.hpp
@@ -22,10 +29,3 @@ class CustomerItem;
 
 // Project.hpp
 class Project;
-
-// TransactionDatabase.hpp
-enum class TableKind;
-class SalesTable;
-class PurchasesTable;
-class DeliveryTable;
-class TransactionModel;