Add forward declarations

[Issue#]   LINUXWRT-358
[Problem]  Forward declarations needed
[Cause]    N/A
[Solution] Added forward declariations in
            - src/jobs/plugin_install/job_plugin_install.cpp
            - src/jobs/widget_uninstall/task_db_update.h
            - src/jobs/widget_uninstall/task_delete_pkginfo.h

[SCMRequest] N/A

Change-Id: I3277d5796e029b382719df03381078af910ebdda

diff --git a/src/jobs/plugin_install/job_plugin_install.cpp b/src/jobs/plugin_install/job_plugin_install.cpp
index 1a929d9..7835449 100644 (file)
--- a/src/jobs/plugin_install/job_plugin_install.cpp
+++ b/src/jobs/plugin_install/job_plugin_install.cpp
@@ -21,10 +21,8 @@
  */
 #include <plugin_install/job_plugin_install.h>
 #include <plugin_install/plugin_install_task.h>
-#include <widget_install/widget_installer_struct.h> //TODO remove
-
-//#include <plugin_logic.h>
 #include "plugin_objects.h"
+#include <wrt_common_types.h>
 
 namespace Jobs {
 namespace PluginInstall {

diff --git a/src/jobs/widget_uninstall/task_db_update.cpp b/src/jobs/widget_uninstall/task_db_update.cpp
index a7c0d42..5d919c5 100644 (file)
--- a/src/jobs/widget_uninstall/task_db_update.cpp
+++ b/src/jobs/widget_uninstall/task_db_update.cpp
@@ -20,16 +20,17 @@
  * @brief   Implementation file for uninstaller task database updating
  */
 
+#include <ace_api_install.h>
+#include <ace-common/ace_api_common.h>
 #include <web_provider_livebox_info.h>
 #include <widget_uninstall/task_db_update.h>
 #include <widget_uninstall/job_widget_uninstall.h>
 #include <widget_uninstall/widget_uninstall_errors.h>
-#include <dpl/wrt-dao-ro/widget_dao_read_only.h>
-#include <dpl/utils/wrt_utility.h>
-#include <dpl/utils/path.h>
-#include <ace_api_install.h>
 #include <dpl/assert.h>
-#include <ace-common/ace_api_common.h>
+#include <dpl/utils/path.h>
+#include <dpl/utils/wrt_utility.h>
+#include <dpl/wrt-dao-ro/widget_dao_read_only.h>
+#include <dpl/wrt-dao-rw/widget_dao.h>
 
 using namespace WrtDB;
 

diff --git a/src/jobs/widget_uninstall/task_db_update.h b/src/jobs/widget_uninstall/task_db_update.h
index 122b03f..3b74ad5 100644 (file)
--- a/src/jobs/widget_uninstall/task_db_update.h
+++ b/src/jobs/widget_uninstall/task_db_update.h
@@ -23,12 +23,11 @@
 #ifndef WRT_SRC_INSTALLER_CORE_JOB_WIDGET_UNINSTALL_TASK_DB_UPDATE_H_
 #define WRT_SRC_INSTALLER_CORE_JOB_WIDGET_UNINSTALL_TASK_DB_UPDATE_H_
 
+#include <string>
+#include <dpl/exception.h>
 #include <dpl/task.h>
-#include <dpl/wrt-dao-rw/widget_dao.h> //TODO not needed here
-
-#include <widget_uninstall/uninstaller_context.h> //todo forward decl
 
-#include <string>
+class UninstallerContext;
 
 namespace Jobs {
 namespace WidgetUninstall {

diff --git a/src/jobs/widget_uninstall/task_delete_pkginfo.h b/src/jobs/widget_uninstall/task_delete_pkginfo.h
index edca6fb..4624c4a 100644 (file)
--- a/src/jobs/widget_uninstall/task_delete_pkginfo.h
+++ b/src/jobs/widget_uninstall/task_delete_pkginfo.h
@@ -24,11 +24,10 @@
 #define WRT_SRC_INSTALLER_CORE_JOB_WIDGET_UNINSTALL_TASK_DELETE_PKGINFO_H_
 
 #include <dpl/task.h>
-
-#include <widget_uninstall/uninstaller_context.h> //todo forward decl
-
 #include <string>
 
+struct UninstallerContext;
+
 namespace Jobs {
 namespace WidgetUninstall {
 class TaskDeletePkgInfo :