Modification due to the refactoring of application-common

Change-Id: I6f08e3c6385d1b9ef0d583d732cdcc2986224acc
Signed-off-by: Kim Tae Soo <taesoo46.kim@samsung.com>

diff --git a/include/ExtBaseLayout.h b/include/ExtBaseLayout.h
index 224aa56..f9d6f0a 100644 (file)
--- a/include/ExtBaseLayout.h
+++ b/include/ExtBaseLayout.h
@@ -17,8 +17,6 @@
 #ifndef __EXT_BASE_LAYOUT_H__
 #define __EXT_BASE_LAYOUT_H
 
-#include "BaseLayout.h"
-
 class CExtBaseLayout : public CBaseLayout {
 private:
        bool m_bEmptyStatus;

diff --git a/include/FolderStorage.h b/include/FolderStorage.h
index ece70ce..b6ec191 100644 (file)
--- a/include/FolderStorage.h
+++ b/include/FolderStorage.h
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 #ifndef __FOLDER_STORAGE_H__
 #define __FOLDER_STORAGE_H__
 

diff --git a/include/album_info.h b/include/album_info.h
index 49a9520..e9b4c94 100644 (file)
--- a/include/album_info.h
+++ b/include/album_info.h
@@ -17,7 +17,6 @@
 #ifndef __ALBUM_INFO_H__
 #define __ALBUM_INFO_H__
 
-#include <ExtNameInfo.h>
 
 class CAlbumInfo : public CExtNameInfo {
 private:

diff --git a/include/base-view.h b/include/base-view.h
index 0680e98..3a783ae 100644 (file)
--- a/include/base-view.h
+++ b/include/base-view.h
@@ -18,9 +18,6 @@
 #define __MUSIC_BASE_VIEW_H__
 
 
-#include <CtxPopup.h>
-
-
 struct SArgList {
        char *album_id;
        char *uri;
@@ -40,8 +37,8 @@ private:
        static void sm_CbHandleEmptyStatus(void *cookie, bool emptyStatus);
        void m_OnHandleEmptyStatus(bool emptyStatus);
 
-       static void sm_CbCtxPopupBtnSelected(void* cookie, CCtxPopup* instance, const char* text);
-       void m_CbCtxPopupBtnSelected(CCtxPopup* instance, const char* text);
+       static void sm_CbCtxPopupBtnSelected(void* cookie, CContextPopup* instance, const char* text);
+       void m_CbCtxPopupBtnSelected(CContextPopup* instance, const char* text);
 
        static Eina_Bool sm_CbShowLayoutIdler(void *cookie);
        void m_OnShowLayoutIdler(void);

diff --git a/include/category_info.h b/include/category_info.h
index 493fb16..d3ff868 100644 (file)
--- a/include/category_info.h
+++ b/include/category_info.h
@@ -17,9 +17,6 @@
 #ifndef __CATEGORY_INFO_H__
 #define __CATEGORY_INFO_H__
 
-
-#include <Eina.h>
-#include <ExtNameInfo.h>
 #include "album_info.h"
 
 class CCategoryInfo : public CExtNameInfo {

diff --git a/include/common-ui.h b/include/common-ui.h
index 2e0b2f1..d02ef9a 100644 (file)
--- a/include/common-ui.h
+++ b/include/common-ui.h
@@ -17,8 +17,6 @@
 #ifndef __COMMON_UI_H__
 #define __COMMON_UI_H__
 
-#include <Elementary.h>
-
 enum EAddType;
 
 class CCommonUI {

diff --git a/include/context-view.h b/include/context-view.h
index 8461410..6395a3e 100644 (file)
--- a/include/context-view.h
+++ b/include/context-view.h
@@ -17,10 +17,6 @@
 #ifndef __CONTEXT_VIEW_H__
 #define __CONTEXT_VIEW_H__
 
-
-#include <CtxPopup.h>
-#include "PopupWindow.h"
-
 struct SContentInfo;
 struct SRltvCtnt;
 
@@ -33,19 +29,19 @@ private:
 private:
        static void sm_CbRltdCtntSelected(void *data, Evas_Object *obj, const char *emission, const char *source);
 
-       static void sm_CbRemove(void* cookie, CPopupWindow *instance);
-       void m_OnRemove(CPopupWindow *instance);
+       static void sm_CbRemove(void* cookie, CMessagePopup *instance);
+       void m_OnRemove(CMessagePopup *instance);
 
-       static void sm_CbCancel(void* cookie, CPopupWindow *instance);
-       void m_OnCancel(CPopupWindow *instance);
+       static void sm_CbCancel(void* cookie, CMessagePopup *instance);
+       void m_OnCancel(CMessagePopup *instance);
 
        static int sm_CbSortPlaylist(const void *d1, const void *d2);
 
        static Eina_Bool sm_CbSelectIdler(void *dt);
        Eina_Bool m_OnSelectIdler(void);
 
-       static void sm_CbCtxPopupBtnSelected(void* cookie, CCtxPopup* instance, const char* text);
-       void m_CbCtxPopupBtnSelected(CCtxPopup* instance, const char* text);
+       static void sm_CbCtxPopupBtnSelected(void* cookie, CContextPopup* instance, const char* text);
+       void m_CbCtxPopupBtnSelected(CContextPopup* instance, const char* text);
 
 
 
@@ -79,8 +75,8 @@ private:
        bool m_CreateMoreinfoLayout(SRltvCtnt *rctnt, Evas_Object *img);
        bool m_CreateInfoPart(void);
        bool m_CreateFullView(void);
-       CCtxPopup *m_CreatePlaylistPopup(void);
-       CPopupWindow *m_CreateRemovePopup(Evas_Object *base, const char *msg);
+       CContextPopup *m_CreatePlaylistPopup(void);
+       CMessagePopup *m_CreateRemovePopup(Evas_Object *base, const char *msg);
        void m_DestroyPopup(void);
        void m_HandleBtnSelected(int btnType);
        void m_HandleMoreinfoSelected(Evas_Object *obj);

diff --git a/include/folder_info.h b/include/folder_info.h
index 27f4981..2b10249 100644 (file)
--- a/include/folder_info.h
+++ b/include/folder_info.h
@@ -17,8 +17,6 @@
 #ifndef __FOLDER_INFO_H__
 #define __FOLDER_INFO_H__
 
-#include <NameInfo.h>
-
 class CFolderInfo : public CNameInfo {
 private:
        struct SFolderInfo *m;

diff --git a/include/mediadata.h b/include/mediadata.h
index 024107f..f626871 100644 (file)
--- a/include/mediadata.h
+++ b/include/mediadata.h
@@ -22,11 +22,8 @@ struct mediadata;
 struct album_info;
 struct category_info;
 
-
 #include <media_content.h>
 #include "common.h"
-#include <MediaContentDbListener.h>
-
 
 class CPlaylistMgr {
 public:
@@ -39,7 +36,7 @@ public:
 };
 
 
-class CMediadata : public CMediaContentDbUpdateListener, public CPlaylistMgr {
+class CMediadata : public CMediaContentListener, public CPlaylistMgr {
 private:
        struct SMediadata* m;
 
@@ -72,7 +69,7 @@ public:
        static Eina_List *PlaylistsForCtxt(void);
 
 public:
-       virtual void OnUpdated(const SEntity *entity);
+       virtual void OnDbUpdated(const SEntity *entity);
 
 };
 

diff --git a/include/music-controller.h b/include/music-controller.h
index 018b18f..ff32a36 100644 (file)
--- a/include/music-controller.h
+++ b/include/music-controller.h
@@ -17,12 +17,8 @@
 #ifndef __MUSIC_CONTROLLER_H__
 #define __MUSIC_CONTROLLER_H__
 
-
-#include <Eina.h>
-#include <UsbConnectionListener.h>
 #include "playback-mgr.h"
 
-
 class IMusicControllerListener {
 public:
        enum SUsbStorageStatus {

diff --git a/include/playback-mgr.h b/include/playback-mgr.h
index 0711439..71589aa 100644 (file)
--- a/include/playback-mgr.h
+++ b/include/playback-mgr.h
@@ -20,7 +20,6 @@
 
 #include <player.h>
 
-
 class ICompleteListener {
 public:
        virtual void t_OnPlayComplete(void) = 0;

diff --git a/include/playback-view.h b/include/playback-view.h
index 914c6d2..cdb7445 100644 (file)
--- a/include/playback-view.h
+++ b/include/playback-view.h
@@ -19,12 +19,9 @@
 
 
 #include "common.h"
-#include "CtxPopup.h"
-
 
 struct SItemInfo;
 
-
 class CSliderWidget : 
        public CListenerMgr,
        public IMusicControllerListener,
@@ -121,8 +118,8 @@ private:
        static void sm_CbCtxtClose(void *dt);
        void m_OnCtxtClose(void);
 
-       static void sm_CbCtxPopupBtnSelected(void* cookie, CCtxPopup* instance, const char* text);
-       void m_CbCtxPopupBtnSelected(CCtxPopup* instance, const char* text);
+       static void sm_CbCtxPopupBtnSelected(void* cookie, CContextPopup* instance, const char* text);
+       void m_CbCtxPopupBtnSelected(CContextPopup* instance, const char* text);
 
 private:
        void m_HandleKeyPress(char *keyname);

diff --git a/include/playlist-mgr.h b/include/playlist-mgr.h
index 12373e0..2ae0005 100644 (file)
--- a/include/playlist-mgr.h
+++ b/include/playlist-mgr.h
@@ -18,12 +18,8 @@
 #define __PLAYLIST_MGR_H__
 
 
-#include <Eina.h>
-
-
 struct SSongInfo;
 
-
 class CPlaylist {
 private:
        struct SPlaylist* m;

diff --git a/include/song_info.h b/include/song_info.h
index 0e3a57e..a63285b 100644 (file)
--- a/include/song_info.h
+++ b/include/song_info.h
@@ -17,8 +17,6 @@
 #ifndef __SONG_INFO_H__
 #define __SONG_INFO_H__
 
-#include <ExtNameInfo.h>
-
 class CSongInfo : public CExtNameInfo {
 private:
        struct SSongInfo *m;

diff --git a/include/volume-control.h b/include/volume-control.h
index 28041cb..ce88f2a 100644 (file)
--- a/include/volume-control.h
+++ b/include/volume-control.h
@@ -17,7 +17,6 @@
 #ifndef __VOLUME_CONTROL_H__
 #define __VOLUME_CONTROL_H__
 
-
 class CVolumeController {
 public:
        static bool Mute(void);

diff --git a/src/data/AlbumStorage.cpp b/src/data/AlbumStorage.cpp
index 91c0325..57892a5 100644 (file)
--- a/src/data/AlbumStorage.cpp
+++ b/src/data/AlbumStorage.cpp
@@ -15,11 +15,11 @@
  */
 
 
-#include <Eina.h>
 #include <media_content.h>
 #include <sys/time.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "dbg.h"
 #include "i18n.h"
 #include "define.h"

diff --git a/src/data/CategoryStorage.cpp b/src/data/CategoryStorage.cpp
index 0e3642e..b740717 100644 (file)
--- a/src/data/CategoryStorage.cpp
+++ b/src/data/CategoryStorage.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <Eina.h>
 #include <media_content.h>
 #include <sys/time.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "dbg.h"
 #include "i18n.h"
 #include "define.h"

diff --git a/src/data/album_info.cpp b/src/data/album_info.cpp
index 255f001..722db2a 100644 (file)
--- a/src/data/album_info.cpp
+++ b/src/data/album_info.cpp
@@ -16,9 +16,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <AppCommon.h>
 #include "dbg.h"
 #include "i18n.h"
+#include <AppCommon.h>
 #include "album_info.h"
 
 

diff --git a/src/data/category_info.cpp b/src/data/category_info.cpp
index 979adeb..69a6639 100644 (file)
--- a/src/data/category_info.cpp
+++ b/src/data/category_info.cpp
@@ -16,10 +16,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <Eina.h>
-#include <AppCommon.h>
 #include "dbg.h"
 #include "i18n.h"
+#include <AppCommon.h>
 #include "define.h"
 #include "category_info.h"
 

diff --git a/src/data/folder_info.cpp b/src/data/folder_info.cpp
index b7742cf..5e722f3 100644 (file)
--- a/src/data/folder_info.cpp
+++ b/src/data/folder_info.cpp
@@ -16,10 +16,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <AppCommon.h>
 #include "dbg.h"
 #include "i18n.h"
-#include <NameInfo.h>
+#include <AppCommon.h>
 #include "folder_info.h"
 
 

diff --git a/src/data/mediadata.cpp b/src/data/mediadata.cpp
index 71ca524..532e9c4 100644 (file)
--- a/src/data/mediadata.cpp
+++ b/src/data/mediadata.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <Eina.h>
 #include <media_content.h>
 #include <sys/time.h>
 #include <stdlib.h>
@@ -341,12 +340,12 @@ bool CMediadata::Create(void)
        _CREATE_BEGIN{
                _CHECK(m = new SMediadata)
                _CHECK(media_content_connect() == MEDIA_CONTENT_ERROR_NONE)
-               _CHECK(CMediaContentDbUpdateListener::Create())
+               _CHECK(CMediaContentListener::Create())
                _WHEN_SUCCESS{
                        m->source_type = SOURCE_TYPE_NONE;
                }
 
-               _CHECK_FAIL{ CMediaContentDbUpdateListener::Destroy(); }
+               _CHECK_FAIL{ CMediaContentListener::Destroy(); }
                _CHECK_FAIL{ media_content_disconnect(); }
                _CHECK_FAIL{ delete m; m = NULL; }
        }_CREATE_END_AND_CATCH{ return false; }
@@ -382,7 +381,7 @@ void CMediadata::Destroy(void)
                delete cbinfo;
        }
 
-       CMediaContentDbUpdateListener::Destroy();
+       CMediaContentListener::Destroy();
 
        r = media_content_disconnect();
        if (r != MEDIA_CONTENT_ERROR_NONE)
@@ -576,7 +575,7 @@ Eina_List *CMediadata::PlaylistsForCtxt(void)
 }
 
 
-void CMediadata::OnUpdated(const SEntity *entity)
+void CMediadata::OnDbUpdated(const SEntity *entity)
 {
        Eina_List *l = NULL;
        SCbInfo *cbinfo = NULL;

diff --git a/src/data/song_info.cpp b/src/data/song_info.cpp
index 481b4bb..b90a22f 100644 (file)
--- a/src/data/song_info.cpp
+++ b/src/data/song_info.cpp
@@ -16,9 +16,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <AppCommon.h>
 #include "dbg.h"
 #include "i18n.h"
+#include <AppCommon.h>
 #include "song_info.h"
 
 

diff --git a/src/main.cpp b/src/main.cpp
index d7bf819..3a1a133 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,22 +14,14 @@
  * limitations under the License.
  */
 
-#include <app.h>
-#include <Elementary.h>
 #include "dbg.h"
+#include <AppCommon.h>
 
-
-#include <InputHandler.h>
-#include <SortMgr.h>
 #include "song_info.h"
 #include "album_info.h"
 #include "define.h"
 #include "common.h"
 #include "music-controller.h"
-#include "BaseApp.h"
-#include "BaseView.h"
-#include "BaseLayout.h"
-#include "ViewMgr.h"
 #include "base-view.h"
 #include "playback-view.h"
 #include "context-view.h"

diff --git a/src/playback/MusicControllerImpl.cpp b/src/playback/MusicControllerImpl.cpp
index e1f4e51..0108e9d 100644 (file)
--- a/src/playback/MusicControllerImpl.cpp
+++ b/src/playback/MusicControllerImpl.cpp
@@ -13,12 +13,11 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#include <app.h>
+
 #include <string.h>
 #include <stdlib.h>
 #include "dbg.h"
 #include "i18n.h"
-
 #include <AppCommon.h>
 
 #include "song_info.h"
@@ -174,7 +173,7 @@ bool CMusicControllerImpl::Create(void)
 
                        // Even if CUsbConnectionListener creation failed,
                        // application should run properly.
-                       if (!CUsbConnectionListener::Create())
+                       if (!CUsbListener::Create())
                                _DBG("CUsbConnectionListener::Create failed");
                }
 
@@ -196,8 +195,8 @@ bool CMusicControllerImpl::Create(void)
 
 void CMusicControllerImpl::Destroy(void)
 {
-       if (CUsbConnectionListener::FlagCreate())
-               CUsbConnectionListener::Destroy();
+       if (CUsbListener::FlagCreate())
+               CUsbListener::Destroy();
 
        if (!m->pPlayback->UnsetCallback())
                _ERR(" playback remove completion callback failed");

diff --git a/src/playback/MusicControllerImpl.h b/src/playback/MusicControllerImpl.h
index 251ecbb..6db31e8 100644 (file)
--- a/src/playback/MusicControllerImpl.h
+++ b/src/playback/MusicControllerImpl.h
@@ -19,7 +19,7 @@
 
 
 class CMusicControllerImpl :
-       public CUsbConnectionListener,
+       public CUsbListener,
        public ICompleteListener {
 private:
        struct SMusicControllerImpl *m;

diff --git a/src/playback/playback-mgr.cpp b/src/playback/playback-mgr.cpp
index 2ab23fb..99fac0d 100644 (file)
--- a/src/playback/playback-mgr.cpp
+++ b/src/playback/playback-mgr.cpp
@@ -15,9 +15,9 @@
  */
 
 #include <stdlib.h>
-#include <AppCommon.h>
 #include "i18n.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #include "playback-mgr.h"
 
 

diff --git a/src/playback/playlist-mgr.cpp b/src/playback/playlist-mgr.cpp
index f13c79e..23b53f1 100644 (file)
--- a/src/playback/playlist-mgr.cpp
+++ b/src/playback/playlist-mgr.cpp
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-#include <app.h>
 #include <stdlib.h>
 #include <string.h>
-#include <AppCommon.h>
 #include "dbg.h"
 #include "i18n.h"
+#include <AppCommon.h>
 #include "song_info.h"
 #include "playlist-mgr.h"
 #include "time.h"

diff --git a/src/views/ExtBaseLayout.cpp b/src/views/ExtBaseLayout.cpp
index e13bffa..930da87 100644 (file)
--- a/src/views/ExtBaseLayout.cpp
+++ b/src/views/ExtBaseLayout.cpp
@@ -14,13 +14,8 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <AppCommon.h>
-#include <ViewMgr.h>
-#include <LayoutMgr.h>
-#include <BaseView.h>
-#include <BaseLayout.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #include "ExtBaseLayout.h"
 
 

diff --git a/src/views/HandleVolume.cpp b/src/views/HandleVolume.cpp
index 10c4911..f96f9e7 100644 (file)
--- a/src/views/HandleVolume.cpp
+++ b/src/views/HandleVolume.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
 #include "dbg.h"
 #include "define.h"
 #include <AppCommon.h>

diff --git a/src/views/Info.cpp b/src/views/Info.cpp
index 00584d8..01bebbb 100644 (file)
--- a/src/views/Info.cpp
+++ b/src/views/Info.cpp
@@ -14,14 +14,12 @@
 * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <Ecore.h>
 #include "i18n.h"
+#include "dbg.h"
 #include "define.h"
 #include "common.h"
-#include "ExtNameInfo.h"
 #include "Info.h"
+#include <AppCommon.h>
 
 
 struct SInfo {

diff --git a/src/views/PlayListCtxPopup.cpp b/src/views/PlayListCtxPopup.cpp
index e292200..905ab32 100644 (file)
--- a/src/views/PlayListCtxPopup.cpp
+++ b/src/views/PlayListCtxPopup.cpp
@@ -14,19 +14,12 @@
 * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <Ecore.h>
-#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #include "common.h"
 #include "Info.h"
-#include "CtxPopup.h"
-#include <MediaContentDbListener.h>
-#include <UsbConnectionListener.h>
-#include <app-res-defines.h>
 #include "PlayListCtxPopup.h"
 
 
@@ -41,7 +34,7 @@ struct SPlayListCtxPopup {
 void CPlayListCtxPopup::t_OnConfiguration(void)
 {
        t_SetList((const char **)m->settingTexts, m->listSize, 0,
-               CCtxPopup::TOPBTN_BASE, (const char **)m->btnIds,
+               CContextPopup::TOPBTN_BASE, (const char **)m->btnIds,
                POSITION_PLAY_LIST_POPUP_X, POSITION_PLAY_LIST_POPUP_Y,
                MUSIC_STYLE_LIST_POPUP,
                MUSIC_STYLE_TOPTEXT_BTN, MUSIC_STYLE_MIDDLETEXT_BTN, MUSIC_STYLE_BOTTOMTEXT_BTN);
@@ -71,7 +64,7 @@ void CPlayListCtxPopup::t_OnBtnClicked(Evas_Object* obj, void* ev)
                return;
 
        CInfo::SetPlayListDbId(m->dbIds[index]);
-       CCtxPopup::t_OnBtnClicked(obj, ev);
+       CContextPopup::t_OnBtnClicked(obj, ev);
 
        Destroy();
 }
@@ -130,9 +123,9 @@ bool CPlayListCtxPopup::Create(Evas_Object* base, const SCallback* callback, Ein
                _CHECK(m->dbIds = new int[m->listSize])
                _COMMAND{ memset(m->dbIds, 0, m->listSize * sizeof(int)); }
                _CHECK(m_SetBtnString(playList))
-               _CHECK(CCtxPopup::Create(base, callback, true))
+               _CHECK(CContextPopup::Create(base, callback, true))
 
-               _CHECK_FAIL{ CCtxPopup::Destroy(); }
+               _CHECK_FAIL{ CContextPopup::Destroy(); }
                _CHECK_FAIL{ m_DeleteBtnString(); }
                _CHECK_FAIL{ delete[] m->dbIds; }
                _CHECK_FAIL{ delete[] m->btnIds; }
@@ -147,7 +140,7 @@ bool CPlayListCtxPopup::Create(Evas_Object* base, const SCallback* callback, Ein
 
 void CPlayListCtxPopup::Destroy(void)
 {
-       CCtxPopup::Destroy();
+       CContextPopup::Destroy();
 
        m_DeleteBtnString();
 

diff --git a/src/views/PlayListCtxPopup.h b/src/views/PlayListCtxPopup.h
index 6b6a34f..c530cf4 100644 (file)
--- a/src/views/PlayListCtxPopup.h
+++ b/src/views/PlayListCtxPopup.h
@@ -1,9 +1,8 @@
 #ifndef __PLAYLIST_CTX_POPUP_H__
 #define __PLAYLIST_CTX_POPUP_H__
 
-#include <CtxPopup.h>
 
-class CPlayListCtxPopup : public CCtxPopup {
+class CPlayListCtxPopup : public CContextPopup {
 private:
        struct SPlayListCtxPopup *m;
 

diff --git a/src/views/PlaySettingCtxPopup.cpp b/src/views/PlaySettingCtxPopup.cpp
index a6e45fe..8049089 100644 (file)
--- a/src/views/PlaySettingCtxPopup.cpp
+++ b/src/views/PlaySettingCtxPopup.cpp
@@ -14,20 +14,14 @@
 * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <Ecore.h>
 #include "i18n.h"
 #include "define.h"
 #include "common.h"
 #include "Info.h"
-#include "CtxPopup.h"
-#include <MediaContentDbListener.h>
-#include <UsbConnectionListener.h>
-#include <app-res-defines.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "PlaySettingCtxPopup.h"
 
-
 #define TOTAL_SETTING_BTNS 2
 
 const char *settingText[TOTAL_SETTING_BTNS] = {
@@ -43,7 +37,7 @@ const char *settingBtnId[TOTAL_SETTING_BTNS] = {
 void CPlaySettingCtxPopup::t_OnConfiguration(void)
 {
        t_SetList(settingText, TOTAL_SETTING_BTNS, 0,
-               CCtxPopup::TOPBTN_BASE, settingBtnId,
+               CContextPopup::TOPBTN_BASE, settingBtnId,
                POSITION_PLAY_SETTING_POPUP_X, POSITION_PLAY_SETTING_POPUP_Y,
                NULL,
                MUSIC_STYLE_SETTING_BTN_T, MUSIC_STYLE_SETTING_BTN_T, MUSIC_STYLE_SETTING_BTN_B);
@@ -73,7 +67,7 @@ void CPlaySettingCtxPopup::t_OnBtnClicked(Evas_Object* obj, void* ev)
                return;
 
        CInfo::SetPlaybackSettingType(index);
-       CCtxPopup::t_OnBtnClicked(obj, ev);
+       CContextPopup::t_OnBtnClicked(obj, ev);
 
        Destroy();
 }
\ No newline at end of file

diff --git a/src/views/PlaySettingCtxPopup.h b/src/views/PlaySettingCtxPopup.h
index 781d858..6286fbf 100644 (file)
--- a/src/views/PlaySettingCtxPopup.h
+++ b/src/views/PlaySettingCtxPopup.h
@@ -1,9 +1,8 @@
 #ifndef __PLAYSETTING_CTX_POPUP_H__
 #define __PLAYSETTING_CTX_POPUP_H__
 
-#include <CtxPopup.h>
 
-class CPlaySettingCtxPopup : public CCtxPopup {
+class CPlaySettingCtxPopup : public CContextPopup {
 protected:
        virtual void t_OnConfiguration(void);
        virtual void t_OnBtnClicked(Evas_Object* obj, void* ev);

diff --git a/src/views/RemovePopupWindow.cpp b/src/views/RemovePopupWindow.cpp
index 2c0aa51..0775e45 100644 (file)
--- a/src/views/RemovePopupWindow.cpp
+++ b/src/views/RemovePopupWindow.cpp
@@ -14,14 +14,10 @@
 * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <Ecore.h>
-#include <InputHandler.h>
-#include <PopupWindow.h>
 #include "i18n.h"
 #include "define.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #include "common.h"
 #include "RemovePopupWindow.h"
 
@@ -42,7 +38,7 @@ bool CRemovePopupWindow::Create(Evas_Object* base, const SCallback* callback, co
 {
        m_msg = msg;
 
-       if (!CPopupWindow::Create(base, callback)) {
+       if (!CMessagePopup::Create(base, callback)) {
                _ERR("Creation of remove popup failed");
                return false;
        }

diff --git a/src/views/RemovePopupWindow.h b/src/views/RemovePopupWindow.h
index 5fdbec7..912ddbb 100644 (file)
--- a/src/views/RemovePopupWindow.h
+++ b/src/views/RemovePopupWindow.h
@@ -18,9 +18,7 @@
 #ifndef __REMOVE_POPUP_WINDOW_H__
 #define __REMOVE_POPUP_WINDOW_H__
 
-#include <PopupWindow.h>
-
-class CRemovePopupWindow : public CPopupWindow {
+class CRemovePopupWindow : public CMessagePopup {
 private:
        const char *m_msg;
 

diff --git a/src/views/SortCtxPopup.cpp b/src/views/SortCtxPopup.cpp
index 8706d59..2bb8fb0 100644 (file)
--- a/src/views/SortCtxPopup.cpp
+++ b/src/views/SortCtxPopup.cpp
@@ -14,17 +14,12 @@
 * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <Ecore.h>
 #include "i18n.h"
 #include "define.h"
-#include <AppCommon.h>
 #include "dbg.h"
+#include <AppCommon.h>
 
 #include "Info.h"
-#include "CtxPopup.h"
-#include <app-res-defines.h>
 #include "SortCtxPopup.h"
 
 const char *sortTextSong[] = {
@@ -103,7 +98,7 @@ static int arraySize = 0;
 void CSortCtxPopup::t_OnConfiguration(void)
 {
        t_SetList(sortText, arraySize, (int)CInfo::SortType(),
-               CCtxPopup::TOPBTN_SORT, sortBtnIds,
+               CContextPopup::TOPBTN_SORT, sortBtnIds,
                POSITION_SORT_POPUP_X, POSITION_SORT_POPUP_Y,
                NULL,
                MUSIC_STYLE_HOVER_ENTRY, MUSIC_STYLE_HOVER_ENTRY, MUSIC_STYLE_HOVER_ENTRY);
@@ -134,7 +129,7 @@ void CSortCtxPopup::t_OnBtnClicked(Evas_Object* obj, void* ev)
 
        if (index != CInfo::SortType()) {
                CInfo::SetSortType(index);
-               CCtxPopup::t_OnBtnClicked(obj, ev);
+               CContextPopup::t_OnBtnClicked(obj, ev);
        }
 
        Destroy();
@@ -186,9 +181,9 @@ bool CSortCtxPopup::Create(Evas_Object* base, const SCallback* callback, ESortBt
                break;
        }
 
-       bool r = CCtxPopup::Create(base, callback);
+       bool r = CContextPopup::Create(base, callback);
        if (r == false) {
-               _ERR("CCtxPopup::Create failed");
+               _ERR("CContextPopup::Create failed");
                return false;
        }
 

diff --git a/src/views/SortCtxPopup.h b/src/views/SortCtxPopup.h
index 024ef9e..d1e4d2a 100644 (file)
--- a/src/views/SortCtxPopup.h
+++ b/src/views/SortCtxPopup.h
@@ -2,7 +2,7 @@
 #define __SORT_CTX_POPUP_H__
 
 
-class CSortCtxPopup : public CCtxPopup {
+class CSortCtxPopup : public CContextPopup {
 public:
 
        enum ESortBtnType {

diff --git a/src/views/SourceCtxPopup.cpp b/src/views/SourceCtxPopup.cpp
index 11eba8d..fbacc77 100644 (file)
--- a/src/views/SourceCtxPopup.cpp
+++ b/src/views/SourceCtxPopup.cpp
@@ -14,17 +14,12 @@
 * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <Ecore.h>
 #include "i18n.h"
 #include "define.h"
 #include "common.h"
 #include "Info.h"
-#include "CtxPopup.h"
-#include <MediaContentDbListener.h>
-#include <UsbConnectionListener.h>
-#include <app-res-defines.h>
+#include "dbg.h"
+#include <AppCommon.h>
 #include "SourceCtxPopup.h"
 
 const char *sourceText[] = {
@@ -44,7 +39,7 @@ void CSourceCtxPopup::t_OnConfiguration(void)
        int size = (sizeof(sourceText) / sizeof(sourceText[0]));
 
        t_SetList(sourceText, size, (int)CInfo::SourceType(),
-               CCtxPopup::TOPBTN_SOURCE, srcBtnIds,
+               CContextPopup::TOPBTN_SOURCE, srcBtnIds,
                POSITION_SOURCE_POPUP_X, POSITION_SOURCE_POPUP_Y,
                NULL,
                MUSIC_STYLE_HOVER_ENTRY, MUSIC_STYLE_HOVER_ENTRY, MUSIC_STYLE_HOVER_ENTRY);
@@ -76,7 +71,7 @@ void CSourceCtxPopup::t_OnBtnClicked(Evas_Object* obj, void* ev)
 
        if (index != CInfo::SourceType()) {
                CInfo::SetSourceType(index);
-               CCtxPopup::t_OnBtnClicked(obj, ev);
+               CContextPopup::t_OnBtnClicked(obj, ev);
        }
 
        Destroy();

diff --git a/src/views/SourceCtxPopup.h b/src/views/SourceCtxPopup.h
index ce90500..2402921 100644 (file)
--- a/src/views/SourceCtxPopup.h
+++ b/src/views/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/album-layout.cpp b/src/views/album-layout.cpp
index 3641a11..09ebfea 100644 (file)
--- a/src/views/album-layout.cpp
+++ b/src/views/album-layout.cpp
@@ -14,29 +14,18 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-
-#include <AppCommon.h>
-#include <InputHandler.h>
-#include <SortMgr.h>
-
 #include "dbg.h"
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
 #include "common.h"
 #include "album_info.h"
 #include "song_info.h"
 #include "music-controller.h"
-#include "LayoutMgr.h"
 #include "common-ui.h"
-#include "BaseView.h"
-#include "BaseLayout.h"
 #include "ExtBaseLayout.h"
-#include "ViewMgr.h"
 #include "album-layout.h"
 #include "album-songs-layout.h"
-#include "base-view.h"
 #include "Info.h"
 
 #define GENGRID_ITEM_SIZE_W (263+20)

diff --git a/src/views/album-songs-layout.cpp b/src/views/album-songs-layout.cpp
index a4b4f5a..8740290 100644 (file)
--- a/src/views/album-songs-layout.cpp
+++ b/src/views/album-songs-layout.cpp
@@ -14,24 +14,16 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
-
-#include "AppCommon.h"
-#include "InputHandler.h"
-
 #include "dbg.h"
 #include "i18n.h"
+#include <AppCommon.h>
 #include "define.h"
 #include "common.h"
 #include "song_info.h"
 #include "album_info.h"
 #include "music-controller.h"
-#include "LayoutMgr.h"
 #include "common-ui.h"
-#include "BaseView.h"
 #include "ExtBaseLayout.h"
-#include "ViewMgr.h"
 #include "album-songs-layout.h"
 #include "base-view.h"
 

diff --git a/src/views/artist-layout.cpp b/src/views/artist-layout.cpp
index a32d7d5..f6b7a70 100644 (file)
--- a/src/views/artist-layout.cpp
+++ b/src/views/artist-layout.cpp
@@ -14,11 +14,8 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include "AppCommon.h"
-#include <InputHandler.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
 
@@ -27,12 +24,9 @@
 #include "album_info.h"
 #include "song_info.h"
 #include "music-controller.h"
-#include "LayoutMgr.h"
 #include "entry-popup.h"
 #include "common-ui.h"
-#include "BaseView.h"
 #include "ExtBaseLayout.h"
-#include "ViewMgr.h"
 #include "category-layout.h"
 #include "base-view.h"
 #include "artist-layout.h"

diff --git a/src/views/base-view.cpp b/src/views/base-view.cpp
index b93bf68..d2d00f9 100644 (file)
--- a/src/views/base-view.cpp
+++ b/src/views/base-view.cpp
@@ -14,15 +14,10 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include "AppCommon.h"
 #include "i18n.h"
 #include "define.h"
 #include "dbg.h"
-
-#include "AppCommon.h"
-#include "InputHandler.h"
+#include <AppCommon.h>
 
 #include "common.h"
 #include "song_info.h"
@@ -30,12 +25,7 @@
 #include "folder_info.h"
 #include "category_info.h"
 #include "music-controller.h"
-#include "LayoutMgr.h"
-#include "BaseView.h"
-#include "BaseLayout.h"
 #include "ExtBaseLayout.h"
-#include "ViewMgr.h"
-#include <CtxPopup.h>
 #include "Info.h"
 #include "SourceCtxPopup.h"
 #include "SortCtxPopup.h"
@@ -332,7 +322,7 @@ void CMusicBaseView::m_GotoPlayback(void)
 void CMusicBaseView::m_CreateCtxPopup(int btnType)
 {
        const char *layout_id = NULL;
-       CCtxPopup::SCallback cb;
+       CContextPopup::SCallback cb;
        cb.onSelected = sm_CbCtxPopupBtnSelected;
        cb.cookie = this;
 
@@ -398,7 +388,7 @@ void CMusicBaseView::m_DestroyCtxPopup(void)
 }
 
 
-void CMusicBaseView::sm_CbCtxPopupBtnSelected(void* cookie, CCtxPopup* instance, const char* text)
+void CMusicBaseView::sm_CbCtxPopupBtnSelected(void* cookie, CContextPopup* instance, const char* text)
 {
        CMusicBaseView *root = (CMusicBaseView*)cookie;
        if (root)
@@ -406,7 +396,7 @@ void CMusicBaseView::sm_CbCtxPopupBtnSelected(void* cookie, CCtxPopup* instance,
 }
 
 
-void CMusicBaseView::m_CbCtxPopupBtnSelected(CCtxPopup* instance, const char* text)
+void CMusicBaseView::m_CbCtxPopupBtnSelected(CContextPopup* instance, const char* text)
 {
        if (m->btntype == BTN_SOURCE) {
                elm_object_text_set(m->srcbtn, _(text));

diff --git a/src/views/category-layout.cpp b/src/views/category-layout.cpp
index 1c7f311..d78a415 100644 (file)
--- a/src/views/category-layout.cpp
+++ b/src/views/category-layout.cpp
@@ -14,13 +14,8 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
-
-#include "AppCommon.h"
-#include <InputHandler.h>
-#include <SortMgr.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
 
@@ -29,12 +24,9 @@
 #include "album_info.h"
 #include "song_info.h"
 #include "music-controller.h"
-#include "LayoutMgr.h"
 #include "entry-popup.h"
 #include "common-ui.h"
-#include "BaseView.h"
 #include "ExtBaseLayout.h"
-#include "ViewMgr.h"
 #include "category-layout.h"
 #include "base-view.h"
 #include "Info.h"

diff --git a/src/views/category-songs-layout.cpp b/src/views/category-songs-layout.cpp
index e4aa7a6..8aff6ac 100644 (file)
--- a/src/views/category-songs-layout.cpp
+++ b/src/views/category-songs-layout.cpp
@@ -14,25 +14,18 @@
 * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-
-#include "AppCommon.h"
-#include "InputHandler.h"
-
 #include "dbg.h"
 #include "i18n.h"
+#include <AppCommon.h>
+
 #include "define.h"
 #include "common.h"
 #include "song_info.h"
 #include "album_info.h"
 #include "category_info.h"
 #include "music-controller.h"
-#include "LayoutMgr.h"
 #include "common-ui.h"
-#include "BaseView.h"
 #include "ExtBaseLayout.h"
-#include "ViewMgr.h"
 #include "category-songs-layout.h"
 #include "base-view.h"
 #include "category-layout.h"

diff --git a/src/views/common-ui.cpp b/src/views/common-ui.cpp
index c52004b..6d73506 100644 (file)
--- a/src/views/common-ui.cpp
+++ b/src/views/common-ui.cpp
@@ -14,15 +14,12 @@
  * limitations under the License.
  */
 
-#include <Eina.h>
-#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #include "common.h"
 #include "common-ui.h"
-#include "BaseView.h"
-#include "ViewMgr.h"
 #include "song_info.h"
 
 

diff --git a/src/views/context-view.cpp b/src/views/context-view.cpp
index 0f3dec8..bb76472 100644 (file)
--- a/src/views/context-view.cpp
+++ b/src/views/context-view.cpp
@@ -14,12 +14,9 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include "AppCommon.h"
-#include <InputHandler.h>
 #include "dbg.h"
 #include "i18n.h"
+#include <AppCommon.h>
 #include "define.h"
 #include "song_info.h"
 #include "album_info.h"
@@ -29,11 +26,8 @@
 #include "common-ui.h"
 #include "music-controller.h"
 #include "mediadata.h"
-#include "BaseView.h"
-#include "ViewMgr.h"
 #include "context-view.h"
 #include "PlayListCtxPopup.h"
-#include "PopupWindow.h"
 #include "RemovePopupWindow.h"
 #include "Info.h"
 
@@ -172,7 +166,7 @@ void CContextView::sm_CbRltdCtntSelected(void *data, Evas_Object *obj, const cha
 }
 
 
-void CContextView::sm_CbRemove(void* cookie, CPopupWindow *instance)
+void CContextView::sm_CbRemove(void* cookie, CMessagePopup *instance)
 {
        CContextView *root = (CContextView *)cookie;
        if (root)
@@ -180,7 +174,7 @@ void CContextView::sm_CbRemove(void* cookie, CPopupWindow *instance)
 }
 
 
-void CContextView::m_OnRemove(CPopupWindow *instance)
+void CContextView::m_OnRemove(CMessagePopup *instance)
 {
        SContentInfo *cinfo = NULL;
 
@@ -199,7 +193,7 @@ void CContextView::m_OnRemove(CPopupWindow *instance)
 }
 
 
-void CContextView::sm_CbCancel(void* cookie, CPopupWindow *instance)
+void CContextView::sm_CbCancel(void* cookie, CMessagePopup *instance)
 {
        CContextView *root = (CContextView *)cookie;
        if (root)
@@ -207,7 +201,7 @@ void CContextView::sm_CbCancel(void* cookie, CPopupWindow *instance)
 }
 
 
-void CContextView::m_OnCancel(CPopupWindow *instance)
+void CContextView::m_OnCancel(CMessagePopup *instance)
 {
        if (!instance) {
                _ERR("Invalid argument.");
@@ -267,7 +261,7 @@ Eina_Bool CContextView::m_OnSelectIdler(void)
 }
 
 
-void CContextView::sm_CbCtxPopupBtnSelected(void* cookie, CCtxPopup* instance, const char* text)
+void CContextView::sm_CbCtxPopupBtnSelected(void* cookie, CContextPopup* instance, const char* text)
 {
        CContextView *root = (CContextView*)cookie;
        if (root)
@@ -275,7 +269,7 @@ void CContextView::sm_CbCtxPopupBtnSelected(void* cookie, CCtxPopup* instance, c
 }
 
 
-void CContextView::m_CbCtxPopupBtnSelected(CCtxPopup* instance, const char* text)
+void CContextView::m_CbCtxPopupBtnSelected(CContextPopup* instance, const char* text)
 {
        m->lid = CInfo::PlayListDbId();
        m->idler = ecore_idler_add(sm_CbSelectIdler, this);
@@ -1076,7 +1070,7 @@ bool CContextView::m_CreateFullView(void)
 }
 
 
-CCtxPopup *CContextView::m_CreatePlaylistPopup(void)
+CContextPopup *CContextView::m_CreatePlaylistPopup(void)
 {
        CPlayListCtxPopup *ctxpopup = NULL;
        Eina_List *list = NULL;
@@ -1096,7 +1090,7 @@ CCtxPopup *CContextView::m_CreatePlaylistPopup(void)
                return NULL;
        }
 
-       CCtxPopup::SCallback cb;
+       CContextPopup::SCallback cb;
        cb.onSelected = sm_CbCtxPopupBtnSelected;
        cb.cookie = this;
        r = ctxpopup->Create(m->base, &cb, list);
@@ -1110,7 +1104,7 @@ CCtxPopup *CContextView::m_CreatePlaylistPopup(void)
 }
 
 
-CPopupWindow *CContextView::m_CreateRemovePopup(Evas_Object *base, const char *msg)
+CMessagePopup *CContextView::m_CreateRemovePopup(Evas_Object *base, const char *msg)
 {
        CRemovePopupWindow *popup;
 
@@ -1120,7 +1114,7 @@ CPopupWindow *CContextView::m_CreateRemovePopup(Evas_Object *base, const char *m
                return NULL;
        }
 
-       CPopupWindow::SCallback cb;
+       CMessagePopup::SCallback cb;
        cb.cookie = this;
        cb.onBtn1Pressed = sm_CbRemove;
        cb.onBtn2Pressed = sm_CbCancel;

diff --git a/src/views/entry-popup.cpp b/src/views/entry-popup.cpp
index d92147c..d4ed9a1 100644 (file)
--- a/src/views/entry-popup.cpp
+++ b/src/views/entry-popup.cpp
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
 #include "i18n.h"
 #include "define.h"
-#include "common.h"
-#include "common-ui.h"
 #include "dbg.h"
 #include <AppCommon.h>
-#include <InputHandler.h>
+
+#include "common.h"
+#include "common-ui.h"
 #include "entry-popup.h"
 
 

diff --git a/src/views/folder-layout.cpp b/src/views/folder-layout.cpp
index c956f3a..9dd0c50 100644 (file)
--- a/src/views/folder-layout.cpp
+++ b/src/views/folder-layout.cpp
@@ -14,15 +14,10 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
-
-#include "AppCommon.h"
-#include <InputHandler.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-#include <SortMgr.h>
 
 #include "common.h"
 #include "folder_info.h"
@@ -30,11 +25,8 @@
 #include "album_info.h"
 
 #include "music-controller.h"
-#include "LayoutMgr.h"
 #include "common-ui.h"
-#include "BaseView.h"
 #include "ExtBaseLayout.h"
-#include "ViewMgr.h"
 #include "folder-layout.h"
 #include "base-view.h"
 #include "Info.h"

diff --git a/src/views/genre-layout.cpp b/src/views/genre-layout.cpp
index 1a774ab..7b25431 100644 (file)
--- a/src/views/genre-layout.cpp
+++ b/src/views/genre-layout.cpp
@@ -14,11 +14,8 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include "AppCommon.h"
-#include <InputHandler.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
 
@@ -27,12 +24,9 @@
 #include "album_info.h"
 #include "song_info.h"
 #include "music-controller.h"
-#include "LayoutMgr.h"
 #include "entry-popup.h"
 #include "common-ui.h"
-#include "BaseView.h"
 #include "ExtBaseLayout.h"
-#include "ViewMgr.h"
 #include "category-layout.h"
 #include "base-view.h"
 #include "genre-layout.h"

diff --git a/src/views/playback-view.cpp b/src/views/playback-view.cpp
index 5946798..f052b2a 100644 (file)
--- a/src/views/playback-view.cpp
+++ b/src/views/playback-view.cpp
@@ -14,27 +14,20 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
-
-#include "AppCommon.h"
-#include <InputHandler.h>
-
 #include "define.h"
 #include "common.h"
 #include "dbg.h"
+#include <AppCommon.h>
+
 #include "song_info.h"
 #include "album_info.h"
 #include "music-controller.h"
 #include "volume-control.h"
 #include "i18n.h"
 #include "common-ui.h"
-#include "BaseView.h"
-#include "ViewMgr.h"
 #include "playback-view.h"
 #include "context-view.h"
 #include "HandleVolume.h"
-#include <app-res-defines.h>
 #include "PlaySettingCtxPopup.h"
 #include "Info.h"
 
@@ -625,7 +618,7 @@ void CPlaybackView::m_OnCtxtClose(void)
 }
 
 
-void CPlaybackView::sm_CbCtxPopupBtnSelected(void* cookie, CCtxPopup* instance, const char* text)
+void CPlaybackView::sm_CbCtxPopupBtnSelected(void* cookie, CContextPopup* instance, const char* text)
 {
        CPlaybackView *root = (CPlaybackView *)cookie;
        if (root)
@@ -633,7 +626,7 @@ void CPlaybackView::sm_CbCtxPopupBtnSelected(void* cookie, CCtxPopup* instance,
 }
 
 
-void CPlaybackView::m_CbCtxPopupBtnSelected(CCtxPopup* instance, const char* text)
+void CPlaybackView::m_CbCtxPopupBtnSelected(CContextPopup* instance, const char* text)
 {
        int type = CInfo::PlaybackSettingType();
 
@@ -1078,7 +1071,7 @@ void CPlaybackView::m_DestroyErrorPopup(void)
 
 void CPlaybackView::m_CreateSettingsPopup(void)
 {
-       CCtxPopup::SCallback cb;
+       CContextPopup::SCallback cb;
        cb.cookie = this;
        cb.onSelected = sm_CbCtxPopupBtnSelected;
 

diff --git a/src/views/playlist-layout.cpp b/src/views/playlist-layout.cpp
index 7187c34..aa12123 100644 (file)
--- a/src/views/playlist-layout.cpp
+++ b/src/views/playlist-layout.cpp
@@ -14,13 +14,9 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
 #include "dbg.h"
 #include "i18n.h"
-
-#include "AppCommon.h"
-#include <InputHandler.h>
+#include <AppCommon.h>
 
 #include "define.h"
 #include "common.h"
@@ -28,12 +24,9 @@
 #include "album_info.h"
 #include "song_info.h"
 #include "music-controller.h"
-#include "LayoutMgr.h"
 #include "entry-popup.h"
 #include "common-ui.h"
-#include "BaseView.h"
 #include "ExtBaseLayout.h"
-#include "ViewMgr.h"
 #include "category-layout.h"
 #include "base-view.h"
 #include "playlist-layout.h"

diff --git a/src/views/song-layout.cpp b/src/views/song-layout.cpp
index e60acea..4fd284f 100644 (file)
--- a/src/views/song-layout.cpp
+++ b/src/views/song-layout.cpp
@@ -14,25 +14,17 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
 #include "dbg.h"
 #include "i18n.h"
-
-#include "AppCommon.h"
-#include "InputHandler.h"
-#include <SortMgr.h>
+#include <AppCommon.h>
 
 #include "define.h"
 #include "common.h"
 #include "song_info.h"
 #include "album_info.h"
 #include "music-controller.h"
-#include "LayoutMgr.h"
 #include "common-ui.h"
-#include "BaseView.h"
 #include "ExtBaseLayout.h"
-#include "ViewMgr.h"
 #include "song-layout.h"
 #include "base-view.h"
 #include "Info.h"