From ec7535c414f750b7069d54efce9a73356c7fa010 Mon Sep 17 00:00:00 2001 From: "ahram.suh" Date: Tue, 16 Apr 2013 20:29:22 +0900 Subject: [PATCH] Change parentID to 0 Change-Id: Ia6be78da846e6f70889da3a11a635dd4d8053b39 --- src/IntAddBookmarkForm.cpp | 26 +++++++++++++------------- src/IntBookmarkData.cpp | 2 +- src/IntBookmarkListForm.cpp | 8 ++++---- src/IntBookmarkPresentationModel.cpp | 2 +- src/IntCreateBookmarkFolderForm.cpp | 4 ++-- src/IntEditBookmarkListForm.cpp | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/IntAddBookmarkForm.cpp b/src/IntAddBookmarkForm.cpp index 7e89d4d..c751021 100644 --- a/src/IntAddBookmarkForm.cpp +++ b/src/IntAddBookmarkForm.cpp @@ -257,7 +257,7 @@ AddBookmarkForm::OnActionPerformed(const Control& source, int actionId) - r = BookmarkPresentationModel::GetInstance()->GetFolder("-1", 0, __folderCount, folderList); + r = BookmarkPresentationModel::GetInstance()->GetFolder("0", 0, __folderCount, folderList); TryCatch(r == E_SUCCESS,,"Failed to intitialize GetFolder %s",GetErrorMessage(r)); for (count = 0; count < __folderCount; count++) @@ -279,7 +279,7 @@ AddBookmarkForm::OnActionPerformed(const Control& source, int actionId) if(bookMarkID.GetLength() == 0) { - bookMarkID = L"-1"; + bookMarkID = L"0"; } AppLog("IDA_BUTTON_DONE tempParentId ID is %S",tempParentId.GetPointer()); @@ -312,7 +312,7 @@ AddBookmarkForm::OnActionPerformed(const Control& source, int actionId) if (bookMarkID == L"") { - __pBookmark->SetParentId(L"-1"); + __pBookmark->SetParentId(L"0"); } else { @@ -329,7 +329,7 @@ AddBookmarkForm::OnActionPerformed(const Control& source, int actionId) { AppLog("AddBookmarkForm::OnActionPerformed does url exist 1"); - r = BookmarkPresentationModel::GetInstance()->GetFolder(L"-1", 0, __folderCount, folderList); + r = BookmarkPresentationModel::GetInstance()->GetFolder(L"0", 0, __folderCount, folderList); TryCatch(r == E_SUCCESS,,"Failed to intitialize GetFolder %s",GetErrorMessage(r)); for (count = 0; count < __folderCount; count++) @@ -350,7 +350,7 @@ AddBookmarkForm::OnActionPerformed(const Control& source, int actionId) } if(bookMarkID.GetLength() == 0) { - bookMarkID = L"-1"; + bookMarkID = L"0"; } r = BookmarkPresentationModel::GetInstance()->DoesBookmarkExist(Url,exist, bookMarkID, true); @@ -365,7 +365,7 @@ AddBookmarkForm::OnActionPerformed(const Control& source, int actionId) } else { - r = BookmarkPresentationModel::GetInstance()->GetFolder("-1", 0, __folderCount, folderList); + r = BookmarkPresentationModel::GetInstance()->GetFolder("0", 0, __folderCount, folderList); TryCatch( r == E_SUCCESS,,"Failed to intitialize GetFolder %s",GetErrorMessage(r)); for (count = 0; count < __folderCount; count++) @@ -474,7 +474,7 @@ AddBookmarkForm::OnListViewItemStateChanged(ListView& listView, int index, int e __selectedIndex = index; if (index > 1 && __pList->GetItemCount() != index +1) { - String parentID = "-1"; + String parentID = "0"; ArrayList folderList; BookmarkData* pBookmark = null; BookmarkPresentationModel::GetInstance()->GetFolder(parentID, 0, __folderCount, folderList); @@ -525,7 +525,7 @@ AddBookmarkForm::GetItemCount(void) AppLogDebug("AddBookmarkForm::GetItemCount"); int count = 0; ArrayList folderList; - String parentID = "-1"; + String parentID = "0"; BookmarkData* pBookmark = null; BookmarkPresentationModel::GetInstance()->GetFolder(parentID, 0, __folderCount, folderList); @@ -556,7 +556,7 @@ AddBookmarkForm::GetItemCount(void) } else { - result r = BookmarkPresentationModel::GetInstance()->GetFolderCount(L"-1",count); + result r = BookmarkPresentationModel::GetInstance()->GetFolderCount(L"0",count); TryCatch( r == E_SUCCESS,,"BookmarkPresentationModel::GetBookmarkCount query failed %s",GetErrorMessage(r)); AppLog("count = %d", count); return count + 3; @@ -617,7 +617,7 @@ AddBookmarkForm::CreateItem(int index, int itemWidth) } else { - String parentID = "-1"; + String parentID = "0"; ArrayList folderList; BookmarkData* pBookmark = null; @@ -771,7 +771,7 @@ void AddBookmarkForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& currentSceneId, IList* pArgs) { // Code to handle events when the AddBookmarkForm is activated. - String str = "-1"; + String str = "0"; String pageTitle = L""; String pageUrl = L""; String title = L""; @@ -846,7 +846,7 @@ AddBookmarkForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId ArrayList folderList; BookmarkData* pBookmark = null; - BookmarkPresentationModel::GetInstance()->GetFolder(L"-1", 0, __folderCount, folderList); + BookmarkPresentationModel::GetInstance()->GetFolder(L"0", 0, __folderCount, folderList); for(int count = 0; count < folderList.GetCount(); count++) { pBookmark = dynamic_cast< BookmarkData* >(folderList.GetAt(count)); @@ -958,7 +958,7 @@ AddBookmarkForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId } if(__selectedIndex > 1) { - String parentID = L"-1"; + String parentID = L"0"; ArrayList folderList; BookmarkData* pBookmark = null; BookmarkPresentationModel::GetInstance()->GetFolder(parentID, 0, __folderCount, folderList); diff --git a/src/IntBookmarkData.cpp b/src/IntBookmarkData.cpp index 3e48116..d148012 100644 --- a/src/IntBookmarkData.cpp +++ b/src/IntBookmarkData.cpp @@ -32,7 +32,7 @@ BookmarkData::BookmarkData(void) , __bookmarkType(BOOKMARK_TYPE_URL) , __bookmarkTitle("") , __bookmarkUrl("") - , __parentId("-1") + , __parentId("0") , __iconPath("") , __faviconId("") , __pFavIconData(null) diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp index 2309cbc..8015f81 100644 --- a/src/IntBookmarkListForm.cpp +++ b/src/IntBookmarkListForm.cpp @@ -42,7 +42,7 @@ using namespace Tizen::Ui::Controls; using namespace Tizen::Ui::Scenes; using namespace Tizen::Media; -const wchar_t* DEFAULT_VALUE_PARENTID = L"-1"; +const wchar_t* DEFAULT_VALUE_PARENTID = L"0"; static const wchar_t* IDB_TAB_ICON_BOOKMARK = L"I01_tab_icon_bookmarks.png"; static const wchar_t* IDB_TAB_ICON_HISTORY = L"I01_tab_icon_history.png"; static const wchar_t* IDB_NO_CONTENT_BOOKMARK = L"I01_Nocontents_Bookmarks.png"; @@ -477,7 +477,7 @@ BookmarkListForm::OnActionPerformed(const Tizen::Ui::Control& source, int action { GetFooter()->SetItemEnabled(1,true); - if (__parentID.CompareTo(L"-1") == 0) + if (__parentID.CompareTo(L"0") == 0) { __pSearchBar->SetShowState(true); __pSearchBar->Invalidate(true); @@ -748,7 +748,7 @@ BookmarkListForm::GetItemCount(void) __pSearchBar->Invalidate(true); } - if (__parentID.CompareTo(L"-1") != 0) + if (__parentID.CompareTo(L"0") != 0) { __pSearchBar->SetShowState(false); __pSearchBar->Invalidate(true); @@ -766,7 +766,7 @@ BookmarkListForm::GetItemCount(void) } else { - if (__parentID.CompareTo(L"-1") == 0) + if (__parentID.CompareTo(L"0") == 0) { __pListview->SetBounds(__pListview->GetX(),__pSearchBar->GetHeight(),GetClientAreaBounds().width ,GetClientAreaBounds().height - __pSearchBar->GetY() - __pSearchBar->GetHeight()); } diff --git a/src/IntBookmarkPresentationModel.cpp b/src/IntBookmarkPresentationModel.cpp index b003f71..3de32ef 100644 --- a/src/IntBookmarkPresentationModel.cpp +++ b/src/IntBookmarkPresentationModel.cpp @@ -110,7 +110,7 @@ BookmarkPresentationModel::GetInstance(void) result BookmarkPresentationModel::SaveFolder(BookmarkData& bookmark) { - bookmark.SetParentId("-1"); + bookmark.SetParentId("0"); return SaveTempBookmark(bookmark); } diff --git a/src/IntCreateBookmarkFolderForm.cpp b/src/IntCreateBookmarkFolderForm.cpp index 9f6a22f..b7e611b 100644 --- a/src/IntCreateBookmarkFolderForm.cpp +++ b/src/IntCreateBookmarkFolderForm.cpp @@ -112,7 +112,7 @@ CreateBookmarkFolderForm::OnSceneActivatedN(const SceneId& previousSceneId, cons __previousScene = previousSceneId; bool flag = false; ArrayList folderList; - String parentID = "-1"; + String parentID = "0"; String title ; String folderTitle ; int count = 0; @@ -282,7 +282,7 @@ CreateBookmarkFolderForm::OnActionPerformed(const Control& source, int actionId) result r = E_SUCCESS; bool flag = false; ArrayList folderList; - String parentID = "-1"; + String parentID = "0"; int foldercount = 0; String title; String folderTitle; diff --git a/src/IntEditBookmarkListForm.cpp b/src/IntEditBookmarkListForm.cpp index 40b7ff8..96a9cf5 100644 --- a/src/IntEditBookmarkListForm.cpp +++ b/src/IntEditBookmarkListForm.cpp @@ -66,7 +66,7 @@ EditBookmarkListForm::EditBookmarkListForm(void) __pListview = null; __pData = null; __pTimer = null; - __parentID = L"-1"; + __parentID = L"0"; __pInfoPanel = null; __pInfoLabel = null; __selectedItemCount = 0; -- 2.7.4