From 4288b8ecaa03b0cd14ad17182c2dc35b58887ea6 Mon Sep 17 00:00:00 2001
From: Lukasz Wysocki <l.wysocki@samsung.com>
Date: Fri, 15 Jan 2016 12:50:16 +0100
Subject: [PATCH] Fix WGT handlers includes

This change require following changes:
- https://review.tizen.org/gerrit/#/c/57153/

Changes should be merged together

Change-Id: I2bf7b13f47b57e5585addc10acbc686ae6752137
---
 src/hybrid/hybrid_backend_data.h                   |  2 +-
 src/wgt/step/step_check_settings_level.cc          |  2 +-
 src/wgt/step/step_check_wgt_background_category.cc |  2 +-
 src/wgt/step/step_parse.cc                         | 24 +++++++++++-----------
 src/wgt/step/step_parse.h                          |  4 ++--
 src/wgt/wgt_app_query_interface.cc                 |  6 +++---
 src/wgt/wgt_backend_data.h                         |  2 +-
 src/wgt/wgt_installer.cc                           |  4 ++--
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/hybrid/hybrid_backend_data.h b/src/hybrid/hybrid_backend_data.h
index c3a7d8b..7815a12 100644
--- a/src/hybrid/hybrid_backend_data.h
+++ b/src/hybrid/hybrid_backend_data.h
@@ -6,9 +6,9 @@
 #define HYBRID_HYBRID_BACKEND_DATA_H_
 
 #include <common/utils/property.h>
-#include <manifest_handlers/setting_handler.h>
 #include <pkgmgrinfo_basic.h>
 #include <pkgmgr_parser.h>
+#include <wgt_manifest_handlers/setting_handler.h>
 
 #include <string>
 #include <vector>
diff --git a/src/wgt/step/step_check_settings_level.cc b/src/wgt/step/step_check_settings_level.cc
index 0d88bb2..9df2b19 100644
--- a/src/wgt/step/step_check_settings_level.cc
+++ b/src/wgt/step/step_check_settings_level.cc
@@ -4,8 +4,8 @@
 
 #include "wgt/step/step_check_settings_level.h"
 
-#include <manifest_handlers/setting_handler.h>
 #include <manifest_parser/utils/logging.h>
+#include <wgt_manifest_handlers/setting_handler.h>
 
 #include <map>
 
diff --git a/src/wgt/step/step_check_wgt_background_category.cc b/src/wgt/step/step_check_wgt_background_category.cc
index c652fc2..087b37b 100644
--- a/src/wgt/step/step_check_wgt_background_category.cc
+++ b/src/wgt/step/step_check_wgt_background_category.cc
@@ -5,7 +5,7 @@
 #include "wgt/step/step_check_wgt_background_category.h"
 
 #include <common/installer_context.h>
-#include <manifest_handlers/setting_handler.h>
+#include <wgt_manifest_handlers/setting_handler.h>
 
 #include "wgt/wgt_backend_data.h"
 
diff --git a/src/wgt/step/step_parse.cc b/src/wgt/step/step_parse.cc
index bab1d10..bed8524 100644
--- a/src/wgt/step/step_parse.cc
+++ b/src/wgt/step/step_parse.cc
@@ -11,18 +11,18 @@
 #include <common/installer_context.h>
 #include <common/step/step.h>
 #include <common/utils/glist_range.h>
-#include <manifest_handlers/account_handler.h>
-#include <manifest_handlers/app_control_handler.h>
-#include <manifest_handlers/application_icons_handler.h>
-#include <manifest_handlers/application_manifest_constants.h>
-#include <manifest_handlers/background_category_handler.h>
-#include <manifest_handlers/category_handler.h>
-#include <manifest_handlers/content_handler.h>
-#include <manifest_handlers/metadata_handler.h>
-#include <manifest_handlers/service_handler.h>
-#include <manifest_handlers/setting_handler.h>
-#include <manifest_handlers/tizen_application_handler.h>
-#include <manifest_handlers/widget_handler.h>
+#include <wgt_manifest_handlers/account_handler.h>
+#include <wgt_manifest_handlers/app_control_handler.h>
+#include <wgt_manifest_handlers/application_icons_handler.h>
+#include <wgt_manifest_handlers/application_manifest_constants.h>
+#include <wgt_manifest_handlers/background_category_handler.h>
+#include <wgt_manifest_handlers/category_handler.h>
+#include <wgt_manifest_handlers/content_handler.h>
+#include <wgt_manifest_handlers/metadata_handler.h>
+#include <wgt_manifest_handlers/service_handler.h>
+#include <wgt_manifest_handlers/setting_handler.h>
+#include <wgt_manifest_handlers/tizen_application_handler.h>
+#include <wgt_manifest_handlers/widget_handler.h>
 
 #include <pkgmgr/pkgmgr_parser.h>
 
diff --git a/src/wgt/step/step_parse.h b/src/wgt/step/step_parse.h
index e1f2547..0737b9d 100644
--- a/src/wgt/step/step_parse.h
+++ b/src/wgt/step/step_parse.h
@@ -11,9 +11,9 @@
 #include <common/installer_context.h>
 #include <common/step/step.h>
 
-#include <manifest_handlers/permissions_handler.h>
-#include <manifest_handlers/widget_config_parser.h>
 #include <manifest_parser/utils/logging.h>
+#include <wgt_manifest_handlers/permissions_handler.h>
+#include <wgt_manifest_handlers/widget_config_parser.h>
 
 #include <memory>
 #include <set>
diff --git a/src/wgt/wgt_app_query_interface.cc b/src/wgt/wgt_app_query_interface.cc
index 0dc580d..2798080 100644
--- a/src/wgt/wgt_app_query_interface.cc
+++ b/src/wgt/wgt_app_query_interface.cc
@@ -16,11 +16,11 @@
 #include <common/request.h>
 #include <common/utils/file_util.h>
 
-#include <manifest_handlers/application_manifest_constants.h>
-#include <manifest_handlers/tizen_application_handler.h>
-#include <manifest_handlers/widget_handler.h>
 #include <manifest_parser/manifest_parser.h>
 #include <manifest_parser/utils/logging.h>
+#include <wgt_manifest_handlers/application_manifest_constants.h>
+#include <wgt_manifest_handlers/tizen_application_handler.h>
+#include <wgt_manifest_handlers/widget_handler.h>
 
 #include <memory>
 #include <string>
diff --git a/src/wgt/wgt_backend_data.h b/src/wgt/wgt_backend_data.h
index e3c281b..15daa7e 100644
--- a/src/wgt/wgt_backend_data.h
+++ b/src/wgt/wgt_backend_data.h
@@ -8,7 +8,7 @@
 #include <common/installer_context.h>
 #include <common/utils/property.h>
 
-#include <manifest_handlers/setting_handler.h>
+#include <wgt_manifest_handlers/setting_handler.h>
 
 #include <string>
 #include <vector>
diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index c4d5ca9..3db7e38 100644
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -4,8 +4,6 @@
 
 #include "wgt/wgt_installer.h"
 
-#include <manifest_handlers/widget_config_parser.h>
-
 #include <common/pkgmgr_interface.h>
 #include <common/step/step_configure.h>
 #include <common/step/step_backup_icons.h>
@@ -43,6 +41,8 @@
 #include <common/step/step_update_security.h>
 #include <common/step/step_check_old_certificate.h>
 
+#include <wgt_manifest_handlers/widget_config_parser.h>
+
 #include "wgt/step/step_add_default_privileges.h"
 #include "wgt/step/step_check_settings_level.h"
 #include "wgt/step/step_check_wgt_background_category.h"
-- 
2.7.4