冗余头文件清理

Signed-off-by: lizhuojun <lizhuojun3@huawei.com>

framework/common/base32_utils.cpp

@@ -15,8 +15,6 @@
 
 #include "base32_utils.h"
 
-#include <string>
-
 namespace OHOS {
 namespace UDMF {
 static char BASE32_CHARS[33] = "abcdefghijklmnopqrstuvwxyz234567";

framework/common/custom_utd_json_parser.cpp

@@ -14,9 +14,6 @@
  */
 #define LOG_TAG "CustomUtdJsonParser"
 #include "custom_utd_json_parser.h"
-#include <fstream>
-#include <cJSON.h>
-#include "error_code.h"
 #include "logger.h"
 namespace OHOS {
 namespace UDMF {

framework/common/custom_utd_store.cpp

@@ -17,7 +17,6 @@
 #include <fstream>
 #include <sys/stat.h>
 #include "unistd.h"
-#include "error_code.h"
 #include "logger.h"
 #ifdef WITH_SELINUX
 #include <policycoreutils.h>

framework/common/tlv_object.cpp

@@ -15,8 +15,6 @@
 
 #define LOG_TAG "TlvObject"
 #include "tlv_object.h"
-#include <string>
-#include <map>
 #include "logger.h"
 
 namespace OHOS {

framework/common/udmf_types_util.cpp

@@ -15,8 +15,6 @@
 #define LOG_TAG "UdmfTypesUtil"
 #include "udmf_types_util.h"
 
-#include <string>
-
 #include "logger.h"
 #include "tlv_util.h"
 

framework/common/utd_cfgs_checker.cpp

@@ -15,7 +15,6 @@
 #define LOG_TAG "UtdCfgsChecker"
 #include "utd_cfgs_checker.h"
 
-#include <vector>
 #include <regex>
 #include "utd_graph.h"
 #include "logger.h"

framework/innerkitsimpl/client/udmf_client.cpp

@@ -18,7 +18,6 @@
 #include "dds_trace.h"
 #include "udmf_radar_reporter.h"
 
-#include "error_code.h"
 #include "logger.h"
 #include "udmf_service_client.h"
 #include "udmf_utils.h"

framework/innerkitsimpl/client/utd_client.cpp

@@ -13,16 +13,12 @@
  * limitations under the License.
  */
 #define LOG_TAG "UtdClient"
-#include <algorithm>
 #include <regex>
 #include "utd_client.h"
 #include "logger.h"
 #include "utd_graph.h"
 #include "custom_utd_store.h"
-#include "base32_utils.h"
-#include "udmf_utils.h"
 #include "accesstoken_kit.h"
-#include "access_token.h"
 #include "ipc_skeleton.h"
 #include "os_account_manager.h"
 namespace OHOS {

framework/innerkitsimpl/convert/ndk_data_conversion.cpp

@@ -14,9 +14,6 @@
  */
 
 #include "ndk_data_conversion.h"
-#include "unified_data.h"
-#include "udmf_capi_common.h"
-#include "error_code.h"
 
 namespace OHOS::UDMF {
     Status NdkDataConversion::GetNativeUnifiedData(OH_UdmfData* ndkData, std::shared_ptr<UnifiedData>& data)

framework/innerkitsimpl/data/unified_data.cpp

@@ -14,8 +14,6 @@
  */
 #define LOG_TAG "UnifiedData"
 #include "unified_data.h"
-#include <chrono>
-#include <cinttypes>
 #include "logger.h"
 
 namespace OHOS {

framework/innerkitsimpl/data/unified_data_helper.cpp

@@ -15,19 +15,12 @@
 #define LOG_TAG "UnifiedDataHelper"
 #include "unified_data_helper.h"
 
-#include <cstdio>
-#include <string>
-#include <sys/stat.h>
-#include <cinttypes>
 #include "common_func.h"
 #include "directory_ex.h"
 #include "file_ex.h"
 #include "file_uri.h"
-#include "file.h"
 #include "logger.h"
-#include "tlv_object.h"
 #include "tlv_util.h"
-#include "unified_meta.h"
 
 namespace OHOS {
 namespace UDMF {

framework/innerkitsimpl/data/unified_record.cpp

@@ -15,8 +15,6 @@
 #define LOG_TAG "UnifiedRecord"
 #include "unified_record.h"
 
-#include "logger.h"
-
 namespace OHOS {
 namespace UDMF {
 UnifiedRecord::UnifiedRecord()

framework/innerkitsimpl/service/udmf_service_proxy.cpp

@@ -15,10 +15,7 @@
 #define LOG_TAG "UdmfServiceProxy"
 #include "udmf_service_proxy.h"
 
-#include "ipc_types.h"
-
 #include "logger.h"
-#include "tlv_util.h"
 #include "udmf_types_util.h"
 
 namespace OHOS {

framework/jskitsimpl/common/napi_data_utils.cpp

@@ -15,8 +15,6 @@
 #define LOG_TAG "NapiDataUtils"
 #include "napi_data_utils.h"
 
-#include "napi_queue.h"
-
 namespace OHOS {
 namespace UDMF {
 constexpr int32_t STR_MAX_LENGTH = 4096;

framework/jskitsimpl/common/napi_error_utils.cpp

@@ -15,8 +15,6 @@
 #define LOG_TAG "NapiErrorCode"
 #include "napi_error_utils.h"
 
-#include <algorithm>
-
 namespace OHOS {
 namespace UDMF {
 using NapiErrorCode = OHOS::UDMF::NapiErrorCode;

framework/jskitsimpl/common/napi_queue.cpp

@@ -15,8 +15,6 @@
 #define LOG_TAG "NapiQueue"
 #include "napi_queue.h"
 
-#include "logger.h"
-
 namespace OHOS {
 namespace UDMF {
 ContextBase::~ContextBase()

framework/jskitsimpl/data/application_defined_record_napi.cpp

@@ -16,9 +16,6 @@
 #include "application_defined_record_napi.h"
 
 #include "application_defined_record.h"
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "unified_record_napi.h"
 
 namespace OHOS {

framework/jskitsimpl/data/audio_napi.cpp

@@ -17,9 +17,6 @@
 
 #include "audio.h"
 #include "file_napi.h"
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "unified_record_napi.h"
 
 namespace OHOS {

framework/jskitsimpl/data/file_napi.cpp

@@ -16,9 +16,6 @@
 #include "file_napi.h"
 
 #include "file.h"
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "unified_record_napi.h"
 
 namespace OHOS {

framework/jskitsimpl/data/folder_napi.cpp

@@ -17,9 +17,6 @@
 
 #include "file_napi.h"
 #include "folder.h"
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "unified_record_napi.h"
 
 namespace OHOS {

framework/jskitsimpl/data/html_napi.cpp

@@ -16,9 +16,6 @@
 #include "html_napi.h"
 
 #include "html.h"
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "text_napi.h"
 #include "unified_record_napi.h"
 

framework/jskitsimpl/data/image_napi.cpp

@@ -17,9 +17,6 @@
 
 #include "file_napi.h"
 #include "image.h"
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "unified_record_napi.h"
 
 namespace OHOS {

framework/jskitsimpl/data/link_napi.cpp

@@ -16,9 +16,6 @@
 #include "link_napi.h"
 
 #include "link.h"
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "text_napi.h"
 #include "unified_record_napi.h"
 

framework/jskitsimpl/data/plain_text_napi.cpp

@@ -15,9 +15,6 @@
 #define LOG_TAG "PlainTextNapi"
 #include "plain_text_napi.h"
 
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "plain_text.h"
 #include "text_napi.h"
 #include "unified_record_napi.h"

framework/jskitsimpl/data/summary_napi.cpp

@@ -16,8 +16,6 @@
 #include "summary_napi.h"
 
 #include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "unified_types.h"
 
 namespace OHOS {

framework/jskitsimpl/data/system_defined_appitem_napi.cpp

@@ -15,9 +15,6 @@
 #define LOG_TAG "SystemDefinedAppItemNapi"
 #include "system_defined_appitem_napi.h"
 
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "system_defined_appitem.h"
 #include "system_defined_record_napi.h"
 #include "unified_record_napi.h"

framework/jskitsimpl/data/system_defined_form_napi.cpp

@@ -15,9 +15,6 @@
 #define LOG_TAG "SystemDefinedFormNapi"
 #include "system_defined_form_napi.h"
 
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "system_defined_form.h"
 #include "system_defined_record_napi.h"
 #include "unified_record_napi.h"

framework/jskitsimpl/data/system_defined_pixelmap_napi.cpp

@@ -16,9 +16,6 @@
 #include "system_defined_pixelmap_napi.h"
 
 #include "system_defined_pixelmap.h"
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "unified_record_napi.h"
 #include "system_defined_record_napi.h"
 

framework/jskitsimpl/data/system_defined_record_napi.cpp

@@ -16,9 +16,6 @@
 #include "system_defined_record_napi.h"
 
 #include "system_defined_record.h"
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "unified_record_napi.h"
 
 namespace OHOS {

framework/jskitsimpl/data/text_napi.cpp

@@ -16,9 +16,6 @@
 #include "text_napi.h"
 
 #include "text.h"
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "unified_record_napi.h"
 
 namespace OHOS {

framework/jskitsimpl/data/type_descriptor_napi.cpp

@@ -14,9 +14,7 @@
  */
 #define LOG_TAG "TypeDescriptorNapi"
 #include "type_descriptor_napi.h"
-#include "utd_client.h"
 #include "napi_data_utils.h"
-#include "napi_error_utils.h"
 
 namespace OHOS {
 namespace UDMF {

framework/jskitsimpl/data/unified_data_channel_napi.cpp

@@ -16,11 +16,8 @@
 #include "unified_data_channel_napi.h"
 
 #include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "udmf_client.h"
 #include "unified_data_napi.h"
-#include "unified_meta.h"
 
 namespace OHOS {
 namespace UDMF {

framework/jskitsimpl/data/unified_data_napi.cpp

@@ -22,8 +22,6 @@
 #include "html_napi.h"
 #include "image_napi.h"
 #include "link_napi.h"
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
 #include "plain_text_napi.h"
 #include "system_defined_appitem_napi.h"
 #include "system_defined_form_napi.h"

framework/jskitsimpl/data/unified_data_properties_napi.cpp

@@ -16,9 +16,7 @@
 #include "unified_data_properties_napi.h"
 
 #include "napi_data_utils.h"
-#include "napi_error_utils.h"
 #include "unified_data.h"
-#include "unified_meta.h"
 
 namespace OHOS {
 namespace UDMF {

framework/jskitsimpl/data/unified_record_napi.cpp

@@ -15,10 +15,6 @@
 #define LOG_TAG "UnifiedRecordNapi"
 #include "unified_record_napi.h"
 
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
-
 #include "plain_text.h"
 #include "html.h"
 #include "link.h"

framework/jskitsimpl/data/uniform_type_descriptor_napi.cpp

@@ -15,11 +15,6 @@
 #define LOG_TAG "UniformTypeDescriptorNapi"
 #include "uniform_type_descriptor_napi.h"
 #include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
-#include "unified_meta.h"
-#include "type_descriptor_napi.h"
-#include "type_descriptor.h"
 #include "utd_client.h"
 
 namespace OHOS {

framework/jskitsimpl/data/video_napi.cpp

@@ -16,9 +16,6 @@
 #include "video_napi.h"
 
 #include "file_napi.h"
-#include "napi_data_utils.h"
-#include "napi_error_utils.h"
-#include "napi_queue.h"
 #include "unified_record_napi.h"
 #include "video.h"
 

framework/ndkimpl/data/udmf.cpp

@@ -14,10 +14,6 @@
  */
 #define LOG_TAG "Udmf"
 #include "udmf.h"
-#include <memory>
-#include <new>
-#include "unified_data.h"
-#include "unified_record.h"
 #include "udmf_err_code.h"
 #include "udmf_client.h"
 #include "securec.h"
@@ -25,7 +21,6 @@
 #include "int_wrapper.h"
 #include "string_wrapper.h"
 #include "unified_meta.h"
-#include "uds.h"
 #include "udmf_meta.h"
 #include "logger.h"
 #include "plain_text.h"

framework/ndkimpl/data/uds.cpp

@@ -15,10 +15,7 @@
 #define LOG_TAG "Uds"
 
 #include "uds.h"
-#include <string>
 #include "logger.h"
-#include "utd_common.h"
-#include "unified_record.h"
 #include "udmf_capi_common.h"
 #include "udmf_meta.h"
 #include "udmf_err_code.h"

framework/ndkimpl/data/utd.cpp

@@ -16,8 +16,6 @@
 #define LOG_TAG "Utd"
 #include "utd.h"
 
-#include <cstring>
-#include <vector>
 #include "securec.h"
 #include "logger.h"
 #include "utd_client.h"

interfaces/jskits/module/unified_data_channel_napi_module.cpp

@@ -20,7 +20,6 @@
 #include "html_napi.h"
 #include "image_napi.h"
 #include "link_napi.h"
-#include "logger.h"
 #include "plain_text_napi.h"
 #include "unified_data_channel_napi.h"
 #include "summary_napi.h"

interfaces/jskits/module/uniform_type_descriptor_napi_module.cpp

@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 #define LOG_TAG "UDMFUniformTypModule"
-#include "logger.h"
 #include "uniform_type_descriptor_napi.h"
 #include "type_descriptor_napi.h"