From 84d2022e908b7dfe142d9402e2f5d3f77f9b6538 Mon Sep 17 00:00:00 2001 From: JuWan Kim Date: Mon, 9 Mar 2015 10:32:22 +0900 Subject: [PATCH] Apply ASSERT Change-Id: I755c5c916638e3358713ad1cb51648e2a72c80a9 Signed-off-by: JuWan Kim --- src/data/DirectoryInfo.cpp | 24 ++++++++---------------- src/data/FileInfo.cpp | 18 ++++++------------ src/data/Mediadata.cpp | 12 ++++-------- src/data/MediadataImpl.cpp | 12 ++++-------- src/views/BaseView/GengridItemClass.cpp | 28 ++++++++++++---------------- src/views/BaseView/GengridItemClass.h | 4 ++-- 6 files changed, 36 insertions(+), 62 deletions(-) diff --git a/src/data/DirectoryInfo.cpp b/src/data/DirectoryInfo.cpp index 9ecbabe..d78e1a3 100644 --- a/src/data/DirectoryInfo.cpp +++ b/src/data/DirectoryInfo.cpp @@ -35,12 +35,10 @@ struct SDirectoryInfo { bool CDirectoryInfo::Create(CNameInfo::EClassType type) { - if (m) - return false; + ASSERT(!m); m = new SDirectoryInfo; - if (!m) - return false; + ASSERT(m); if (!CExtNameInfo::Create(CLASS_TYPE_DIRECTORY)) { delete m; @@ -54,8 +52,7 @@ bool CDirectoryInfo::Create(CNameInfo::EClassType type) void CDirectoryInfo::Destroy(void) { - if (!m) - return; + ASSERT(m); CExtNameInfo::Destroy(); @@ -66,8 +63,7 @@ void CDirectoryInfo::Destroy(void) bool CDirectoryInfo::SetCount(int nCount) { - if (!m) - return false; + ASSERT(m); m->nCount = nCount; @@ -77,8 +73,7 @@ bool CDirectoryInfo::SetCount(int nCount) int CDirectoryInfo::Count(void) { - if (!m) - return 0; + ASSERT(m); return m->nCount; } @@ -86,8 +81,7 @@ int CDirectoryInfo::Count(void) bool CDirectoryInfo::Duplicate(CNameInfo *obj) { - if (!m) - return false; + ASSERT(m); CDirectoryInfo *dst = (CDirectoryInfo*)obj; @@ -120,8 +114,7 @@ static bool gFolderSize(media_info_h media_h, void *dt) bool CDirectoryInfo::SetLoadInfo(filter_h filter, media_folder_h folder) { - if (!m) - return false; + ASSERT(m); m->filter = filter; m->folder = folder; @@ -132,8 +125,7 @@ bool CDirectoryInfo::SetLoadInfo(filter_h filter, media_folder_h folder) bool CDirectoryInfo::Load(void) { - if (!m) - return false; + ASSERT(m); int r; bool ret = false; diff --git a/src/data/FileInfo.cpp b/src/data/FileInfo.cpp index b50a98c..3ea0788 100644 --- a/src/data/FileInfo.cpp +++ b/src/data/FileInfo.cpp @@ -32,12 +32,10 @@ struct SFileInfo { bool CFileInfo::Create(void) { - if (m) - return false; + ASSERT(!m); m = new SFileInfo; - if (!m) - return false; + ASSERT(m); memset(m, 0, sizeof(SFileInfo)); @@ -53,8 +51,7 @@ bool CFileInfo::Create(void) void CFileInfo::Destroy(void) { - if (!m) - return; + ASSERT(m); CExtNameInfo::Destroy(); @@ -89,8 +86,7 @@ groups gType(media_content_type_e type) bool CFileInfo::Duplicate(CNameInfo* obj) { - if (!m) - return false; + ASSERT(m); if (!CExtNameInfo::Duplicate(obj)) return false; @@ -101,8 +97,7 @@ bool CFileInfo::Duplicate(CNameInfo* obj) bool CFileInfo::SetLoadInfo(media_info_h handle) { - if (!m) - return false; + ASSERT(m); m->handle = handle; return true; @@ -110,8 +105,7 @@ bool CFileInfo::SetLoadInfo(media_info_h handle) bool CFileInfo::Load(void) { - if (!m) - return false; + ASSERT(m); bool ret = false; do { diff --git a/src/data/Mediadata.cpp b/src/data/Mediadata.cpp index 2634a63..f60f0d5 100644 --- a/src/data/Mediadata.cpp +++ b/src/data/Mediadata.cpp @@ -33,8 +33,7 @@ bool CMediadata::Create(void) { - if (m) - return false; + ASSERT(!m); _CREATE_BEGIN{ _CHECK(m = (SMediadata*)(new CMediadataImpl)) @@ -51,8 +50,7 @@ bool CMediadata::Create(void) void CMediadata::Destroy(void) { - if (!m) - return; + ASSERT(m); M->Destroy(); delete M; @@ -61,16 +59,14 @@ void CMediadata::Destroy(void) bool CMediadata::GetMediaList(const char* folderid, int media_type, int source_type, Eina_List **list) { - if (!m) - return false; + ASSERT(m); return ((CMediadataImpl*)m)->GetMediaList(folderid, media_type, source_type, list); } bool CMediadata::GetFolderList(int media_type, int source_type, Eina_List **list) { - if (!m) - return false; + ASSERT(m); return ((CMediadataImpl*)m)->GetFolderList(media_type, source_type, list); } diff --git a/src/data/MediadataImpl.cpp b/src/data/MediadataImpl.cpp index 1539e2c..82413af 100644 --- a/src/data/MediadataImpl.cpp +++ b/src/data/MediadataImpl.cpp @@ -216,8 +216,7 @@ void CMediadataImpl::m_UpdateFolderLists(void) bool CMediadataImpl::Create(void) { - if (m) - return false; + ASSERT(!m); _CREATE_BEGIN{ _CHECK(m = new SMediadataImpl) @@ -238,8 +237,7 @@ bool CMediadataImpl::Create(void) void CMediadataImpl::Destroy(void) { - if (!m) - return; + ASSERT(m); _DBG("#########################"); @@ -259,8 +257,7 @@ bool CMediadataImpl::GetMediaList(const char* folderid, int media_type, int sour { ASSERT(0 <= media_type && media_type <= t_Max()); - if (!m) - return false; + ASSERT(m); /* Inner Level */ m->media_type = media_type; @@ -289,8 +286,7 @@ bool CMediadataImpl::GetFolderList(int media_type, int source_type, Eina_List ** { ASSERT(0 <= media_type && media_type <= t_Max()); - if (!m) - return false; + ASSERT(m); _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 5086c97..cdf5c0d 100644 --- a/src/views/BaseView/GengridItemClass.cpp +++ b/src/views/BaseView/GengridItemClass.cpp @@ -216,33 +216,29 @@ void CGengridItemClass::sm_CbRemove(void *data, Evas_Object *obj) bool CGengridItemClass::Create(void) { - if (m_pItemClass) - return false; + ASSERT(!m); - m_pItemClass = elm_gengrid_item_class_new(); - if (!m_pItemClass) { - return false; - } + m = elm_gengrid_item_class_new(); + ASSERT(m); - 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; + 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; return true; } void CGengridItemClass::Destroy(void) { - if (!m_pItemClass) - return; + ASSERT(m); - elm_gengrid_item_class_free(m_pItemClass); - m_pItemClass = NULL; + elm_gengrid_item_class_free(m); + m = NULL; } Elm_Gengrid_Item_Class* CGengridItemClass::Handle(void) { - return m_pItemClass; + return m; } diff --git a/src/views/BaseView/GengridItemClass.h b/src/views/BaseView/GengridItemClass.h index a08ee1d..79b2f8b 100644 --- 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_pItemClass; + Elm_Gengrid_Item_Class *m; private: @@ -24,7 +24,7 @@ private: public: - CGengridItemClass() : m_pItemClass(NULL) {} + CGengridItemClass() : m(NULL) {} virtual ~CGengridItemClass() { } bool Create(void); -- 2.7.4