From 8c96a907588b5d6bdb227192fe03f2e35eab30a5 Mon Sep 17 00:00:00 2001 From: Wen liumin <254748404@qq.com> Date: Fri, 17 Jun 2022 15:44:17 +0800 Subject: [PATCH] Adjust header file reference order Signed-off-by: Wen liumin <904600657@qq.com> --- .../fileoper/ext_storage/ext_storage_subscriber.cpp | 5 +++-- services/src/fileoper/media_file_utils.cpp | 3 ++- services/src/server/file_manager_service.cpp | 4 ++-- services/src/server/file_manager_service_stub.cpp | 3 ++- services/test/client/file_manager_proxy_test.cpp | 5 ++--- services/test/server/file_manager_service_test.cpp | 12 ++++++------ 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/services/src/fileoper/ext_storage/ext_storage_subscriber.cpp b/services/src/fileoper/ext_storage/ext_storage_subscriber.cpp index 7211fc70..448b33e1 100644 --- a/services/src/fileoper/ext_storage/ext_storage_subscriber.cpp +++ b/services/src/fileoper/ext_storage/ext_storage_subscriber.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "ext_storage_subscriber.h" #include @@ -20,9 +21,9 @@ #include "bundle_info.h" #include "common_event_manager.h" #include "common_event_support.h" +#include "int_wrapper.h" #include "log.h" #include "string_wrapper.h" -#include "int_wrapper.h" #include "want.h" using namespace OHOS::AAFwk; @@ -93,4 +94,4 @@ bool ExtStorageSubscriber::CheckMountPoint(const std::string &path) } } } // namespace FileManagerService -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/src/fileoper/media_file_utils.cpp b/services/src/fileoper/media_file_utils.cpp index cfb8ed23..454e9204 100644 --- a/services/src/fileoper/media_file_utils.cpp +++ b/services/src/fileoper/media_file_utils.cpp @@ -16,8 +16,9 @@ #include "media_file_utils.h" #include -#include "datashare_values_bucket.h" + #include "datashare_predicates.h" +#include "datashare_values_bucket.h" #include "file_manager_service_def.h" #include "file_manager_service_errno.h" #include "log.h" diff --git a/services/src/server/file_manager_service.cpp b/services/src/server/file_manager_service.cpp index f1471a25..52525618 100644 --- a/services/src/server/file_manager_service.cpp +++ b/services/src/server/file_manager_service.cpp @@ -15,10 +15,10 @@ #include "file_manager_service.h" +#include "ext_storage/ext_storage_subscriber.h" #include "iservice_registry.h" #include "log.h" #include "system_ability_definition.h" -#include "ext_storage/ext_storage_subscriber.h" namespace OHOS { namespace FileManagerService { @@ -43,4 +43,4 @@ void FileManagerService::OnStop() DEBUG_LOG("FileManagerService OnStop"); } } // namespace FileManagerService -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/src/server/file_manager_service_stub.cpp b/services/src/server/file_manager_service_stub.cpp index 2cfc3d65..883e68c8 100644 --- a/services/src/server/file_manager_service_stub.cpp +++ b/services/src/server/file_manager_service_stub.cpp @@ -16,9 +16,9 @@ #include "file_manager_service_stub.h" #include "accesstoken_kit.h" +#include "file_manager_service.h" #include "file_manager_service_def.h" #include "file_manager_service_errno.h" -#include "file_manager_service.h" #include "ipc_singleton.h" #include "ipc_skeleton.h" #include "log.h" @@ -27,6 +27,7 @@ #include "sa_mgr_client.h" #include "string_ex.h" #include "system_ability_definition.h" + using namespace std; namespace OHOS { namespace FileManagerService { diff --git a/services/test/client/file_manager_proxy_test.cpp b/services/test/client/file_manager_proxy_test.cpp index 501a1ec9..9c472417 100644 --- a/services/test/client/file_manager_proxy_test.cpp +++ b/services/test/client/file_manager_proxy_test.cpp @@ -14,12 +14,11 @@ */ #include - #include -#include "ifms_client.h" #include "file_manager_proxy.h" #include "fms_manager_proxy_mock.h" +#include "ifms_client.h" namespace { using namespace std; @@ -86,4 +85,4 @@ HWTEST_F(FileManagerProxyTest, File_Manager_Proxy_Mkdir_0000, testing::ext::Test EXPECT_EQ(ret, 1); GTEST_LOG_(INFO) << "FileManagerProxyTest-end File_Manager_Proxy_Mkdir_0000"; } -} // namespace \ No newline at end of file +} // namespace diff --git a/services/test/server/file_manager_service_test.cpp b/services/test/server/file_manager_service_test.cpp index 3d0ea852..b022abc3 100644 --- a/services/test/server/file_manager_service_test.cpp +++ b/services/test/server/file_manager_service_test.cpp @@ -16,14 +16,14 @@ #include #include -#include "ifms_client.h" +#include "abs_shared_result_set.h" #include "file_info.h" -#include "media_file_oper.h" +#include "file_manager_service.h" +#include "file_manager_service_def.h" #include "file_manager_service_stub.h" +#include "ifms_client.h" #include "media_data_ability_const.h" -#include "file_manager_service_def.h" -#include "abs_shared_result_set.h" -#include "file_manager_service.h" +#include "media_file_oper.h" namespace { using namespace std; @@ -108,4 +108,4 @@ HWTEST_F(FileManagerServiceTest, Ffile_Manager_Service_OnStop_0000, testing::ext } GTEST_LOG_(INFO) << "FileManagerServiceTest-end file_Manager_Service_OnStop_0000"; } -} // namespace \ No newline at end of file +} // namespace -- Gitee