diff --git a/middleware/FilesManager/src/FilesDatabase.h b/middleware/FilesManager/src/FilesDatabase.h index 0cc2f04..55b91c7 100644 --- a/middleware/FilesManager/src/FilesDatabase.h +++ b/middleware/FilesManager/src/FilesDatabase.h @@ -14,9 +14,9 @@ */ #ifndef FILES_DATABASE_H #define FILES_DATABASE_H -#include "StatusCode.h" #include "FilesHandle.h" #include "IFilesManager.h" +#include "StatusCode.h" class FilesDatabase : public FilesHandle { public: diff --git a/middleware/FilesManager/src/FilesHandle.cpp b/middleware/FilesManager/src/FilesHandle.cpp index 14f2177..5c32924 100644 --- a/middleware/FilesManager/src/FilesHandle.cpp +++ b/middleware/FilesManager/src/FilesHandle.cpp @@ -14,17 +14,14 @@ */ #include "FilesHandle.h" #include "ILog.h" -#include #include #include #include #include -#include #include #include #include -#include -#include +#include std::string FilesHandle::CreateFilePathName(const std::string &sourceFile) { const std::string ERROR_SUFFIX = ""; diff --git a/middleware/FilesManager/src/FilesManagerImpl.cpp b/middleware/FilesManager/src/FilesManagerImpl.cpp index aa3dc8f..d459663 100644 --- a/middleware/FilesManager/src/FilesManagerImpl.cpp +++ b/middleware/FilesManager/src/FilesManagerImpl.cpp @@ -13,7 +13,10 @@ * limitations under the License. */ #include "FilesManagerImpl.h" -#include "IStorageManager.h" +#include "IFilesManager.h" +// #include "IStorageManager.h" +#include "FilesDatabase.h" +#include "StatusCode.h" StatusCode FilesManagerImpl::Init(void) { FilesDatabase::Init(); diff --git a/middleware/FilesManager/src/FilesManagerMakePtr.cpp b/middleware/FilesManager/src/FilesManagerMakePtr.cpp index 0ced43b..2b87076 100644 --- a/middleware/FilesManager/src/FilesManagerMakePtr.cpp +++ b/middleware/FilesManager/src/FilesManagerMakePtr.cpp @@ -13,8 +13,11 @@ * limitations under the License. */ #include "FilesManagerMakePtr.h" -#include "ILog.h" #include "FilesManagerImpl.h" +#include "IFilesManager.h" +#include "ILog.h" +#include "StatusCode.h" +#include bool CreateFilesManagerModule(void) { auto instance = std::make_shared(); diff --git a/middleware/FilesManager/src/IFilesManager.cpp b/middleware/FilesManager/src/IFilesManager.cpp index c65e86d..1fa17a4 100644 --- a/middleware/FilesManager/src/IFilesManager.cpp +++ b/middleware/FilesManager/src/IFilesManager.cpp @@ -14,6 +14,9 @@ */ #include "IFilesManager.h" #include "ILog.h" +#include "StatusCode.h" +#include +#include save_file_info::save_file_info(const std::string &fileName) : mFileName(fileName) { } diff --git a/middleware/FilesManager/src/sqlite3/FilesDatabase.cpp b/middleware/FilesManager/src/sqlite3/FilesDatabase.cpp index 1c19e0d..17c7c74 100644 --- a/middleware/FilesManager/src/sqlite3/FilesDatabase.cpp +++ b/middleware/FilesManager/src/sqlite3/FilesDatabase.cpp @@ -13,9 +13,13 @@ * limitations under the License. */ #include "FilesDatabase.h" +#include "FilesHandle.h" +#include "IFilesManager.h" #include "ILog.h" #include "IStorageManager.h" #include "SqliteHandle.h" +#include "StatusCode.h" +#include void FilesDatabase::Init(void) { SqliteHandle::GetInstance()->Init(); diff --git a/middleware/FilesManager/src/sqlite3/SqliteHandle.cpp b/middleware/FilesManager/src/sqlite3/SqliteHandle.cpp index f67be8f..3d184c5 100644 --- a/middleware/FilesManager/src/sqlite3/SqliteHandle.cpp +++ b/middleware/FilesManager/src/sqlite3/SqliteHandle.cpp @@ -15,6 +15,8 @@ #include "SqliteHandle.h" #include "ILog.h" #include "sqlite3.h" +#include +#include std::shared_ptr &SqliteHandle::GetInstance(std::shared_ptr *impl) { static auto instance = std::make_shared(); @@ -31,7 +33,7 @@ std::shared_ptr &SqliteHandle::GetInstance(std::shared_ptr