From 6a97ad664b9442dd0c7ad130038756b83d4f82b7 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Wed, 9 Oct 2024 09:18:25 -0500 Subject: [PATCH] fix --- .../librepertory/include/file_manager/file_manager.hpp | 2 +- .../include/providers/encrypt/encrypt_provider.hpp | 2 +- repertory/librepertory/include/providers/meta_db.hpp | 8 ++++---- .../librepertory/src/file_manager/file_manager.cpp | 10 +++++----- .../src/providers/encrypt/encrypt_provider.cpp | 8 ++++---- repertory/librepertory/src/providers/meta_db.cpp | 8 ++++---- repertory/repertory_test/src/database_test.cpp | 10 +++++----- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/repertory/librepertory/include/file_manager/file_manager.hpp b/repertory/librepertory/include/file_manager/file_manager.hpp index 0f265f23..ced7cb0c 100644 --- a/repertory/librepertory/include/file_manager/file_manager.hpp +++ b/repertory/librepertory/include/file_manager/file_manager.hpp @@ -22,7 +22,6 @@ #ifndef INCLUDE_FILE_MANAGER_FILE_MANAGER_HPP_ #define INCLUDE_FILE_MANAGER_FILE_MANAGER_HPP_ -#include "database/db_common.hpp" #include "events/event_system.hpp" #include "events/events.hpp" #include "file_manager/i_file_manager.hpp" @@ -30,6 +29,7 @@ #include "file_manager/i_upload_manager.hpp" #include "platform/platform.hpp" #include "types/repertory.hpp" +#include "utils/db/sqlite/db_common.hpp" #include "utils/file.hpp" namespace repertory { diff --git a/repertory/librepertory/include/providers/encrypt/encrypt_provider.hpp b/repertory/librepertory/include/providers/encrypt/encrypt_provider.hpp index fd9c9cc8..c8898556 100644 --- a/repertory/librepertory/include/providers/encrypt/encrypt_provider.hpp +++ b/repertory/librepertory/include/providers/encrypt/encrypt_provider.hpp @@ -23,8 +23,8 @@ #define INCLUDE_PROVIDERS_ENCRYPT_ENCRYPT_PROVIDER_HPP_ #include "app_config.hpp" -#include "database/db_common.hpp" #include "providers/i_provider.hpp" +#include "utils/db/sqlite/db_common.hpp" #include "utils/encrypting_reader.hpp" namespace repertory { diff --git a/repertory/librepertory/include/providers/meta_db.hpp b/repertory/librepertory/include/providers/meta_db.hpp index 977adcf9..db18f729 100644 --- a/repertory/librepertory/include/providers/meta_db.hpp +++ b/repertory/librepertory/include/providers/meta_db.hpp @@ -22,8 +22,8 @@ #ifndef INCLUDE_PROVIDERS_META_DB_HPP_ #define INCLUDE_PROVIDERS_META_DB_HPP_ -#include "database/db_common.hpp" #include "types/repertory.hpp" +#include "utils/db/sqlite/db_common.hpp" namespace repertory { class app_config; @@ -68,9 +68,9 @@ public: [[nodiscard]] auto remove_item_meta(const std::string &api_path, const std::string &key) -> api_error; - [[nodiscard]] auto rename_item_meta(const std::string &from_api_path, - const std::string &to_api_path) - -> api_error; + [[nodiscard]] auto + rename_item_meta(const std::string &from_api_path, + const std::string &to_api_path) -> api_error; [[nodiscard]] auto set_item_meta(const std::string &api_path, const std::string &key, diff --git a/repertory/librepertory/src/file_manager/file_manager.cpp b/repertory/librepertory/src/file_manager/file_manager.cpp index 4fd39257..488f8122 100644 --- a/repertory/librepertory/src/file_manager/file_manager.cpp +++ b/repertory/librepertory/src/file_manager/file_manager.cpp @@ -22,16 +22,16 @@ #include "file_manager/file_manager.hpp" #include "app_config.hpp" -#include "database/db_common.hpp" -#include "database/db_delete.hpp" -#include "database/db_insert.hpp" -#include "database/db_select.hpp" -#include "database/db_update.hpp" #include "file_manager/events.hpp" #include "providers/i_provider.hpp" #include "types/repertory.hpp" #include "types/startup_exception.hpp" #include "utils/common.hpp" +#include "utils/db/sqlite/db_common.hpp" +#include "utils/db/sqlite/db_delete.hpp" +#include "utils/db/sqlite/db_insert.hpp" +#include "utils/db/sqlite/db_select.hpp" +#include "utils/db/sqlite/db_update.hpp" #include "utils/encrypting_reader.hpp" #include "utils/error_utils.hpp" #include "utils/file.hpp" diff --git a/repertory/librepertory/src/providers/encrypt/encrypt_provider.cpp b/repertory/librepertory/src/providers/encrypt/encrypt_provider.cpp index e684ad04..b6e981da 100644 --- a/repertory/librepertory/src/providers/encrypt/encrypt_provider.cpp +++ b/repertory/librepertory/src/providers/encrypt/encrypt_provider.cpp @@ -21,14 +21,14 @@ */ #include "providers/encrypt/encrypt_provider.hpp" -#include "database/db_common.hpp" -#include "database/db_delete.hpp" -#include "database/db_insert.hpp" -#include "database/db_select.hpp" #include "events/event_system.hpp" #include "events/events.hpp" #include "types/repertory.hpp" #include "utils/collection.hpp" +#include "utils/db/sqlite/db_common.hpp" +#include "utils/db/sqlite/db_delete.hpp" +#include "utils/db/sqlite/db_insert.hpp" +#include "utils/db/sqlite/db_select.hpp" #include "utils/encrypting_reader.hpp" #include "utils/encryption.hpp" #include "utils/file_utils.hpp" diff --git a/repertory/librepertory/src/providers/meta_db.cpp b/repertory/librepertory/src/providers/meta_db.cpp index 4321f2d4..3fb3d7b3 100644 --- a/repertory/librepertory/src/providers/meta_db.cpp +++ b/repertory/librepertory/src/providers/meta_db.cpp @@ -22,10 +22,10 @@ #include "providers/meta_db.hpp" #include "app_config.hpp" -#include "database/db_common.hpp" -#include "database/db_delete.hpp" -#include "database/db_insert.hpp" -#include "database/db_select.hpp" +#include "utils/db/sqlite/db_common.hpp" +#include "utils/db/sqlite/db_delete.hpp" +#include "utils/db/sqlite/db_insert.hpp" +#include "utils/db/sqlite/db_select.hpp" #include "utils/error_utils.hpp" #include "utils/path.hpp" #include "utils/string.hpp" diff --git a/repertory/repertory_test/src/database_test.cpp b/repertory/repertory_test/src/database_test.cpp index fa812b97..89226fb3 100644 --- a/repertory/repertory_test/src/database_test.cpp +++ b/repertory/repertory_test/src/database_test.cpp @@ -21,11 +21,11 @@ */ #include "test_common.hpp" -#include "database/db_common.hpp" -#include "database/db_delete.hpp" -#include "database/db_insert.hpp" -#include "database/db_select.hpp" -#include "database/db_update.hpp" +#include "utils/db/sqlite/db_common.hpp" +#include "utils/db/sqlite/db_delete.hpp" +#include "utils/db/sqlite/db_insert.hpp" +#include "utils/db/sqlite/db_select.hpp" +#include "utils/db/sqlite/db_update.hpp" #include "utils/path.hpp" namespace repertory {