apply modified application-common

Change-Id: I1e3ae6b6450b483aa02cc0891defff762cc35998
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>

diff --git a/include/mgr/usb.h b/include/mgr/usb.h
index 9f32d75..9d78f42 100644 (file)
--- a/include/mgr/usb.h
+++ b/include/mgr/usb.h
@@ -18,7 +18,7 @@
 #define __USB_H__
 
 
-class CUsb : public CUsbConnectionListener {
+class CUsb : public CUsbListener {
 public:
        struct SCallback {
                void (*cb)(void *cookie, int status, void *data);

diff --git a/src/main.cpp b/src/main.cpp
index 6b94eb5..e88bf68 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,17 +14,10 @@
  * limitations under the License.
  */
 
-#include <app.h>
-#include <Elementary.h>
 #include <dlog.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #include "def.h"
-#include "BaseView.h"
-#include "ViewMgr.h"
-#include "BaseApp.h"
-#include "BaseLayout.h"
-#include "LayoutMgr.h"
-#include "InputHandler.h"
 #include "source_mgr.h"
 #include "allsource_view.h"
 #include "menu_view.h"

diff --git a/src/mgr/SourceInfo.cpp b/src/mgr/SourceInfo.cpp
index aa05382..1a441d3 100644 (file)
--- a/src/mgr/SourceInfo.cpp
+++ b/src/mgr/SourceInfo.cpp
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
 #include <stdio.h>
 #include <string.h>
-
+#include "dbg.h"
+#include <AppCommon.h>
 #include "external.h"
-#include "AppCommon.h"
-#include "UsbConnectionListener.h"
 #include "SourceInfo.h"
 #include "external.h"
 #include "usb.h"

diff --git a/src/mgr/external.cpp b/src/mgr/external.cpp
index fe1c4c0..e28d955 100644 (file)
--- a/src/mgr/external.cpp
+++ b/src/mgr/external.cpp
@@ -17,10 +17,8 @@
 #include <aul.h>
 #include <stdlib.h>
 #include <string.h>
-#include <app.h>
 #include "dbg.h"
-
-#include "AppCommon.h"
+#include <AppCommon.h>
 #include "external.h"
 
 #define EXT_NAME_TV    _("TV Antenna")

diff --git a/src/mgr/source_mgr.cpp b/src/mgr/source_mgr.cpp
index 911f7cd..ef5002c 100644 (file)
--- a/src/mgr/source_mgr.cpp
+++ b/src/mgr/source_mgr.cpp
@@ -14,15 +14,10 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <Ecore.h>
-
-#include "AppCommon.h"
-#include "UsbConnectionListener.h"
+#include "dbg.h"
+#include <AppCommon.h>
 #include "external.h"
 #include "source_mgr.h"
-#include "dbg.h"
 #include "aul.h"
 #include "util.h"
 #include "usb.h"
@@ -93,11 +88,11 @@ void CSourceMgr::t_UpdateUI(void *data, enum update_ui update_type)
 
 CSourceInfo *CSourceMgr::m_AllocUsbSI(void *data)
 {
-       CUsbConnectionListener::SUsbHostDeviceInfo *devInfo;
+       CUsbListener::SUsbHostDeviceInfo *devInfo;
        CSourceInfo *si;
        const char *name;
 
-       devInfo = (CUsbConnectionListener::SUsbHostDeviceInfo *)data;
+       devInfo = (CUsbListener::SUsbHostDeviceInfo *)data;
 
        si = new CSourceInfo;
        if (!si) {
@@ -124,14 +119,14 @@ void CSourceMgr::sm_CbUsbPlug(void *cookie, int status, void *data)
 
 void CSourceMgr::m_OnUsbPlug(int status, void *data)
 {
-       CUsbConnectionListener::SUsbHostDeviceInfo *devInfo;
+       CUsbListener::SUsbHostDeviceInfo *devInfo;
        CSourceInfo *si;
        void *obj;
        Eina_List *list, *list_next;
 
-       devInfo = (CUsbConnectionListener::SUsbHostDeviceInfo *)data;
+       devInfo = (CUsbListener::SUsbHostDeviceInfo *)data;
 
-       if (status == CUsbConnectionListener::USB_HOST_DEV_CONNECTED) {
+       if (status == CUsbListener::USB_HOST_DEV_CONNECTED) {
                si = m_AllocUsbSI(devInfo);
                if (!si)
                        return;

diff --git a/src/mgr/usb.cpp b/src/mgr/usb.cpp
index 7fbc5e3..969f94a 100644 (file)
--- a/src/mgr/usb.cpp
+++ b/src/mgr/usb.cpp
@@ -14,13 +14,8 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <Ecore.h>
-
-#include "AppCommon.h"
-#include "UsbConnectionListener.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #include "aul.h"
 #include "usb.h"
 
@@ -43,8 +38,8 @@ bool CUsb::Create(const SCallback *cb)
                return false;
        }
 
-       if (!CUsbConnectionListener::Create())
-               _DBG("UsbConnectionListener creation failed");
+       if (!CUsbListener::Create())
+               _DBG("UsbListener creation failed");
 
        m->conCb = *cb;
 
@@ -55,8 +50,8 @@ void CUsb::Destroy(void)
 {
        ASSERT(m);
 
-       if (CUsbConnectionListener::FlagCreate())
-               CUsbConnectionListener::Destroy();
+       if (CUsbListener::FlagCreate())
+               CUsbListener::Destroy();
 
        delete m;
        m = NULL;
@@ -89,7 +84,7 @@ void CUsb::GetConnected(void)
        int count;
        SUsbHostDeviceInfo devInfo;
 
-       if (!CUsbConnectionListener::FlagCreate())
+       if (!CUsbListener::FlagCreate())
                return;
 
        count = ConnectionCount();

diff --git a/src/view/allsource_view.cpp b/src/view/allsource_view.cpp
index 5adf948..b71edfe 100644 (file)
--- a/src/view/allsource_view.cpp
+++ b/src/view/allsource_view.cpp
@@ -14,20 +14,12 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <app.h>
 #include <aul.h>
-
-#include "AppCommon.h"
-#include "BaseView.h"
-#include "ViewMgr.h"
-#include "BaseLayout.h"
-#include "LayoutMgr.h"
-#include "InputHandler.h"
+#include "dbg.h"
+#include <AppCommon.h>
 #include "source_mgr.h"
 #include "util.h"
 #include "def.h"
-#include "dbg.h"
 #include "allsource_view.h"
 #include "plugged_layout.h"
 

diff --git a/src/view/menu_view.cpp b/src/view/menu_view.cpp
index 73b0178..300f643 100644 (file)
--- a/src/view/menu_view.cpp
+++ b/src/view/menu_view.cpp
@@ -14,18 +14,12 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <app.h>
 #include <aul.h>
-
-#include "AppCommon.h"
-#include "BaseView.h"
-#include "ViewMgr.h"
-#include "InputHandler.h"
+#include "dbg.h"
+#include <AppCommon.h>
 #include "source_mgr.h"
 #include "util.h"
 #include "def.h"
-#include "dbg.h"
 #include "menu_view.h"
 #include "external.h"
 

diff --git a/src/view/plugged_layout.cpp b/src/view/plugged_layout.cpp
index 586a69a..e490e2d 100644 (file)
--- a/src/view/plugged_layout.cpp
+++ b/src/view/plugged_layout.cpp
@@ -14,17 +14,9 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <app.h>
 #include "def.h"
 #include "dbg.h"
-
-#include "AppCommon.h"
-#include "BaseView.h"
-#include "ViewMgr.h"
-#include "BaseLayout.h"
-#include "LayoutMgr.h"
-#include "InputHandler.h"
+#include <AppCommon.h>
 #include "external.h"
 #include "source_mgr.h"
 #include "menu_view.h"