apply modified application-common

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

diff --git a/include/view/gallery-view/SortCtxPopup.h b/include/view/gallery-view/SortCtxPopup.h
index 0aee166..7a2b0ce 100644 (file)
--- a/include/view/gallery-view/SortCtxPopup.h
+++ b/include/view/gallery-view/SortCtxPopup.h
@@ -17,7 +17,7 @@
 #ifndef __SORT_CTXPOPUP_H__
 #define __SORT_CTXPOPUP_H__
 
-class CSortCtxPopup : public CCtxPopup {
+class CSortCtxPopup : public CContextPopup {
 private:
        int m_sortType;
 

diff --git a/include/view/gallery-view/SourceCtxPopup.h b/include/view/gallery-view/SourceCtxPopup.h
index c085408..227664a 100644 (file)
--- a/include/view/gallery-view/SourceCtxPopup.h
+++ b/include/view/gallery-view/SourceCtxPopup.h
@@ -17,7 +17,7 @@
 #ifndef __SOURCE_CTXPOPUP_H__
 #define __SOURCE_CTXPOPUP_H__
 
-class CSourceCtxPopup : public CCtxPopup {
+class CSourceCtxPopup : public CContextPopup {
 private:
        int m_sourceType;
 

diff --git a/include/view/gallery-view/gallery_view.h b/include/view/gallery-view/gallery_view.h
index 94f4839..593a3fa 100644 (file)
--- a/include/view/gallery-view/gallery_view.h
+++ b/include/view/gallery-view/gallery_view.h
@@ -65,7 +65,7 @@ struct layout_data {
 class CGalleryView : public CBaseView,
        IMouseClickedListener,
        IMouseMoveListener, IFocusedListener,
-       CMediaContentDbUpdateListener, CUsbConnectionListener {
+       CMediaContentListener, CUsbListener {
 private:
        struct SGalleryView *m;
 
@@ -83,8 +83,8 @@ private:
        static void sm_CbGetSignalFromLayout(void *cookie, int sig);
        static Eina_List *sm_CbGetMediaList(void *cookie);
 
-       static void sm_CbCtxPopupSelected(void *cookie, CCtxPopup *instance, const char *text);
-       void m_OnCtxPopupSelected(CCtxPopup *instance, const char *text);
+       static void sm_CbCtxPopupSelected(void *cookie, CContextPopup *instance, const char *text);
+       void m_OnCtxPopupSelected(CContextPopup *instance, const char *text);
 
 private:
        void m_DrawNotifyPopup(const char *text);
@@ -123,7 +123,7 @@ public:
        virtual void OnMouseMove(int id, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Move *ev);
        virtual void OnFocused(int id, Evas_Object *obj, Elm_Object_Item *item);
        virtual void OnConnect(void);
-       virtual void OnUpdated(const SEntity *entity);
+       virtual void OnDbUpdated(const SEntity *entity);
 };
 
 #endif

diff --git a/include/view/photo-viewer/SettingCtxPopup.h b/include/view/photo-viewer/SettingCtxPopup.h
index be1777b..2848c61 100644 (file)
--- a/include/view/photo-viewer/SettingCtxPopup.h
+++ b/include/view/photo-viewer/SettingCtxPopup.h
@@ -17,7 +17,7 @@
 #ifndef __SETTING_CTXPOPUP_H__
 #define __SETTING_CTXPOPUP_H__
 
-class CSettingCtxPopup : public CCtxPopup {
+class CSettingCtxPopup : public CContextPopup {
 private:
        int m_slideshowSpeed;
 

diff --git a/include/view/photo-viewer/photoviewer_view.h b/include/view/photo-viewer/photoviewer_view.h
index 64e2a7b..88a9818 100644 (file)
--- a/include/view/photo-viewer/photoviewer_view.h
+++ b/include/view/photo-viewer/photoviewer_view.h
@@ -66,8 +66,8 @@ private:
        void m_OnRotateBtnClicked(Evas_Object *obj,
                        const char *emission, const char *source);
 
-       static void sm_CbCtxPopupSelected(void *cookie, CCtxPopup *instance, const char *text);
-       void m_OnCtxPopupSelected(CCtxPopup *instance, const char *text);
+       static void sm_CbCtxPopupSelected(void *cookie, CContextPopup *instance, const char *text);
+       void m_OnCtxPopupSelected(CContextPopup *instance, const char *text);
 
        static Eina_Bool sm_CbTimerTooltip(void *cookie);
        Eina_Bool m_OnTimerTooltip(void);

diff --git a/src/data/eventinfo.cpp b/src/data/eventinfo.cpp
index 404b6d3..8e57267 100644 (file)
--- a/src/data/eventinfo.cpp
+++ b/src/data/eventinfo.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <ExtNameInfo.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "menudef.h"
 #include "mediainfo.h"
 #include "imageinfo.h"

diff --git a/src/data/folderinfo.cpp b/src/data/folderinfo.cpp
index 05566b2..7d51657 100644 (file)
--- a/src/data/folderinfo.cpp
+++ b/src/data/folderinfo.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <ExtNameInfo.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "menudef.h"
 #include "folderinfo.h"
 #include "mediainfo.h"

diff --git a/src/data/imageinfo.cpp b/src/data/imageinfo.cpp
index fe6f0f8..76cafd7 100644 (file)
--- a/src/data/imageinfo.cpp
+++ b/src/data/imageinfo.cpp
@@ -14,10 +14,8 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <media_content.h>
-#include <ExtNameInfo.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "mediainfo.h"
 #include "imageinfo.h"
 #include "util.h"

diff --git a/src/data/mediadata.cpp b/src/data/mediadata.cpp
index 95f3e4e..e5cfc1e 100644 (file)
--- a/src/data/mediadata.cpp
+++ b/src/data/mediadata.cpp
@@ -14,10 +14,8 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <media_content.h>
-#include <ExtNameInfo.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "define.h"
 #include "mediainfo.h"
 #include "eventinfo.h"

diff --git a/src/data/mediainfo.cpp b/src/data/mediainfo.cpp
index da80c73..8900de9 100644 (file)
--- a/src/data/mediainfo.cpp
+++ b/src/data/mediainfo.cpp
@@ -14,10 +14,9 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
 #include <media_content_type.h>
-#include <ExtNameInfo.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "mediainfo.h"
 #include "menudef.h"
 #include "util.h"

diff --git a/src/data/videoinfo.cpp b/src/data/videoinfo.cpp
index b594cdc..2f04b23 100644 (file)
--- a/src/data/videoinfo.cpp
+++ b/src/data/videoinfo.cpp
@@ -14,10 +14,8 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <media_content.h>
-#include <ExtNameInfo.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "mediainfo.h"
 #include "videoinfo.h"
 #include "util.h"

diff --git a/src/main.cpp b/src/main.cpp
index 0dc01d3..40ccda1 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,25 +14,13 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
 #include <appsvc.h>
-#include <app.h>
-#include <media_content.h>
+#include "dbg.h"
+#include <AppCommon.h>
+#include "i18n.h"
 #include "define.h"
 #include "menudef.h"
 #include "util.h"
-#include "i18n.h"
-#include "AppCommon.h"
-#include "BaseApp.h"
-#include "BaseView.h"
-#include "ViewMgr.h"
-#include "BaseLayout.h"
-#include "ExtNameInfo.h"
-#include "InputHandler.h"
-#include "SortMgr.h"
-#include "MediaContentDbListener.h"
-#include "UsbConnectionListener.h"
-#include "CtxPopup.h"
 #include "timeout_handler.h"
 #include "mediainfo.h"
 #include "mediadata.h"

diff --git a/src/util/timeout_handler.cpp b/src/util/timeout_handler.cpp
index 85619e9..9d33582 100644 (file)
--- a/src/util/timeout_handler.cpp
+++ b/src/util/timeout_handler.cpp
@@ -14,13 +14,9 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <Ecore.h>
-
+#include "dbg.h"
 #include <AppCommon.h>
 #include "timeout_handler.h"
-#include "dbg.h"
 
 
 #define NUM_EVENT_HANDLERS 7

diff --git a/src/util/util.cpp b/src/util/util.cpp
index 8e86a5d..7a9bafe 100644 (file)
--- a/src/util/util.cpp
+++ b/src/util/util.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
 */
 
-#include <media_content.h>
-#include <util.h>
-#include "ExtNameInfo.h"
+#include "dbg.h"
+#include <AppCommon.h>
+#include "util.h"
 #include "mediainfo.h"
 #include "mediadata.h"
 

diff --git a/src/view/ctxtmenu-view/ctxtmenu_view.cpp b/src/view/ctxtmenu-view/ctxtmenu_view.cpp
index d3e1b7d..a6e4904 100644 (file)
--- a/src/view/ctxtmenu-view/ctxtmenu_view.cpp
+++ b/src/view/ctxtmenu-view/ctxtmenu_view.cpp
@@ -14,22 +14,15 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <app.h>
-#include <media_content.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "util.h"
-#include <InputHandler.h>
 #include "menudef.h"
 #include "timeout_handler.h"
-#include "ExtNameInfo.h"
 #include "mediainfo.h"
 #include "videoinfo.h"
 #include "mediadata.h"
 #include "viewdata.h"
-#include "AppCommon.h"
-#include "BaseView.h"
-#include "ViewMgr.h"
 #include "ctxtmenu_view.h"
 #include "video_player.h"
 

diff --git a/src/view/gallery-view/SortCtxPopup.cpp b/src/view/gallery-view/SortCtxPopup.cpp
index dd852d5..2dd69b7 100644 (file)
--- a/src/view/gallery-view/SortCtxPopup.cpp
+++ b/src/view/gallery-view/SortCtxPopup.cpp
@@ -14,16 +14,8 @@
 * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Ecore.h>
-#include <app.h>
-#include <InputHandler.h>
-#include <ExtNameInfo.h>
-#include <MediaContentDbListener.h>
-#include <UsbConnectionListener.h>
-#include <BaseView.h>
-#include <BaseLayout.h>
-#include <CtxPopup.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "SortCtxPopup.h"
 #include "gallery_view.h"
 #include "define.h"
@@ -32,7 +24,7 @@
 void CSortCtxPopup::t_OnConfiguration(void)
 {
        t_SetList(sorttext, SORT_TEXT_SIZE, m_sortType,
-                       CCtxPopup::TOPBTN_SORT, sort_btn_id,
+                       CContextPopup::TOPBTN_SORT, sort_btn_id,
                        POSITION_SORT_POPUP_X, POSITION_SORT_POPUP_Y,
                        NULL,
                        STYLE_BTN_HOVERTEXT, STYLE_BTN_HOVERTEXT, STYLE_BTN_HOVERTEXT);
@@ -43,7 +35,7 @@ void CSortCtxPopup::t_OnBtnClicked(Evas_Object *obj, void  *ev)
        if (!obj)
                return;
 
-       CCtxPopup::t_OnBtnClicked(obj, ev);
+       CContextPopup::t_OnBtnClicked(obj, ev);
        Destroy();
 }
 

diff --git a/src/view/gallery-view/SourceCtxPopup.cpp b/src/view/gallery-view/SourceCtxPopup.cpp
index 57adc8a..937305a 100644 (file)
--- a/src/view/gallery-view/SourceCtxPopup.cpp
+++ b/src/view/gallery-view/SourceCtxPopup.cpp
@@ -14,16 +14,8 @@
 * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Ecore.h>
-#include <app.h>
-#include <InputHandler.h>
-#include <ExtNameInfo.h>
-#include <MediaContentDbListener.h>
-#include <UsbConnectionListener.h>
-#include <BaseView.h>
-#include <BaseLayout.h>
-#include <CtxPopup.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "SourceCtxPopup.h"
 #include "gallery_view.h"
 #include "define.h"
@@ -32,7 +24,7 @@
 void CSourceCtxPopup::t_OnConfiguration(void)
 {
        t_SetList(sourcetext, SOURCE_TEXT_SIZE, m_sourceType,
-                       CCtxPopup::TOPBTN_SOURCE, source_btn_id,
+                       CContextPopup::TOPBTN_SOURCE, source_btn_id,
                        POSITION_SOURCE_POPUP_X, POSITION_SOURCE_POPUP_Y,
                        NULL,
                        STYLE_BTN_HOVERTEXT, STYLE_BTN_HOVERTEXT, STYLE_BTN_HOVERTEXT);
@@ -43,7 +35,7 @@ void CSourceCtxPopup::t_OnBtnClicked(Evas_Object *obj, void  *ev)
        if (!obj)
                return;
 
-       CCtxPopup::t_OnBtnClicked(obj, ev);
+       CContextPopup::t_OnBtnClicked(obj, ev);
        Destroy();
 }
 

diff --git a/src/view/gallery-view/gallery_view.cpp b/src/view/gallery-view/gallery_view.cpp
index 6f6aca6..59d9e41 100644 (file)
--- a/src/view/gallery-view/gallery_view.cpp
+++ b/src/view/gallery-view/gallery_view.cpp
@@ -14,22 +14,10 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <app.h>
-#include <media_content.h>
-#include <InputHandler.h>
-#include <ExtNameInfo.h>
-#include <MediaContentDbListener.h>
-#include <UsbConnectionListener.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "util.h"
 #include "menudef.h"
-#include "AppCommon.h"
-#include "BaseView.h"
-#include "ViewMgr.h"
-#include "BaseLayout.h"
-#include "LayoutMgr.h"
-#include "CtxPopup.h"
 #include "gallery_view.h"
 #include "layout_all.h"
 #include "layout_events.h"
@@ -89,7 +77,7 @@ struct SGalleryView {
        CViewMgr *pViewMgr;
        CMediadata *pMediadata;
 
-       CCtxPopup *pCtxPopup;
+       CContextPopup *pCtxPopup;
 
        struct layout_data *ld;
 
@@ -184,7 +172,7 @@ void CGalleryView::m_DrawNotifyPopup(const char *text)
        m->transit = transit;
 }
 
-void CGalleryView::sm_CbCtxPopupSelected(void *cookie, CCtxPopup *instance, const char *text)
+void CGalleryView::sm_CbCtxPopupSelected(void *cookie, CContextPopup *instance, const char *text)
 {
        CGalleryView *root = (CGalleryView *)cookie;
        if (!root)
@@ -193,12 +181,12 @@ void CGalleryView::sm_CbCtxPopupSelected(void *cookie, CCtxPopup *instance, cons
        root->m_OnCtxPopupSelected(instance, text);
 }
 
-void CGalleryView::m_OnCtxPopupSelected(CCtxPopup *instance, const char *text)
+void CGalleryView::m_OnCtxPopupSelected(CContextPopup *instance, const char *text)
 {
        int i;
 
        switch (instance->Type()) {
-       case CCtxPopup::TOPBTN_SORT:
+       case CContextPopup::TOPBTN_SORT:
                for (i = 0; i < SORT_TEXT_SIZE; i++) {
                        if (!strcmp(sorttext[i], text))
                                break;
@@ -212,7 +200,7 @@ void CGalleryView::m_OnCtxPopupSelected(CCtxPopup *instance, const char *text)
                elm_object_text_set(m->hover_btn, text);
                m_SortLayout();
                break;
-       case CCtxPopup::TOPBTN_SOURCE:
+       case CContextPopup::TOPBTN_SOURCE:
                for (i = 0; i < SOURCE_TEXT_SIZE; i++) {
                        if (!strcmp(sourcetext[i], text))
                                break;
@@ -582,11 +570,11 @@ bool CGalleryView::Create(void *data)
 
        evas_object_data_set(m->base, PRIV_DATA, m);
 
-       if (!CMediaContentDbUpdateListener::Create())
+       if (!CMediaContentListener::Create())
                goto error;
 
-       if (!CUsbConnectionListener::Create())
-               _DBG("UsbConnectionListener creation failed");
+       if (!CUsbListener::Create())
+               _DBG("UsbListener creation failed");
 
        if (!m_DrawItems())
                goto error;
@@ -608,9 +596,9 @@ void CGalleryView::Destroy(void)
 {
        ASSERT(m);
 
-       CMediaContentDbUpdateListener::Destroy();
-       if (CUsbConnectionListener::FlagCreate())
-               CUsbConnectionListener::Destroy();
+       CMediaContentListener::Destroy();
+       if (CUsbListener::FlagCreate())
+               CUsbListener::Destroy();
 
        m->pMediadata->DestroyMediaList();
 
@@ -829,7 +817,7 @@ void CGalleryView::OnConnect(void)
        m_DrawNotifyPopup(_(TEXT_LOADING_MEDIA));
 }
 
-void CGalleryView::OnUpdated(const SEntity *entity)
+void CGalleryView::OnDbUpdated(const SEntity *entity)
 {
        if (m->source_type == E_SOURCE_TV)
                return;

diff --git a/src/view/gallery-view/layout_all.cpp b/src/view/gallery-view/layout_all.cpp
index 71faa27..e284269 100644 (file)
--- a/src/view/gallery-view/layout_all.cpp
+++ b/src/view/gallery-view/layout_all.cpp
@@ -14,34 +14,21 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <app.h>
-#include <media_content.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "util.h"
 #include "define.h"
-#include "ExtNameInfo.h"
 #include "mediainfo.h"
 #include "mediadata.h"
 #include "imageinfo.h"
 #include "videoinfo.h"
 #include "viewdata.h"
 #include "menudef.h"
-#include "BaseView.h"
-#include "ViewMgr.h"
-#include "InputHandler.h"
-#include "LayoutMgr.h"
-#include "BaseLayout.h"
-#include "SortMgr.h"
-#include "MediaContentDbListener.h"
-#include "UsbConnectionListener.h"
-#include "CtxPopup.h"
 #include "video_player.h"
 #include "gallery_view.h"
 #include "layout_all.h"
 #include "layout_events.h"
 #include "layout_folder.h"
-#include "AppCommon.h"
 
 #define ALL_GRID 0
 

diff --git a/src/view/gallery-view/layout_events.cpp b/src/view/gallery-view/layout_events.cpp
index b86d162..36398e0 100644 (file)
--- a/src/view/gallery-view/layout_events.cpp
+++ b/src/view/gallery-view/layout_events.cpp
@@ -14,11 +14,8 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <app.h>
-#include <media_content.h>
-#include "ExtNameInfo.h"
+#include "dbg.h"
+#include <AppCommon.h>
 #include "util.h"
 #include "define.h"
 #include "mediainfo.h"
@@ -26,20 +23,10 @@
 #include "eventinfo.h"
 #include "viewdata.h"
 #include "menudef.h"
-#include "BaseView.h"
-#include "ViewMgr.h"
-#include "InputHandler.h"
-#include "SortMgr.h"
-#include "MediaContentDbListener.h"
-#include "UsbConnectionListener.h"
-#include "CtxPopup.h"
 #include "video_player.h"
-#include "BaseLayout.h"
-#include "LayoutMgr.h"
 #include "gallery_view.h"
 #include "layout_all.h"
 #include "layout_events.h"
-#include "AppCommon.h"
 
 #define EVENT_GRID 0
 

diff --git a/src/view/gallery-view/layout_folder.cpp b/src/view/gallery-view/layout_folder.cpp
index 462fdeb..ab33aa4 100644 (file)
--- a/src/view/gallery-view/layout_folder.cpp
+++ b/src/view/gallery-view/layout_folder.cpp
@@ -14,30 +14,17 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <app.h>
-#include <media_content.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "util.h"
 #include "define.h"
-#include "ExtNameInfo.h"
 #include "folderinfo.h"
 #include "mediainfo.h"
 #include "mediadata.h"
 #include "menudef.h"
-#include "BaseView.h"
-#include "ViewMgr.h"
-#include "BaseLayout.h"
-#include "LayoutMgr.h"
-#include "InputHandler.h"
-#include "SortMgr.h"
-#include "MediaContentDbListener.h"
-#include "UsbConnectionListener.h"
-#include "CtxPopup.h"
 #include "layout_all.h"
 #include "layout_folder.h"
 #include "gallery_view.h"
-#include "AppCommon.h"
 
 #define FOLDER_GRID 0
 

diff --git a/src/view/photo-viewer/SettingCtxPopup.cpp b/src/view/photo-viewer/SettingCtxPopup.cpp
index 85e45e6..19c6890 100644 (file)
--- a/src/view/photo-viewer/SettingCtxPopup.cpp
+++ b/src/view/photo-viewer/SettingCtxPopup.cpp
@@ -14,14 +14,8 @@
 * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Ecore.h>
-#include <app.h>
-#include <InputHandler.h>
-#include <ExtNameInfo.h>
-#include <BaseView.h>
-#include <BaseLayout.h>
-#include <CtxPopup.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "SettingCtxPopup.h"
 #include "define.h"
 #include "menudef.h"
@@ -29,7 +23,7 @@
 void CSettingCtxPopup::t_OnConfiguration(void)
 {
        t_SetList(speed_text, MAX_SPEED_BTNS, m_slideshowSpeed,
-                       CCtxPopup::TOPBTN_BASE, speed_btn_id,
+                       CContextPopup::TOPBTN_BASE, speed_btn_id,
                        POSITION_SETTING_POPUP_X, POSITION_SETTING_POPUP_Y,
                        NULL,
                        STYLE_BTN_SHORTTEXT, STYLE_BTN_SHORTTEXT, STYLE_BTN_SHORTTEXT);
@@ -40,7 +34,7 @@ void CSettingCtxPopup::t_OnBtnClicked(Evas_Object *obj, void  *ev)
        if (!obj)
                return;
 
-       CCtxPopup::t_OnBtnClicked(obj, ev);
+       CContextPopup::t_OnBtnClicked(obj, ev);
        Destroy();
 }
 

diff --git a/src/view/photo-viewer/photoviewer_view.cpp b/src/view/photo-viewer/photoviewer_view.cpp
index d2c8ebc..41bcaea 100644 (file)
--- a/src/view/photo-viewer/photoviewer_view.cpp
+++ b/src/view/photo-viewer/photoviewer_view.cpp
@@ -14,22 +14,14 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <app.h>
-#include <media_content.h>
-#include "ExtNameInfo.h"
+#include "dbg.h"
+#include <AppCommon.h>
 #include "util.h"
 #include "menudef.h"
 #include "timeout_handler.h"
 #include "mediainfo.h"
 #include "mediadata.h"
 #include "viewdata.h"
-#include "AppCommon.h"
-#include "BaseView.h"
-#include "ViewMgr.h"
-#include "InputHandler.h"
-#include "CtxPopup.h"
 #include "photoviewer_view.h"
 #include "zoom_view.h"
 #include "SettingCtxPopup.h"
@@ -98,7 +90,7 @@ struct SPhotoViewerView {
 
        int zoom_level;
 
-       CCtxPopup *pCtxPopup;
+       CContextPopup *pCtxPopup;
 
        Ecore_Timer *focus_timer;
 
@@ -437,7 +429,7 @@ Eina_Bool CPhotoViewerView::m_OnTimerPreviewBar(void)
 }
 
 void CPhotoViewerView::sm_CbCtxPopupSelected(void *cookie,
-               CCtxPopup *instance, const char *text)
+               CContextPopup *instance, const char *text)
 {
        CPhotoViewerView *root = (CPhotoViewerView *)cookie;
        if (!root)
@@ -446,7 +438,7 @@ void CPhotoViewerView::sm_CbCtxPopupSelected(void *cookie,
        root->m_OnCtxPopupSelected(instance, text);
 }
 
-void CPhotoViewerView::m_OnCtxPopupSelected(CCtxPopup *instance, const char *text)
+void CPhotoViewerView::m_OnCtxPopupSelected(CContextPopup *instance, const char *text)
 {
        int i;
 

diff --git a/src/view/photo-viewer/zoom_view.cpp b/src/view/photo-viewer/zoom_view.cpp
index de90a7b..c1b7aae 100644 (file)
--- a/src/view/photo-viewer/zoom_view.cpp
+++ b/src/view/photo-viewer/zoom_view.cpp
@@ -14,19 +14,13 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <media_content.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "util.h"
 #include "menudef.h"
 #include "timeout_handler.h"
-#include "ExtNameInfo.h"
 #include "mediainfo.h"
 #include "mediadata.h"
-#include "AppCommon.h"
-#include "InputHandler.h"
-#include "BaseView.h"
-#include "ViewMgr.h"
 #include "zoom_view.h"
 
 #define ZOOM_VALUE_X2 0.5

diff --git a/src/view/video-player/video_player.cpp b/src/view/video-player/video_player.cpp
index 5e83fbe..e6c232e 100644 (file)
--- a/src/view/video-player/video_player.cpp
+++ b/src/view/video-player/video_player.cpp
@@ -14,11 +14,9 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
 #include <aul.h>
-#include <media_content.h>
-#include "ExtNameInfo.h"
+#include "dbg.h"
+#include <AppCommon.h>
 #include "util.h"
 #include "menudef.h"
 #include "mediainfo.h"