Fix build error due to changing app-common

Change-Id: I0d7e0c98bc0c6709e1c43b05c04c76f99e40d3f7
Signed-off-by: JuWan Kim <juwan.kim@samsung.com>

diff --git a/include/DirectoryInfo.h b/include/DirectoryInfo.h
index 6d5ee99..4bfd1a1 100644 (file)
--- a/include/DirectoryInfo.h
+++ b/include/DirectoryInfo.h
@@ -18,9 +18,6 @@
 #define __DIRECTORY_INFO_H__
 
 
-#include "ExtNameInfo.h"
-
-
 class CDirectoryInfo : public CExtNameInfo {
 private:
        struct SDirectoryInfo* m;
@@ -42,4 +39,4 @@ public:
 }; 
 
 
-#endif /* __DIRECTORY_INFO_H__ */
\ No newline at end of file
+#endif /* __DIRECTORY_INFO_H__ */

diff --git a/include/FbBaseView.h b/include/FbBaseView.h
index 27ebf9e..f1c25c9 100644 (file)
--- a/include/FbBaseView.h
+++ b/include/FbBaseView.h
@@ -1,10 +1,7 @@
 #ifndef __FBBASE_VIEW_H__
 #define __FBBASE_VIEW_H__
 
-#include <MediaContentDbListener.h>
-#include <UsbConnectionListener.h>
-
-class CFbBaseView : public CBaseView, public CUsbConnectionListener, public CMediaContentDbUpdateListener {
+class CFbBaseView : public CBaseView, public CUsbListener, public CMediaContentListener {
 private:
        struct SFbBaseView* m;
 
@@ -41,7 +38,7 @@ public:
 public:
 
        virtual void OnStatusChanged(SUsbHostDeviceInfo *changedDevice, SUsbHostDeviceStatus status);
-       virtual void OnUpdated(const SEntity *entity);
+       virtual void OnDbUpdated(const SEntity *entity);
 };
 
 

diff --git a/include/FileGrid.h b/include/FileGrid.h
index c9d89b9..ec46230 100644 (file)
--- a/include/FileGrid.h
+++ b/include/FileGrid.h
@@ -18,9 +18,6 @@
 #define __FILE_GRID_H__
 
 
-#include <InputHandler.h>
-
-
 class CFileGrid : public CListenerMgr, IMouseMoveListener, IKeyUpListener {
 private:
        struct SFileGrid* m;

diff --git a/include/dbg.h b/include/dbg.h
index 6d17a51..3bbab0f 100644 (file)
--- a/include/dbg.h
+++ b/include/dbg.h
@@ -18,7 +18,6 @@
 #define __DBG_H__
 
 #include <dlog.h>
-#include <AppCommon.h>
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/src/data/DirectoryInfo.cpp b/src/data/DirectoryInfo.cpp
index 9ecbabe..a1eea17 100644 (file)
--- a/src/data/DirectoryInfo.cpp
+++ b/src/data/DirectoryInfo.cpp
@@ -14,14 +14,11 @@
 * limitations under the License.
 */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "dbg.h"
-#include "i18n.h"
+#include <AppCommon.h>
 #include "common.h"
-#include <media_content.h>
-
-#include "ExtNameInfo.h"
 #include "DirectoryInfo.h"
 
 

diff --git a/src/data/FileInfo.cpp b/src/data/FileInfo.cpp
index b50a98c..034fef2 100644 (file)
--- a/src/data/FileInfo.cpp
+++ b/src/data/FileInfo.cpp
@@ -14,14 +14,11 @@
 * limitations under the License.
 */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "dbg.h"
-#include "i18n.h"
+#include <AppCommon.h>
 #include "common.h"
-#include <media_content.h>
-
-#include "ExtNameInfo.h"
 #include "FileInfo.h"
 
 

diff --git a/src/data/FileList.cpp b/src/data/FileList.cpp
index 39a56d2..67cbb91 100644 (file)
--- a/src/data/FileList.cpp
+++ b/src/data/FileList.cpp
@@ -14,16 +14,12 @@
 * limitations under the License.
 */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <Eina.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #include "common.h"
-#include "i18n.h"
-
-#include <media_content.h>
-#include "AppCommon.h"
-#include "ExtNameInfo.h"
 #include "FileList.h"
 
 int CFileList::t_Max(void)

diff --git a/src/data/Mediadata.cpp b/src/data/Mediadata.cpp
index 2634a63..1a58fc4 100644 (file)
--- a/src/data/Mediadata.cpp
+++ b/src/data/Mediadata.cpp
@@ -14,18 +14,13 @@
  * limitations under the License.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <Eina.h>
-#include <media_content.h>
-//#include <usb-device.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #include "common.h"
-#include "i18n.h"
-
-#include "AppCommon.h"
 #include "FileList.h"
-#include "ExtNameInfo.h"
 #include "Mediadata.h"
 #include "MediadataImpl.h"
 

diff --git a/src/data/MediadataImpl.cpp b/src/data/MediadataImpl.cpp
index 1539e2c..3f7f65b 100644 (file)
--- a/src/data/MediadataImpl.cpp
+++ b/src/data/MediadataImpl.cpp
@@ -14,18 +14,14 @@
 * limitations under the License.
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <Eina.h>
-#include <media_content.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #include "common.h"
-#include "i18n.h"
-
-#include "AppCommon.h"
 #include "FileList.h"
-#include "ExtNameInfo.h"
 #include "FileInfo.h"
 #include "DirectoryInfo.h"
 #include "Mediadata.h"

diff --git a/src/layouts/FbAllLayout.cpp b/src/layouts/FbAllLayout.cpp
index 336488d..093b4be 100644 (file)
--- a/src/layouts/FbAllLayout.cpp
+++ b/src/layouts/FbAllLayout.cpp
@@ -1,15 +1,9 @@
 #include <Elementary.h>
-#include <AppCommon.h>
-#include <BaseView.h>
-#include <ViewMgr.h>
-#include <BaseLayout.h>
-#include <LayoutMgr.h>
-
 #include "dbg.h"
+#include <AppCommon.h>
 #include "define.h"
 #include "FileGrid.h"
 
-#include <CtxPopup.h>
 #include "FbBaseView.h"
 #include "FbAllLayout.h"
 #include "../views/BaseView/Info.h"

diff --git a/src/layouts/FbMusicLayout.cpp b/src/layouts/FbMusicLayout.cpp
index ede52f1..3083976 100644 (file)
--- a/src/layouts/FbMusicLayout.cpp
+++ b/src/layouts/FbMusicLayout.cpp
@@ -1,15 +1,10 @@
 #include <Elementary.h>
-#include <AppCommon.h>
-#include <BaseView.h>
-#include <ViewMgr.h>
-#include <BaseLayout.h>
-#include <LayoutMgr.h>
 
 #include "dbg.h"
+#include <AppCommon.h>
 #include "define.h"
 #include "FileGrid.h"
 
-#include <CtxPopup.h>
 #include "FbBaseView.h"
 #include "FbMusicLayout.h"
 #include "../views/BaseView/Info.h"

diff --git a/src/layouts/FbPhotoLayout.cpp b/src/layouts/FbPhotoLayout.cpp
index cfefd5a..55a7814 100644 (file)
--- a/src/layouts/FbPhotoLayout.cpp
+++ b/src/layouts/FbPhotoLayout.cpp
@@ -1,15 +1,8 @@
 #include <Elementary.h>
-#include <AppCommon.h>
-#include <BaseView.h>
-#include <ViewMgr.h>
-#include <BaseLayout.h>
-#include <LayoutMgr.h>
-
 #include "dbg.h"
+#include <AppCommon.h>
 #include "define.h"
 #include "FileGrid.h"
-
-#include <CtxPopup.h>
 #include "FbBaseView.h"
 #include "FbPhotoLayout.h"
 #include "../views/BaseView/Info.h"

diff --git a/src/layouts/FbVideoLayout.cpp b/src/layouts/FbVideoLayout.cpp
index 69f4b8f..8d1e06c 100644 (file)
--- a/src/layouts/FbVideoLayout.cpp
+++ b/src/layouts/FbVideoLayout.cpp
@@ -1,15 +1,10 @@
 #include <Elementary.h>
-#include <AppCommon.h>
-#include <BaseView.h>
-#include <ViewMgr.h>
-#include <BaseLayout.h>
-#include <LayoutMgr.h>
 
 #include "dbg.h"
+#include <AppCommon.h>
 #include "define.h"
 #include "FileGrid.h"
 
-#include <CtxPopup.h>
 #include "FbBaseView.h"
 #include "FbVideoLayout.h"
 #include "../views/BaseView/Info.h"

diff --git a/src/main.cpp b/src/main.cpp
index 6631d54..387a3b5 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,26 +14,13 @@
  * limitations under the License.
  */
 
-#include <string.h>
-#include <app.h>
-#include <Elementary.h>
-#include <Eina.h>
+#include <cstring>
 #include "dbg.h"
-#include "define.h"
-
 #include <AppCommon.h>
-#include "BaseApp.h"
-#include <BaseView.h>
-#include <ViewMgr.h>
-#include <CtxPopup.h>
-#include <InputHandler.h>
-
+#include "define.h"
 #include "FbBaseView.h"
-#include <ExtNameInfo.h>
 #include "FbContextView.h"
 
-#include <SortMgr.h>
-
 #define PARAM_SOURCE "source"
 #define FBR_WIN_TITLE "File Browser"
 

diff --git a/src/views/BaseView/FbBaseView.cpp b/src/views/BaseView/FbBaseView.cpp
index e2bd075..22b1bdb 100644 (file)
--- a/src/views/BaseView/FbBaseView.cpp
+++ b/src/views/BaseView/FbBaseView.cpp
@@ -18,30 +18,16 @@
 #include <Eina.h>
 #include <Ecore.h>
 #include <aul.h>
-#include "i18n.h"
 #include "define.h"
-
-#include "AppCommon.h"
-#include "ExtNameInfo.h"
 #include "common.h"
 #include "dbg.h"
-#include <MediaContentDbListener.h>
-#include <UsbConnectionListener.h>
-#include "Popup.h"
-#include "InputHandler.h"
-
-#include <CtxPopup.h>
-
-#include <BaseView.h>
+#include <AppCommon.h>
 #include "FbBaseView.h"
+#include "i18n.h"
 #include "Info.h"
-
+#include "Popup.h"
 #include "SourceCtxPopup.h"
 #include "SortCtxPopup.h"
-
-#include <ViewMgr.h>
-#include <LayoutMgr.h>
-#include <BaseLayout.h>
 #include "FbAllLayout.h"
 #include "FbPhotoLayout.h"
 #include "FbVideoLayout.h"
@@ -109,7 +95,7 @@ struct SFbBaseView {
        Evas_Object *eoBtnSource;
        Evas_Object *eoBtnSort;
 
-       CCtxPopup   *pCtxPopup;
+       CContextPopup   *pCtxPopup;
        CPopup      *pPopup;
 
        CLayoutMgr     *pLayoutMgr;
@@ -182,7 +168,7 @@ struct SFbBaseView {
        private:
                SFbBaseView *m;
        private:
-               static void sm_CbCtxPopupSelected(void* cookie, CCtxPopup* instance, const char* text)
+               static void sm_CbCtxPopupSelected(void* cookie, CContextPopup* instance, const char* text)
                {
                        SFbBaseView* m = (SFbBaseView*)cookie;
                        if (!m)
@@ -190,7 +176,7 @@ struct SFbBaseView {
 
                        _DBG(" instance->Type(): %d", instance->Type());
                        switch (instance->Type()) {
-                       case CCtxPopup::TOPBTN_SORT:
+                       case CContextPopup::TOPBTN_SORT:
                                elm_object_text_set(m->eoBtnSort, text);
                                switch(m->curLayoutId)
                                {
@@ -210,7 +196,7 @@ struct SFbBaseView {
                                m->pLayoutMgr->Show(_get_layout_id(m->curLayoutId));
                                break;
 
-                       case CCtxPopup::TOPBTN_SOURCE:
+                       case CContextPopup::TOPBTN_SOURCE:
                                elm_object_text_set(m->eoBtnSource, text);
                                switch(m->curLayoutId)
                                {
@@ -601,10 +587,10 @@ bool CFbBaseView::Create(void *data)
                _CHECK(m->pLayoutMgr->AddLayout(m->pFbVideoLayout))
                _CHECK(m->pLayoutMgr->AddLayout(m->pFbMusicLayout))
                _COMMAND{
-                       if(!CUsbConnectionListener::Create())
-                               _ERR("Fail to create CUsbConnectionListener()");
-                       if(!CMediaContentDbUpdateListener::Create())
-                               _ERR("Fail to create CMediaContentDbUpdateListener()");
+                       if(!CUsbListener::Create())
+                               _ERR("Fail to create CUsbListener()");
+                       if(!CMediaContentListener::Create())
+                               _ERR("Fail to create CMediaContentListener()");
                }
                _WHEN_SUCCESS{}
 
@@ -646,10 +632,10 @@ void CFbBaseView::Destroy(void)
 
        CBaseView::Destroy();
 
-       if(CMediaContentDbUpdateListener::FlagCreate())
-               CMediaContentDbUpdateListener::Destroy();
-       if(CUsbConnectionListener::FlagCreate())
-               CUsbConnectionListener::Destroy();
+       if(CMediaContentListener::FlagCreate())
+               CMediaContentListener::Destroy();
+       if(CUsbListener::FlagCreate())
+               CUsbListener::Destroy();
 
        m->pLayoutMgr->RemoveLayout(m->pFbMusicLayout);
        m->pFbMusicLayout->Destroy();
@@ -709,7 +695,7 @@ void CFbBaseView::OnStatusChanged(SUsbHostDeviceInfo *changedDevice, SUsbHostDev
 }
 
 
-void CFbBaseView::OnUpdated(const SEntity *entity)
+void CFbBaseView::OnDbUpdated(const SEntity *entity)
 {
        _DBG();
        m->pPopup->Destroy();

diff --git a/src/views/BaseView/FileGrid.cpp b/src/views/BaseView/FileGrid.cpp
index 191302b..61e48e4 100644 (file)
--- a/src/views/BaseView/FileGrid.cpp
+++ b/src/views/BaseView/FileGrid.cpp
@@ -19,21 +19,14 @@
 #include <Ecore.h>
 #include <aul.h>
 #include "dbg.h"
-#include "i18n.h"
+#include <AppCommon.h>
 #include "define.h"
 #include "common.h"
 
-#include <AppCommon.h>
 #include "Mediadata.h"
-#include "ExtNameInfo.h"
-#include <SortMgr.h>
 #include "GengridItemClass.h"
-#include "InputHandler.h"
 #include "FileGrid.h"
 #include "Info.h"
-#include <BaseView.h>
-#include <InputHandler.h>
-#include <ViewMgr.h>
 #include "FbContextView.h"
 
 

diff --git a/src/views/BaseView/GengridItemClass.cpp b/src/views/BaseView/GengridItemClass.cpp
index 5086c97..e69aec4 100644 (file)
--- a/src/views/BaseView/GengridItemClass.cpp
+++ b/src/views/BaseView/GengridItemClass.cpp
@@ -14,16 +14,13 @@
 * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
 #include <Ecore.h>
 #include <aul.h>
-#include "i18n.h"
+#include "dbg.h"
+#include <AppCommon.h>
 #include "define.h"
 #include "common.h"
-#include "dbg.h"
-#include <media_content.h>
-#include "ExtNameInfo.h"
+#include "i18n.h"
 #include "DirectoryInfo.h"
 #include "GengridItemClass.h"
 

diff --git a/src/views/BaseView/Info.cpp b/src/views/BaseView/Info.cpp
index 44c2c2b..0b1e889 100644 (file)
--- a/src/views/BaseView/Info.cpp
+++ b/src/views/BaseView/Info.cpp
@@ -18,10 +18,10 @@
 #include <Eina.h>
 #include <Ecore.h>
 #include <aul.h>
-#include "i18n.h"
+#include "dbg.h"
+#include <AppCommon.h>
 #include "define.h"
 #include "common.h"
-#include "ExtNameInfo.h"
 #include "Info.h"
 
 

diff --git a/src/views/BaseView/Popup.cpp b/src/views/BaseView/Popup.cpp
index 1ffc9c7..77e8af7 100644 (file)
--- a/src/views/BaseView/Popup.cpp
+++ b/src/views/BaseView/Popup.cpp
@@ -18,12 +18,11 @@
 #include <Eina.h>
 #include <Ecore.h>
 #include <aul.h>
-#include "i18n.h"
 
-#include "AppCommon.h"
 #include "define.h"
 #include "common.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #include "Popup.h"
 
 #define MAX_POPUP_TIME 10 /* seconds */

diff --git a/src/views/BaseView/SortCtxPopup.cpp b/src/views/BaseView/SortCtxPopup.cpp
index ce8ecda..7505cfc 100644 (file)
--- a/src/views/BaseView/SortCtxPopup.cpp
+++ b/src/views/BaseView/SortCtxPopup.cpp
@@ -14,19 +14,19 @@
 * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
 #include <Ecore.h>
 #include <aul.h>
-#include "i18n.h"
+#include "dbg.h"
+#include <AppCommon.h>
 #include "define.h"
 #include "common.h"
+#include "i18n.h"
 
 #include "Info.h"
-#include "CtxPopup.h"
-#include <app-res-defines.h>
 #include "SortCtxPopup.h"
 
+#define BTN_ID                   "BTN_ID"
+
 const char *sorttext[] = {
        N_("Title A-Z"),
        N_("Title Z-A"),
@@ -48,7 +48,7 @@ const char *sortbtnids[] = {
 void CSortCtxPopup::t_OnConfiguration(void)
 {
        t_SetList(sorttext, ARRAY_SIZE(sorttext), (int)CInfo::SortType(),
-                       CCtxPopup::TOPBTN_SORT, sortbtnids,
+                       CContextPopup::TOPBTN_SORT, sortbtnids,
                        POSITION_SORT_POPUP_X, POSITION_SORT_POPUP_Y,
                        NULL,
                        FBR_STYLE_HOVER_ENTRY, FBR_STYLE_HOVER_ENTRY, FBR_STYLE_HOVER_ENTRY);
@@ -79,7 +79,7 @@ void CSortCtxPopup::t_OnBtnClicked(Evas_Object* obj, void* ev)
                return;
 
        CInfo::SetSortType(index);
-       CCtxPopup::t_OnBtnClicked(obj, ev);
+       CContextPopup::t_OnBtnClicked(obj, ev);
 
        Destroy(); //_destroy_ctxpopup(bd);
 }

diff --git a/src/views/BaseView/SortCtxPopup.h b/src/views/BaseView/SortCtxPopup.h
index 6535208..c91a2aa 100644 (file)
--- a/src/views/BaseView/SortCtxPopup.h
+++ b/src/views/BaseView/SortCtxPopup.h
@@ -2,7 +2,7 @@
 #define __SORT_CTX_POPUP_H__
 
 
-class CSortCtxPopup : public CCtxPopup {
+class CSortCtxPopup : public CContextPopup {
 protected:
 
        virtual void t_OnConfiguration(void);

diff --git a/src/views/BaseView/SourceCtxPopup.cpp b/src/views/BaseView/SourceCtxPopup.cpp
index 36697d3..f7b4690 100644 (file)
--- a/src/views/BaseView/SourceCtxPopup.cpp
+++ b/src/views/BaseView/SourceCtxPopup.cpp
@@ -18,16 +18,16 @@
 #include <Eina.h>
 #include <Ecore.h>
 #include <aul.h>
-#include "i18n.h"
+#include "dbg.h"
+#include <AppCommon.h>
 #include "define.h"
 #include "common.h"
+#include "i18n.h"
 #include "Info.h"
-#include "CtxPopup.h"
-#include <MediaContentDbListener.h>
-#include <UsbConnectionListener.h>
-#include <app-res-defines.h>
 #include "SourceCtxPopup.h"
 
+#define BTN_ID                   "BTN_ID"
+
 const char *srcbtnids[] = {
        "ALL",
        "TV",
@@ -44,7 +44,7 @@ void CSourceCtxPopup::t_OnConfiguration(void)
 {
        int size = ARRAY_SIZE(sourcetext);
 
-       CUsbConnectionListener usb;
+       CUsbListener usb;
        if(usb.Create()) {
                if (!usb.FlagConnected())
                        size--;
@@ -54,7 +54,7 @@ void CSourceCtxPopup::t_OnConfiguration(void)
                size--;
 
        t_SetList(sourcetext, size, (int)CInfo::SourceType(),
-                       CCtxPopup::TOPBTN_SOURCE, srcbtnids,
+                       CContextPopup::TOPBTN_SOURCE, srcbtnids,
                        POSITION_SOURCE_POPUP_X, POSITION_SOURCE_POPUP_Y,
                        NULL,
                        FBR_STYLE_HOVER_ENTRY, FBR_STYLE_HOVER_ENTRY, FBR_STYLE_HOVER_ENTRY);
@@ -85,7 +85,7 @@ void CSourceCtxPopup::t_OnBtnClicked(Evas_Object* obj, void* ev)
                return;
 
        CInfo::SetSourceType(index);
-       CCtxPopup::t_OnBtnClicked(obj, ev);
+       CContextPopup::t_OnBtnClicked(obj, ev);
 
        Destroy();
 }

diff --git a/src/views/BaseView/SourceCtxPopup.h b/src/views/BaseView/SourceCtxPopup.h
index ce90500..2402921 100644 (file)
--- a/src/views/BaseView/SourceCtxPopup.h
+++ b/src/views/BaseView/SourceCtxPopup.h
@@ -2,7 +2,7 @@
 #define __SOURCE_CTX_POPUP_H__
 
 
-class CSourceCtxPopup : public CCtxPopup {
+class CSourceCtxPopup : public CContextPopup {
 protected:
 
        virtual void t_OnConfiguration(void);

diff --git a/src/views/FbContextView.cpp b/src/views/FbContextView.cpp
index 6f0dea2..9a161d0 100644 (file)
--- a/src/views/FbContextView.cpp
+++ b/src/views/FbContextView.cpp
@@ -16,16 +16,11 @@
 
 #include <Elementary.h>
 #include <Eina.h>
-#include "i18n.h"
 #include "dbg.h"
-
-#include "AppCommon.h"
-#include "InputHandler.h"
+#include <AppCommon.h>
 #include "define.h"
 #include "common.h"
-#include "ExtNameInfo.h"
-#include <BaseView.h>
-#include <ViewMgr.h>
+#include "i18n.h"
 #include "FbContextView.h"
 #include "Dummy/DummyContent.h"