Revert "Apply ASSERT"

This reverts commit 84d2022e908b7dfe142d9402e2f5d3f77f9b6538.

Change-Id: I2f60bc3f9d9878843a006f3ff4c1d9d7dae8ae5b

diff --git a/src/data/DirectoryInfo.cpp b/src/data/DirectoryInfo.cpp
index d78e1a3..9ecbabe 100644 (file)
--- a/src/data/DirectoryInfo.cpp
+++ b/src/data/DirectoryInfo.cpp
@@ -35,10 +35,12 @@ struct SDirectoryInfo {
 
 bool CDirectoryInfo::Create(CNameInfo::EClassType type)
 {
-       ASSERT(!m);
+       if (m)
+               return false;
 
        m = new SDirectoryInfo;
-       ASSERT(m);
+       if (!m)
+               return false;
 
        if (!CExtNameInfo::Create(CLASS_TYPE_DIRECTORY)) {
                delete m;
@@ -52,7 +54,8 @@ bool CDirectoryInfo::Create(CNameInfo::EClassType type)
 
 void CDirectoryInfo::Destroy(void)
 {
-       ASSERT(m);
+       if (!m)
+               return;
 
        CExtNameInfo::Destroy();
 
@@ -63,7 +66,8 @@ void CDirectoryInfo::Destroy(void)
 
 bool CDirectoryInfo::SetCount(int nCount)
 {
-       ASSERT(m);
+       if (!m)
+               return false;
 
        m->nCount = nCount;
 
@@ -73,7 +77,8 @@ bool CDirectoryInfo::SetCount(int nCount)
 
 int CDirectoryInfo::Count(void)
 {
-       ASSERT(m);
+       if (!m)
+               return 0;
 
        return m->nCount;
 }
@@ -81,7 +86,8 @@ int CDirectoryInfo::Count(void)
 
 bool CDirectoryInfo::Duplicate(CNameInfo *obj)
 {
-       ASSERT(m);
+       if (!m)
+               return false;
 
        CDirectoryInfo *dst = (CDirectoryInfo*)obj;
 
@@ -114,7 +120,8 @@ static bool gFolderSize(media_info_h media_h, void *dt)
 
 bool CDirectoryInfo::SetLoadInfo(filter_h filter, media_folder_h folder)
 {
-       ASSERT(m);
+       if (!m)
+               return false;
 
        m->filter = filter;
        m->folder = folder;
@@ -125,7 +132,8 @@ bool CDirectoryInfo::SetLoadInfo(filter_h filter, media_folder_h folder)
 
 bool CDirectoryInfo::Load(void)
 {
-       ASSERT(m);
+       if (!m)
+               return false;
 
        int r;
        bool ret = false;

diff --git a/src/data/FileInfo.cpp b/src/data/FileInfo.cpp
index 3ea0788..b50a98c 100644 (file)
--- a/src/data/FileInfo.cpp
+++ b/src/data/FileInfo.cpp
@@ -32,10 +32,12 @@ struct SFileInfo {
 
 bool CFileInfo::Create(void)
 {
-       ASSERT(!m);
+       if (m)
+               return false;
 
        m = new SFileInfo;
-       ASSERT(m);
+       if (!m)
+               return false;
 
        memset(m, 0, sizeof(SFileInfo));
 
@@ -51,7 +53,8 @@ bool CFileInfo::Create(void)
 
 void CFileInfo::Destroy(void)
 {
-       ASSERT(m);
+       if (!m)
+               return;
 
        CExtNameInfo::Destroy();
 
@@ -86,7 +89,8 @@ groups gType(media_content_type_e type)
 
 bool CFileInfo::Duplicate(CNameInfo* obj)
 {
-       ASSERT(m);
+       if (!m)
+               return false;
 
        if (!CExtNameInfo::Duplicate(obj))
                return false;
@@ -97,7 +101,8 @@ bool CFileInfo::Duplicate(CNameInfo* obj)
 
 bool CFileInfo::SetLoadInfo(media_info_h handle)
 {
-       ASSERT(m);
+       if (!m)
+               return false;
 
        m->handle = handle;
        return true;
@@ -105,7 +110,8 @@ bool CFileInfo::SetLoadInfo(media_info_h handle)
 
 bool CFileInfo::Load(void)
 {
-       ASSERT(m);
+       if (!m)
+               return false;
 
        bool ret = false;
        do {

diff --git a/src/data/Mediadata.cpp b/src/data/Mediadata.cpp
index f60f0d5..2634a63 100644 (file)
--- a/src/data/Mediadata.cpp
+++ b/src/data/Mediadata.cpp
@@ -33,7 +33,8 @@
 
 bool CMediadata::Create(void)
 {
-       ASSERT(!m);
+       if (m)
+               return false;
 
        _CREATE_BEGIN{
                _CHECK(m = (SMediadata*)(new CMediadataImpl))
@@ -50,7 +51,8 @@ bool CMediadata::Create(void)
 
 void CMediadata::Destroy(void)
 {
-       ASSERT(m);
+       if (!m)
+               return;
 
        M->Destroy();
        delete M;
@@ -59,14 +61,16 @@ void CMediadata::Destroy(void)
 
 bool CMediadata::GetMediaList(const char* folderid, int media_type, int source_type, Eina_List **list)
 {
-       ASSERT(m);
+       if (!m)
+               return false;
 
        return ((CMediadataImpl*)m)->GetMediaList(folderid, media_type, source_type, list);
 }
 
 bool CMediadata::GetFolderList(int media_type, int source_type, Eina_List **list)
 {
-       ASSERT(m);
+       if (!m)
+               return false;
 
        return ((CMediadataImpl*)m)->GetFolderList(media_type, source_type, list);
 }

diff --git a/src/data/MediadataImpl.cpp b/src/data/MediadataImpl.cpp
index 82413af..1539e2c 100644 (file)
--- a/src/data/MediadataImpl.cpp
+++ b/src/data/MediadataImpl.cpp
@@ -216,7 +216,8 @@ void CMediadataImpl::m_UpdateFolderLists(void)
 
 bool CMediadataImpl::Create(void)
 {
-       ASSERT(!m);
+       if (m)
+               return false;
 
        _CREATE_BEGIN{
                _CHECK(m = new SMediadataImpl)
@@ -237,7 +238,8 @@ bool CMediadataImpl::Create(void)
 
 void CMediadataImpl::Destroy(void)
 {
-       ASSERT(m);
+       if (!m)
+               return;
 
        _DBG("#########################");
 
@@ -257,7 +259,8 @@ bool CMediadataImpl::GetMediaList(const char* folderid, int media_type, int sour
 {
        ASSERT(0 <= media_type && media_type <= t_Max());
 
-       ASSERT(m);
+       if (!m)
+               return false;
 
        /* Inner Level */
        m->media_type = media_type;
@@ -286,7 +289,8 @@ bool CMediadataImpl::GetFolderList(int media_type, int source_type, Eina_List **
 {
        ASSERT(0 <= media_type && media_type <= t_Max());
 
-       ASSERT(m);
+       if (!m)
+               return false;
                
        _DBG("sourceType: %d, m->source_Type: %d", source_type, m->source_type);
        /* Outer level */

diff --git a/src/views/BaseView/GengridItemClass.cpp b/src/views/BaseView/GengridItemClass.cpp
index cdf5c0d..5086c97 100644 (file)
--- a/src/views/BaseView/GengridItemClass.cpp
+++ b/src/views/BaseView/GengridItemClass.cpp
@@ -216,29 +216,33 @@ void CGengridItemClass::sm_CbRemove(void *data, Evas_Object *obj)
 
 bool CGengridItemClass::Create(void)
 {
-       ASSERT(!m);
+       if (m_pItemClass)
+               return false;
 
-       m = elm_gengrid_item_class_new();
-       ASSERT(m);
+       m_pItemClass = elm_gengrid_item_class_new();
+       if (!m_pItemClass) {
+               return false;
+       }
 
-       m->item_style = FBR_STYLE_MEDIA_GRID;
-       m->func.text_get    = sm_CbTextGet;
-       m->func.content_get = sm_CbContentGet;
-       m->func.state_get   = NULL;
-       m->func.del         = sm_CbRemove;
+       m_pItemClass->item_style = FBR_STYLE_MEDIA_GRID;
+       m_pItemClass->func.text_get    = sm_CbTextGet;
+       m_pItemClass->func.content_get = sm_CbContentGet;
+       m_pItemClass->func.state_get   = NULL;
+       m_pItemClass->func.del         = sm_CbRemove;
 
        return true;
 }
 
 void CGengridItemClass::Destroy(void)
 {
-       ASSERT(m);
+       if (!m_pItemClass)
+               return;
 
-       elm_gengrid_item_class_free(m);
-       m = NULL;
+       elm_gengrid_item_class_free(m_pItemClass);
+       m_pItemClass = NULL;
 }
 
 Elm_Gengrid_Item_Class* CGengridItemClass::Handle(void)
 {
-       return m;
+       return m_pItemClass;
 }

diff --git a/src/views/BaseView/GengridItemClass.h b/src/views/BaseView/GengridItemClass.h
index 79b2f8b..a08ee1d 100644 (file)
--- a/src/views/BaseView/GengridItemClass.h
+++ b/src/views/BaseView/GengridItemClass.h
@@ -10,7 +10,7 @@ struct SItemInfo {
 class CGengridItemClass {
 protected:
 
-       Elm_Gengrid_Item_Class *m;
+       Elm_Gengrid_Item_Class *m_pItemClass;
        
 private:
 
@@ -24,7 +24,7 @@ private:
 
 public:
 
-       CGengridItemClass() : m(NULL) {}
+       CGengridItemClass() : m_pItemClass(NULL) {}
        virtual ~CGengridItemClass() { }
 
        bool Create(void);