From e7a831549e7ab22c8d2cb4e4022ae4622cbbc12b Mon Sep 17 00:00:00 2001 From: Pawel Andruszkiewicz Date: Thu, 8 Oct 2015 14:30:44 +0200 Subject: [PATCH] [Common] Removed unnecessary include from header file. [Verification] Logic was not modified, includes were moved around. Change-Id: I08874ac57353c520c2bffd41490ca192eb034c6d Signed-off-by: Pawel Andruszkiewicz --- src/alarm/alarm_manager.cc | 1 + src/application/application.cc | 1 + src/application/application_manager.cc | 8 +++++--- src/application/requested_application_control.cc | 2 ++ src/bluetooth/bluetooth_adapter.cc | 3 ++- src/bluetooth/bluetooth_device.cc | 3 ++- src/bluetooth/bluetooth_gatt_service.cc | 3 ++- src/bluetooth/bluetooth_health_application.cc | 3 ++- src/bluetooth/bluetooth_health_channel.cc | 3 ++- src/bluetooth/bluetooth_health_profile_handler.cc | 3 ++- src/bluetooth/bluetooth_instance.cc | 1 + src/bluetooth/bluetooth_service_handler.cc | 3 ++- src/bluetooth/bluetooth_socket.cc | 3 ++- src/callhistory/callhistory.cc | 4 +++- src/common/extension.cc | 4 +++- src/common/extension.h | 3 --- src/content/content_instance.cc | 2 ++ src/content/content_manager.cc | 3 ++- src/radio/radio_manager.cc | 3 ++- src/secureelement/secureelement_seservice.cc | 3 ++- src/sensor/sensor_service.cc | 4 +++- src/sound/sound_manager.cc | 5 +++-- src/systeminfo/systeminfo_manager.cc | 8 +++++--- src/utils/utils_instance.cc | 5 ++++- 24 files changed, 55 insertions(+), 26 deletions(-) diff --git a/src/alarm/alarm_manager.cc b/src/alarm/alarm_manager.cc index 2c37c711..cc3604c2 100755 --- a/src/alarm/alarm_manager.cc +++ b/src/alarm/alarm_manager.cc @@ -24,6 +24,7 @@ #include "common/logger.h" #include "common/converter.h" #include "common/scope_exit.h" +#include "common/tools.h" #include "alarm_instance.h" #include "alarm_utils.h" diff --git a/src/application/application.cc b/src/application/application.cc index d6522c52..2c546119 100755 --- a/src/application/application.cc +++ b/src/application/application.cc @@ -19,6 +19,7 @@ #include "common/extension.h" #include "common/logger.h" #include "common/platform_result.h" +#include "common/tools.h" using namespace common; using namespace tools; diff --git a/src/application/application_manager.cc b/src/application/application_manager.cc index fdbd750d..100372d0 100755 --- a/src/application/application_manager.cc +++ b/src/application/application_manager.cc @@ -28,13 +28,15 @@ #include #include -#include "application/application_instance.h" -#include "application/application_utils.h" #include "common/current_application.h" #include "common/logger.h" #include "common/platform_result.h" -#include "common/task-queue.h" #include "common/scope_exit.h" +#include "common/task-queue.h" +#include "common/tools.h" + +#include "application/application_instance.h" +#include "application/application_utils.h" using namespace common; using namespace tools; diff --git a/src/application/requested_application_control.cc b/src/application/requested_application_control.cc index 709fe6fd..de6bffd8 100755 --- a/src/application/requested_application_control.cc +++ b/src/application/requested_application_control.cc @@ -22,6 +22,8 @@ #include #include "common/logger.h" +#include "common/tools.h" + #include "application/application_utils.h" using namespace common; diff --git a/src/bluetooth/bluetooth_adapter.cc b/src/bluetooth/bluetooth_adapter.cc index e9a3b662..6ff5fe8f 100755 --- a/src/bluetooth/bluetooth_adapter.cc +++ b/src/bluetooth/bluetooth_adapter.cc @@ -30,10 +30,11 @@ #include "bluetooth_internal.h" #include "common/converter.h" +#include "common/extension.h" #include "common/logger.h" #include "common/platform_result.h" -#include "common/extension.h" #include "common/task-queue.h" +#include "common/tools.h" #include "bluetooth/bluetooth_class.h" #include "bluetooth/bluetooth_device.h" diff --git a/src/bluetooth/bluetooth_device.cc b/src/bluetooth/bluetooth_device.cc index 9d9a809c..5315d39c 100755 --- a/src/bluetooth/bluetooth_device.cc +++ b/src/bluetooth/bluetooth_device.cc @@ -17,8 +17,9 @@ #include "bluetooth_device.h" #include "common/converter.h" -#include "common/logger.h" #include "common/extension.h" +#include "common/logger.h" +#include "common/tools.h" #include "bluetooth_adapter.h" #include "bluetooth_class.h" diff --git a/src/bluetooth/bluetooth_gatt_service.cc b/src/bluetooth/bluetooth_gatt_service.cc index e069c0ff..293c0f07 100755 --- a/src/bluetooth/bluetooth_gatt_service.cc +++ b/src/bluetooth/bluetooth_gatt_service.cc @@ -18,10 +18,11 @@ #include +#include "common/extension.h" #include "common/logger.h" #include "common/platform_result.h" -#include "common/extension.h" #include "common/task-queue.h" +#include "common/tools.h" #include "bluetooth/bluetooth_instance.h" #include "bluetooth/bluetooth_util.h" diff --git a/src/bluetooth/bluetooth_health_application.cc b/src/bluetooth/bluetooth_health_application.cc index 46708159..457e5d58 100755 --- a/src/bluetooth/bluetooth_health_application.cc +++ b/src/bluetooth/bluetooth_health_application.cc @@ -17,8 +17,9 @@ #include "bluetooth_health_application.h" #include "common/converter.h" -#include "common/logger.h" #include "common/extension.h" +#include "common/logger.h" +#include "common/tools.h" #include "bluetooth_health_profile_handler.h" #include "bluetooth_util.h" diff --git a/src/bluetooth/bluetooth_health_channel.cc b/src/bluetooth/bluetooth_health_channel.cc index 3825d326..1209021e 100755 --- a/src/bluetooth/bluetooth_health_channel.cc +++ b/src/bluetooth/bluetooth_health_channel.cc @@ -19,8 +19,9 @@ #include #include "common/converter.h" -#include "common/logger.h" #include "common/extension.h" +#include "common/logger.h" +#include "common/tools.h" #include "bluetooth_device.h" #include "bluetooth_util.h" diff --git a/src/bluetooth/bluetooth_health_profile_handler.cc b/src/bluetooth/bluetooth_health_profile_handler.cc index 34dc7d4c..1f0432d0 100755 --- a/src/bluetooth/bluetooth_health_profile_handler.cc +++ b/src/bluetooth/bluetooth_health_profile_handler.cc @@ -17,9 +17,10 @@ #include "bluetooth_health_profile_handler.h" #include "common/converter.h" -#include "common/logger.h" #include "common/extension.h" +#include "common/logger.h" #include "common/task-queue.h" +#include "common/tools.h" #include "bluetooth/bluetooth_adapter.h" #include "bluetooth/bluetooth_instance.h" diff --git a/src/bluetooth/bluetooth_instance.cc b/src/bluetooth/bluetooth_instance.cc index 2351162c..c919693a 100755 --- a/src/bluetooth/bluetooth_instance.cc +++ b/src/bluetooth/bluetooth_instance.cc @@ -19,6 +19,7 @@ #include "common/converter.h" #include "common/logger.h" #include "common/task-queue.h" +#include "common/tools.h" namespace extension { namespace bluetooth { diff --git a/src/bluetooth/bluetooth_service_handler.cc b/src/bluetooth/bluetooth_service_handler.cc index f7b30407..d9b6e1eb 100755 --- a/src/bluetooth/bluetooth_service_handler.cc +++ b/src/bluetooth/bluetooth_service_handler.cc @@ -17,8 +17,9 @@ #include "bluetooth_service_handler.h" #include "common/converter.h" -#include "common/logger.h" #include "common/extension.h" +#include "common/logger.h" +#include "common/tools.h" #include "bluetooth_adapter.h" #include "bluetooth_util.h" diff --git a/src/bluetooth/bluetooth_socket.cc b/src/bluetooth/bluetooth_socket.cc index 518223f2..8f858bc1 100755 --- a/src/bluetooth/bluetooth_socket.cc +++ b/src/bluetooth/bluetooth_socket.cc @@ -19,8 +19,9 @@ #include #include "common/converter.h" -#include "common/logger.h" #include "common/extension.h" +#include "common/logger.h" +#include "common/tools.h" #include "bluetooth_adapter.h" #include "bluetooth_device.h" diff --git a/src/callhistory/callhistory.cc b/src/callhistory/callhistory.cc index 5591b569..a7943033 100755 --- a/src/callhistory/callhistory.cc +++ b/src/callhistory/callhistory.cc @@ -24,8 +24,10 @@ #include "common/logger.h" #include "common/platform_exception.h" -#include "common/task-queue.h" #include "common/scope_exit.h" +#include "common/task-queue.h" +#include "common/tools.h" + #include "callhistory_instance.h" #include "callhistory_types.h" diff --git a/src/common/extension.cc b/src/common/extension.cc index 81926861..042f0ada 100755 --- a/src/common/extension.cc +++ b/src/common/extension.cc @@ -9,8 +9,10 @@ #include #include #include -#include "common/logger.h" + #include "common/assert.h" +#include "common/logger.h" +#include "common/tools.h" // This function is hidden, because each plugin needs to have own implementation. __attribute__ ((visibility ("hidden"))) common::Extension* CreateExtension() { diff --git a/src/common/extension.h b/src/common/extension.h index 9fd80251..4abf525f 100755 --- a/src/common/extension.h +++ b/src/common/extension.h @@ -26,9 +26,6 @@ #include "common/platform_exception.h" #include "common/platform_result.h" -// TODO: this include should be moved to source file -// it's here, so we don't break other modules using it implicitly -#include "common/tools.h" #include "common/XW_Extension.h" #include "common/XW_Extension_EntryPoints.h" #include "common/XW_Extension_Permissions.h" diff --git a/src/content/content_instance.cc b/src/content/content_instance.cc index 99090526..2bed6d7d 100755 --- a/src/content/content_instance.cc +++ b/src/content/content_instance.cc @@ -27,7 +27,9 @@ #include "common/picojson.h" #include "common/platform_result.h" #include "common/task-queue.h" +#include "common/tools.h" #include "common/virtual_fs.h" + #include "content/content_manager.h" namespace extension { diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc index 18d9f5c1..6e1f0f2f 100755 --- a/src/content/content_manager.cc +++ b/src/content/content_manager.cc @@ -28,9 +28,10 @@ #include "common/converter.h" #include "common/logger.h" #include "common/scope_exit.h" +#include "common/tools.h" #include "common/virtual_fs.h" + #include "content/content_filter.h" -#include "common/virtual_fs.h" using namespace std; using namespace common; diff --git a/src/radio/radio_manager.cc b/src/radio/radio_manager.cc index 1e122f5b..81bb0de2 100755 --- a/src/radio/radio_manager.cc +++ b/src/radio/radio_manager.cc @@ -23,9 +23,10 @@ #include #include -#include "common/logger.h" #include "common/extension.h" +#include "common/logger.h" #include "common/task-queue.h" +#include "common/tools.h" #include "radio/radio_instance.h" diff --git a/src/secureelement/secureelement_seservice.cc b/src/secureelement/secureelement_seservice.cc index 290bd946..27bf86ae 100644 --- a/src/secureelement/secureelement_seservice.cc +++ b/src/secureelement/secureelement_seservice.cc @@ -17,8 +17,9 @@ #include "secureelement/secureelement_seservice.h" #include "common/logger.h" -#include "common/task-queue.h" #include "common/platform_result.h" +#include "common/task-queue.h" +#include "common/tools.h" #include "secureelement/secureelement_instance.h" diff --git a/src/sensor/sensor_service.cc b/src/sensor/sensor_service.cc index cdb0914e..544ccfd0 100644 --- a/src/sensor/sensor_service.cc +++ b/src/sensor/sensor_service.cc @@ -20,10 +20,12 @@ #include #include -#include "common/task-queue.h" #include "common/logger.h" #include "common/optional.h" #include "common/platform_exception.h" +#include "common/task-queue.h" +#include "common/tools.h" + #include "sensor_instance.h" using namespace common; diff --git a/src/sound/sound_manager.cc b/src/sound/sound_manager.cc index c0ef6779..4bc7e0dd 100644 --- a/src/sound/sound_manager.cc +++ b/src/sound/sound_manager.cc @@ -20,7 +20,10 @@ #include #include +#include "common/converter.h" +#include "common/logger.h" #include "common/task-queue.h" +#include "common/tools.h" //This constant was originally defined in vconf.h. However, in tizen 3, it //appears, it is removed (or defined only in vconf-internals.h) @@ -30,8 +33,6 @@ #endif #include "sound/sound_instance.h" -#include "common/logger.h" -#include "common/converter.h" namespace extension { namespace sound { diff --git a/src/systeminfo/systeminfo_manager.cc b/src/systeminfo/systeminfo_manager.cc index 8634b736..6bf0d437 100644 --- a/src/systeminfo/systeminfo_manager.cc +++ b/src/systeminfo/systeminfo_manager.cc @@ -25,12 +25,14 @@ #include #include +#include "common/converter.h" +#include "common/logger.h" +#include "common/task-queue.h" +#include "common/tools.h" + #include "systeminfo/systeminfo_instance.h" #include "systeminfo/systeminfo_device_capability.h" #include "systeminfo/systeminfo-utils.h" -#include "common/logger.h" -#include "common/converter.h" -#include "common/task-queue.h" using common::PlatformResult; using common::ErrorCode; diff --git a/src/utils/utils_instance.cc b/src/utils/utils_instance.cc index 71d7aca9..5ba21cae 100644 --- a/src/utils/utils_instance.cc +++ b/src/utils/utils_instance.cc @@ -8,8 +8,11 @@ #include #include #include -#include "common/scope_exit.h" + #include "common/logger.h" +#include "common/scope_exit.h" +#include "common/tools.h" + #include "utils/utils_instance.h" using common::PlatformResult; -- 2.34.1