Nonused function is removed.

Change-Id: I7cdfb97a13f29530d391ff6e0139d27efedd773e
Signed-off-by: Kim Youngjin <yj21c.kim@samsung.com>

diff --git a/include/view/gallery-view/layout_all.h b/include/view/gallery-view/layout_all.h
index 8f49e75..ce9c21d 100644 (file)
--- a/include/view/gallery-view/layout_all.h
+++ b/include/view/gallery-view/layout_all.h
@@ -36,11 +36,6 @@ private:
        static Eina_Bool sm_CbGridStateGet(void *data,
                        Evas_Object *obj, const char *part);
 
-       static int sm_CompareDesc(const void *data1, const void *data2);
-       static int sm_CompareAsc(const void *data1, const void *data2);
-       static int sm_CompareAZ(const void *data1, const void *data2);
-       static int sm_CompareZA(const void *data1, const void *data2);
-
        void m_FreeItemclass(Elm_Gengrid_Item_Class *ic);
        Elm_Gengrid_Item_Class *m_GetItemclass(int type);
 

diff --git a/src/data/mediadata.cpp b/src/data/mediadata.cpp
index b29388d..cbbbe33 100644 (file)
--- a/src/data/mediadata.cpp
+++ b/src/data/mediadata.cpp
@@ -1,4 +1,4 @@
-/*
+ /*
  * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);

diff --git a/src/main.cpp b/src/main.cpp
index 9e5bace..2980490 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -53,14 +53,14 @@
 #define MIME_IMAGE "image/*"
 #define MIME_VIDEO "video/*"
 
-enum eViewType {
+enum EViewType {
        VIEW_ALL = 0,
        VIEW_EVENT,
        VIEW_FOLDER,
        VIEW_PHOTO
 };
 
-struct SAppData {
+struct SGalleryApp {
        const char *name;
        Evas_Object *win;
        Evas_Object *lbl;
@@ -74,22 +74,23 @@ struct SAppData {
        int media_type;
        char *id;
 
-       SAppData() {
-               memset(this, 0, sizeof(SAppData));
+       
+       CGalleryView     *pGalleryView;
+       CPhotoViewerView *pPhotoViewerView;
+       CPhotoZoomView   *pPhotoZoomView;
+       CCtxtMenuView    *pCtxtMenuView;
+
+       CViewMgr         *pViewMgr;
+       CMediadata       *pMediadata;
+
+       SGalleryApp() {
+               memset(this, 0, sizeof(SGalleryApp));
        }
 };
 
 class CGalleryApp : public CBaseApp {
 private:
-       SAppData *m;
-
-       CGalleryView *pGalleryView;
-       CPhotoViewerView *pPhotoViewerView;
-       CPhotoZoomView *pPhotoZoomView;
-       CCtxtMenuView *pCtxtMenuView;
-
-       CViewMgr *pViewMgr;
-       CMediadata *pMediadata;
+       SGalleryApp *m;
 
 private:
        static void sm_CbPushView(void *cookie,
@@ -121,7 +122,7 @@ public:
 
 CGalleryApp::CGalleryApp(void)
 {
-       m = new SAppData;
+       m = new SGalleryApp;
 }
 
 CGalleryApp::~CGalleryApp(void)
@@ -241,8 +242,8 @@ Evas_Object *CGalleryApp::m_AddWin(const char *name)
 
 bool CGalleryApp::m_DestroyView(void)
 {
-       while (!pViewMgr->CheckEmpty()) {
-               if (!pViewMgr->PopView())
+       while (!m->pViewMgr->CheckEmpty()) {
+               if (!m->pViewMgr->PopView())
                        return false;
        }
 
@@ -273,7 +274,7 @@ bool CGalleryApp::m_CreateGalleryView(void)
        arg->media_type = m->media_type;
        arg->id = m->id;
 
-       if (!pViewMgr->PushView(VIEW_GALLERY, arg)) {
+       if (!m->pViewMgr->PushView(VIEW_GALLERY, arg)) {
                _ERR("Gallery view push failed");
                return false;
        }
@@ -293,14 +294,14 @@ bool CGalleryApp::m_CreatePhotoViewerView(void)
                return false;
        }
 
-       pMediadata->DestroyMediaList();
-       pMediadata->CreateMediaList(m->source, m->media_type);
+       m->pMediadata->DestroyMediaList();
+       m->pMediadata->CreateMediaList(m->source, m->media_type);
 
-       vd->minfo = pMediadata->FindMediaInfo(pMediadata->MediaList(), m->id);
-       vd->media_list = pMediadata->CreateListforType(
-                               pMediadata->MediaList(), vd->minfo->Type());
+       vd->minfo = m->pMediadata->FindMediaInfo(m->pMediadata->MediaList(), m->id);
+       vd->media_list = m->pMediadata->CreateListforType(
+                               m->pMediadata->MediaList(), vd->minfo->Type());
 
-       if (!pViewMgr->PushView(VIEW_PHOTO_VIEWER, vd)) {
+       if (!m->pViewMgr->PushView(VIEW_PHOTO_VIEWER, vd)) {
                _ERR("Photoviewer view push failed");
                return false;
        }
@@ -325,33 +326,33 @@ bool CGalleryApp::OnCreate(void)
        elm_need_ethumb();
 
        CViewMgr::Initialize(m->win, NULL);
-       pViewMgr = CViewMgr::GetInstance();
-       if (!pViewMgr) {
+       m->pViewMgr = CViewMgr::GetInstance();
+       if (!m->pViewMgr) {
                _ERR("ViewMgr initialization failed");
                return false;
        }
 
-       pGalleryView = new CGalleryView(VIEW_GALLERY);
-       pPhotoViewerView = new CPhotoViewerView(VIEW_PHOTO_VIEWER);
-       pPhotoZoomView = new CPhotoZoomView(VIEW_PHOTO_ZOOM);
-       pCtxtMenuView = new CCtxtMenuView(VIEW_CTXT_MENU);
+       m->pGalleryView     = new CGalleryView(VIEW_GALLERY);
+       m->pPhotoViewerView = new CPhotoViewerView(VIEW_PHOTO_VIEWER);
+       m->pPhotoZoomView   = new CPhotoZoomView(VIEW_PHOTO_ZOOM);
+       m->pCtxtMenuView    = new CCtxtMenuView(VIEW_CTXT_MENU);
 
-       pViewMgr->AddView(pGalleryView);
-       pViewMgr->AddView(pPhotoViewerView);
-       pViewMgr->AddView(pPhotoZoomView);
-       pViewMgr->AddView(pCtxtMenuView);
+       m->pViewMgr->AddView(m->pGalleryView);
+       m->pViewMgr->AddView(m->pPhotoViewerView);
+       m->pViewMgr->AddView(m->pPhotoZoomView);
+       m->pViewMgr->AddView(m->pCtxtMenuView);
 
        CViewMgr::SCallback cb;
-       cb.cookie = this;
+       cb.cookie     = this;
        cb.cbPushView = sm_CbPushView;
-       cb.cbPopView = NULL;
-       pViewMgr->AddCallback(&cb);
+       cb.cbPopView  = NULL;
+       m->pViewMgr->AddCallback(&cb);
 
        CSortMgr::Initialize();
 
        CMediadata::Initialize();
-       pMediadata = CMediadata::GetInstance();
-       if (!pMediadata) {
+       m->pMediadata = CMediadata::GetInstance();
+       if (!m->pMediadata) {
                _ERR("Mediadata initialization failed");
                return false;
        }
@@ -366,10 +367,10 @@ void CGalleryApp::OnTerminate(void)
        CSortMgr::Finalize();
        CViewMgr::Finalize();
 
-       delete pGalleryView;
-       delete pPhotoViewerView;
-       delete pPhotoZoomView;
-       delete pCtxtMenuView;
+       delete m->pGalleryView;
+       delete m->pPhotoViewerView;
+       delete m->pPhotoZoomView;
+       delete m->pCtxtMenuView;
 
        if (m->win)
                evas_object_del(m->win);
@@ -381,7 +382,7 @@ void CGalleryApp::OnPause(void)
 
        _INFO("Gallery app is paused");
 
-       pViewMgr->Pause();
+       m->pViewMgr->Pause();
 }
 
 void CGalleryApp::OnResume(void)
@@ -390,7 +391,7 @@ void CGalleryApp::OnResume(void)
 
        _INFO("Gallery app is Resumed");
 
-       pViewMgr->Resume();
+       m->pViewMgr->Resume();
 }
 
 void CGalleryApp::OnAppControl(app_control_h app_control)
@@ -427,7 +428,7 @@ void CGalleryApp::OnAppControl(app_control_h app_control)
                else
                        r = m_CreateGalleryView();
        } else {
-               if (pViewMgr->CheckEmpty())
+               if (m->pViewMgr->CheckEmpty())
                        r = m_CreateGalleryView();
        }