Arrange code
authorHyukSoon Choi <hs619.choi@samsung.com>
Wed, 10 Jul 2013 06:13:25 +0000 (15:13 +0900)
committerHyukSoon Choi <hs619.choi@samsung.com>
Wed, 10 Jul 2013 06:13:25 +0000 (15:13 +0900)
Change-Id: I7fecdc68d790d1607617fc13438f47c70bd0edd4
Signed-off-by: HyukSoon Choi <hs619.choi@samsung.com>
33 files changed:
inc/GlAlbumInfo.h
inc/GlAlbumListEditorForm.h
inc/GlAllListSelectionPanel.h
inc/GlDropDownCustomItem.h
inc/GlFileListEditorForm.h
inc/GlFileMoveTimer.h
inc/GlProgressBar.h
inc/GlSlideSettingListener.h
src/GlAlbumInfo.cpp
src/GlAlbumListEditorForm.cpp
src/GlAlbumListForm.cpp
src/GlAlbumListPresentationModel.cpp
src/GlAlbumNameEditorForm.cpp
src/GlAllListEditorPanel.cpp
src/GlAllListPanel.cpp
src/GlAllListSelectionPanel.cpp
src/GlBaseForm.cpp
src/GlContentUpdateEventListener.cpp
src/GlDropDownCustomItem.cpp
src/GlFileListEditorForm.cpp
src/GlFileListForm.cpp
src/GlFileListPresentationModel.cpp
src/GlFileMoveTimer.cpp
src/GlFileUpdateTimer.cpp
src/GlImageListEditorPanel.cpp
src/GlProgressBar.cpp
src/GlRadioCustomItem.cpp
src/GlSettingMainForm.cpp
src/GlSettingPresentationModel.cpp
src/GlThumbnailInfo.cpp
src/GlThumbnailProvider.cpp
src/GlTimerBase.cpp
src/GlVideoListEditorPanel.cpp

index 05d03ff..07e76d9 100644 (file)
@@ -33,7 +33,7 @@ public:
        virtual ~AlbumInfo(void);
 
        result Construct(void);
-       result Construct(const Tizen::Base::String& albumName, Tizen::Content::ContentType contentType ,
+       result Construct(const Tizen::Base::String& albumName, Tizen::Content::ContentType contentType,
                                        const Tizen::Base::Collection::IList& directoryList,
                                        const Tizen::Base::Collection::IList& contentIdList);
        result Construct(const AlbumInfo& albumInfo);
index 227af50..b8152b7 100644 (file)
 class AlbumListPresentationModel;
 
 class AlbumListEditorForm
-       : public IAlbumEventListener
-       , public IFileOpInvalidateListener
-       , public IFormContentUpdateEventListener
+       : public Tizen::Ui::Controls::Form
        , public Tizen::Ui::IActionEventListener
        , public Tizen::Ui::IOrientationEventListener
        , public Tizen::Ui::IPropagatedKeyEventListener
-       , public Tizen::Ui::Controls::Form
        , public Tizen::Ui::Controls::IFormBackEventListener
        , public Tizen::Ui::Controls::IIconListViewItemEventListener
        , public Tizen::Ui::Controls::IIconListViewItemProvider
        , public Tizen::Ui::Scenes::ISceneEventListener
-
+       , public IAlbumEventListener
+       , public IFileOpInvalidateListener
+       , public IFormContentUpdateEventListener
 {
 public:
        AlbumListEditorForm(void);
@@ -51,12 +50,16 @@ public:
 
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
-       virtual void OnContentUpdated(void);
 
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
        virtual void OnOrientationChanged(const Tizen::Ui::Control &source, Tizen::Ui::OrientationStatus orientationStatus);
 
+       virtual bool OnKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){return false;}
+       virtual bool OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo);
+       virtual bool OnPreviewKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){return false;}
+       virtual bool OnPreviewKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){return false;}
+
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 
        virtual void OnIconListViewItemStateChanged(Tizen::Ui::Controls::IconListView &view, int index,
@@ -80,10 +83,7 @@ public:
        virtual void OnFileOpInvalidate(enum FileActionMode actionId);
        virtual void OnFileOpComplete(enum FileActionMode actionId, enum FileActionCompleteRes);
 
-       virtual bool OnKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false;}
-       virtual bool OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo);
-       virtual bool OnPreviewKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; }
-       virtual bool OnPreviewKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; }
+       virtual void OnContentUpdated(void);
 
 private:
        result InitializeControl(void);
index 57d7ad4..bb1e822 100644 (file)
@@ -78,7 +78,7 @@ public:
        virtual void OnThumbnailDecoded(const int index);
 
        virtual void OnFileOpInvalidate(enum FileActionMode);
-       virtual void OnFileOpComplete(enum FileActionMode , enum FileActionCompleteRes);
+       virtual void OnFileOpComplete(enum FileActionMode, enum FileActionCompleteRes);
 
        void ChangeOrientation(void);
 
index 2d1c118..24ba37f 100644 (file)
@@ -38,7 +38,7 @@ public:
        DropDownCustomItem(void);
        virtual ~DropDownCustomItem(void);
 
-       result Construct(int width , int height);
+       result Construct(int width, int height);
 
        DropDownItemState GetCurState(void) const;
        Tizen::Base::String GetMainText(void) const;
index c4484a8..5dbe981 100644 (file)
@@ -42,7 +42,7 @@ class FileListEditorForm
        , public Tizen::Ui::IPropagatedKeyEventListener
        , public Tizen::Ui::Controls::IFormBackEventListener
        , public Tizen::Ui::IOrientationEventListener
-    , public Tizen::Ui::Scenes::ISceneEventListener
+  , public Tizen::Ui::Scenes::ISceneEventListener
 {
 public:
        FileListEditorForm(void);
index 8fb6b4a..433be49 100644 (file)
@@ -30,7 +30,7 @@ class FileMoveTimer
        : public GlTimerBase
 {
 public :
-       FileMoveTimer(Tizen::Base::String& , Tizen::Base::Collection::IList* , FileListPresentationModel*,
+       FileMoveTimer(Tizen::Base::String&, Tizen::Base::Collection::IList*, FileListPresentationModel*,
                        IFileOpInvalidateListener*, bool isCopyOperation = false);
        virtual ~FileMoveTimer(void);
 
index 8d4d2f7..bfd714f 100644 (file)
@@ -27,7 +27,7 @@
 class GlProgressBar
 {
 public:
-       GlProgressBar(Tizen::Ui::IActionEventListener* listener ,Tizen::Ui::IPropagatedKeyEventListener* __pPropagatedListener);
+       GlProgressBar(Tizen::Ui::IActionEventListener* listener,Tizen::Ui::IPropagatedKeyEventListener* __pPropagatedListener);
        virtual ~GlProgressBar(void);
 
        void HideFileProgressingPopup(void);
index 5b1af99..ad35c63 100644 (file)
@@ -28,7 +28,7 @@ public:
        ISlideSettingListener(void){};
        virtual ~ISlideSettingListener(void) {};
 
-       virtual void OnSlideSettingPopUpItemSelected(int index) = 0 ;
+       virtual void OnSlideSettingPopUpItemSelected(int index) = 0;
 };
 
 #endif /* _GL_SLIDE_SETTING_LISTENER_H_ */
index 1837d93..5225570 100644 (file)
@@ -217,8 +217,8 @@ AlbumInfo::Construct(void)
 }
 
 result
-AlbumInfo::Construct(const String& albumName, ContentType contentType ,
-               const IList& directoryList, const IList& contentIdList)
+AlbumInfo::Construct(const String& albumName, ContentType contentType, const IList& directoryList,
+               const IList& contentIdList)
 {
        if (&albumName == null)
        {
index 1d59c9b..6cded72 100644 (file)
@@ -57,7 +57,7 @@ static const int FORMAT_BUFFER_SIZE = 256;
 static const Color COLOR_FOLDER_BITMAP_DIM(Color::GetColor(COLOR_ID_BLACK));
 static const int ALPHA_FOLDER_BITMAP_DIM = 70;
 
-static const int IDA_ALBUM_EDIT = 503 ;
+static const int IDA_ALBUM_EDIT = 503;
 
 AlbumListEditorForm::AlbumListEditorForm(void)
        : __checkedCount(0)
@@ -144,9 +144,9 @@ AlbumListEditorForm::OnContentUpdated(void)
 {
        AppLogDebug("ENTER");
        int maxCount = __pPresentationModel->GetFolderCount();
-       if(__pDeletePopup != null)
+       if (__pDeletePopup != null)
        {
-               if(__pDeletePopup->IsVisible() == true)
+               if (__pDeletePopup->IsVisible() == true)
                {
                        __pDeletePopup->Destroy();
                        __pDeletePopup = null;
@@ -283,7 +283,7 @@ AlbumListEditorForm::CreateItem(int index)
        Bitmap* pEditAlbumBitmap = null;
        Bitmap* pBitmapRenameBg = null;
        Bitmap* pBitmapRename = null;
-       String albumName ;
+       String albumName;
        int canvasWidth = 75;
        int canvasHeight = 75;
 
@@ -438,7 +438,7 @@ AlbumListEditorForm::OnIconListViewOverlayBitmapSelected (IconListView &iconList
        pSelectedIndex->Add(new (std::nothrow) Integer(FILE_ACTION_MOVE));
        pSelectedIndex->Add(new (std::nothrow) Integer(index));
 
-       if( __pEditorFolderIconList->IsItemChecked(index) == false )
+       if (__pEditorFolderIconList->IsItemChecked(index) == false)
        {
                __pEditorFolderIconList->SetItemChecked(index,true);
        }
@@ -566,11 +566,11 @@ AlbumListEditorForm::GetCheckedFolderCount(void) const
        int maxCount = __pPresentationModel->GetFolderCount();
        int count = 0;
 
-       for (int i = 0 ; i < maxCount; ++i)
+       for (int i = 0; i < maxCount; ++i)
        {
                if (__pEditorFolderIconList->IsItemChecked (i))
                {
-                       count++;
+                       ++count;
                }
        }
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
@@ -607,7 +607,7 @@ AlbumListEditorForm::OnActionPerformed(const Control& source, int actionId)
        case IDA_FOOTER_SHARE:
        {
 
-               if__pShareContextMenu != NULL)
+               if (__pShareContextMenu != NULL)
                {
                        delete __pShareContextMenu;
                        __pShareContextMenu = null;
@@ -682,7 +682,7 @@ AlbumListEditorForm::OnSceneActivatedN(const SceneId& previousSceneId,
 
        __checkedCount = GetCheckedFolderCount();
 
-       if ( previousSceneId == IDSCN_ALBUM_NAME_EDITOR )
+       if (previousSceneId == IDSCN_ALBUM_NAME_EDITOR)
        {
 
                if (__checkedCount ==  0)
@@ -699,7 +699,7 @@ AlbumListEditorForm::OnSceneActivatedN(const SceneId& previousSceneId,
        {
                __pPresentationModel->InitializeAlbumInfoList(CONTENT_TYPE_ALL);
 
-               for ( int index = 0 ; index < count ; index++ )
+               for (int index = 0; index < count; ++index)
                {
                        __pEditorFolderIconList->SetItemChecked(index,false);
                }
@@ -722,11 +722,11 @@ AlbumListEditorForm::OnSceneDeactivated(const SceneId& currentSceneId, const Sce
        AppLogDebug("ENTER");
        __pPresentationModel->RemoveContentEventListener(*this);
 
-       if (nextSceneId != IDSCN_ALBUM_NAME_EDITOR )
+       if (nextSceneId != IDSCN_ALBUM_NAME_EDITOR)
        {
                int loopCount = __pPresentationModel->GetFolderCount();
 
-               for( int count = 0 ; count < loopCount ; count++ )
+               for (int count = 0; count < loopCount; ++count)
                {
                        __pEditorFolderIconList->SetItemChecked(count,false);
                }
@@ -775,7 +775,7 @@ bool AlbumListEditorForm::OnKeyReleased(Control& source, const Tizen::Ui::KeyEve
 {
        AppLogDebug("ENTER");
 
-       if(keyEventInfo.GetKeyCode() == KEY_BACK)
+       if (keyEventInfo.GetKeyCode() == KEY_BACK)
        {
                __pDeletePopup->SetShowState(false);
                __pDeletePopup->Show();
@@ -991,14 +991,14 @@ AlbumListEditorForm::OnOrientationChanged(const Tizen::Ui::Control &source, Tize
 
        IList* pIndexList = GetItemCheckedIndexListN();
 
-       if( __pEditorFolderIconList != null )
+       if (__pEditorFolderIconList != null)
        {
                RemoveControl(__pEditorFolderIconList);
        }
 
        __pEditorFolderIconList = new IconListView();
 
-       if( orientationStatus == ORIENTATION_STATUS_PORTRAIT )
+       if (orientationStatus == ORIENTATION_STATUS_PORTRAIT)
        {
                __pEditorFolderIconList->Construct(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height- __pSelectCountLabel->GetHeight()),
                    Dimension(348, 348), ICON_LIST_VIEW_STYLE_MARK, ICON_LIST_VIEW_SCROLL_DIRECTION_VERTICAL);
@@ -1035,14 +1035,12 @@ AlbumListEditorForm::OnOrientationChanged(const Tizen::Ui::Control &source, Tize
        AddControl(__pEditorFolderIconList);
 
        int loopCount = pIndexList->GetCount();
-       int index = -1 ;
-       for(int count = 0 ; count < loopCount; count ++)
+       int index = -1;
+       for (int count = 0; count < loopCount; ++count)
        {
                Integer* pRealIndex = static_cast<Integer*>(pIndexList->GetAt(count));
                 index = pRealIndex->ToInt();
                __pEditorFolderIconList->SetItemChecked(index, true);
                __pEditorFolderIconList->RefreshList(index, LIST_REFRESH_TYPE_ITEM_MODIFY);
        }
-
 }
-
index 56dfba2..0fb993b 100644 (file)
@@ -441,7 +441,7 @@ AlbumListForm::OnContentUpdated(void)
 {
        AppLogDebug("ENTER");
 
-       if ( __pOptionMenu != null && __pOptionMenu ->GetShowState() == true)
+       if (__pOptionMenu != null && __pOptionMenu ->GetShowState() == true)
        {
                __pOptionMenu->SetShowState(false);
                __pOptionMenu->Show();
@@ -515,28 +515,26 @@ void
 AlbumListForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
 {
 
-       if ( __pOptionMenu == null || GetItemCount() == 0)
+       if (__pOptionMenu == null || GetItemCount() == 0)
        {
-               return ;
+               return;
        }
 
        __pOptionMenu->SetShowState(true);
        __pOptionMenu->Show();
-
 }
 
 void
 AlbumListForm::OnOrientationChanged(const Tizen::Ui::Control &source, Tizen::Ui::OrientationStatus orientationStatus)
 {
-
-       if( __pAlbumViewIconList != null )
+       if (__pAlbumViewIconList != null)
        {
                RemoveControl(__pAlbumViewIconList);
        }
 
        __pAlbumViewIconList = new IconListView();
 
-       if( orientationStatus == ORIENTATION_STATUS_PORTRAIT )
+       if (orientationStatus == ORIENTATION_STATUS_PORTRAIT)
        {
        __pAlbumViewIconList->Construct(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height),
                    Dimension(W_FOLDER_SIZE, H_FOLDER_SIZE), ICON_LIST_VIEW_STYLE_NORMAL, ICON_LIST_VIEW_SCROLL_DIRECTION_VERTICAL);
index 3f60859..8a02e3c 100644 (file)
@@ -68,7 +68,7 @@ static const int GAP = 10;
 static const int HEIGHT_OFFSET = 5;
 static const int Y_POS_CANVAS = 260;
 static const int FOLDER_NAME_WIDTH = 165;
-static const int FOLDER_NAME_HEIGHT = 38 ;
+static const int FOLDER_NAME_HEIGHT = 38;
 
 
 static const int ALPHA_BG = 110;
@@ -326,7 +326,7 @@ AlbumListPresentationModel::RenameAlbum(const String& orgPath, const String& new
 void AlbumListPresentationModel::OnContentScanCompleted (const Tizen::Base::String &scanPath)\r
 {
        AppLogDebug("ENTER");\r
-       if (__pAlbumListener && ( scanPath == __renameNewPath))\r
+       if (__pAlbumListener && (scanPath == __renameNewPath))\r
        {
                InitializeAlbumInfoList(CONTENT_TYPE_ALL);
                __pAlbumListener->OnAlbumRenameComplete();
@@ -442,12 +442,14 @@ AlbumListPresentationModel::DrawFontImage(Canvas& canvas, AlbumInfo* pAlbumInfo,
        enTextCount.SetTextAbbreviationEnabled(true);
        enTextCount.Add(textElementCount);
 
-       pointText = Point(CANVAS_MARGIN_LEFT + CANVAS_IMAGE_FOLDER_WIDTH + GAP + FOLDER_NAME_WIDTH , rectCanvas.y + HEIGHT_OFFSET);
+       pointText = Point(CANVAS_MARGIN_LEFT + CANVAS_IMAGE_FOLDER_WIDTH + GAP + FOLDER_NAME_WIDTH,
+                       rectCanvas.y + HEIGHT_OFFSET);
        canvas.SetFont(ftCnt);
        canvas.SetForegroundColor(Color::GetColor(COLOR_ID_WHITE));
        canvas.DrawText(pointText, enTextCount);
 
-       pointText = Point(CANVAS_MARGIN_LEFT + CANVAS_IMAGE_FOLDER_WIDTH + GAP , rectCanvas.y + GAP + HEIGHT_OFFSET);
+       pointText = Point(CANVAS_MARGIN_LEFT + CANVAS_IMAGE_FOLDER_WIDTH + GAP,
+                       rectCanvas.y + GAP + HEIGHT_OFFSET);
        canvas.SetForegroundColor(Color::GetColor(COLOR_ID_WHITE));
        canvas.DrawText(pointText, enText);
 
@@ -536,7 +538,7 @@ AlbumListPresentationModel::GetDirectoryName(String& directoryPath) const
 {
        AppLogDebug("ENTER");
        String directoryName;
-       int lastIndex = -1 ;
+       int lastIndex = -1;
 
        directoryPath.LastIndexOf(DIRECTORY_SEPARATOR, directoryPath.GetLength() - 1, lastIndex);
        directoryPath.SubString(lastIndex + 1, directoryName);
@@ -720,7 +722,7 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
                                                delete pSubDirList;
                                        }
 
-                                       if ( pContentIdList != NULL)
+                                       if (pContentIdList != NULL)
                                        {
                                                pContentIdList->RemoveAll(true);
                                                delete pContentIdList;
@@ -741,7 +743,7 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
                int insertIndex = 0;
                if (pAllAlbumInfo->GetContentIdCount() > 0)
                {
-                       __pAlbumInfoList->InsertAt((Object&)*pAllAlbumInfo, insertIndex++);
+                       __pAlbumInfoList->InsertAt((Object&)*pAllAlbumInfo, ++insertIndex);
                }
                else
                {
@@ -750,7 +752,7 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
 
                if (pCameraAlbumInfo->GetContentIdCount() > 0)
                {
-                       __pAlbumInfoList->InsertAt((Object&)*pCameraAlbumInfo, insertIndex++);
+                       __pAlbumInfoList->InsertAt((Object&)*pCameraAlbumInfo, ++insertIndex);
                }
                else
                {
@@ -759,7 +761,7 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
 
                if (pDownloadAlbumInfo->GetContentIdCount() > 0)
                {
-                       __pAlbumInfoList->InsertAt((Object&)*pDownloadAlbumInfo, insertIndex++);
+                       __pAlbumInfoList->InsertAt((Object&)*pDownloadAlbumInfo, ++insertIndex);
                }
                else
                {
@@ -768,7 +770,7 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
 
                if (pNoNameAlbumInfo->GetContentIdCount() > 0)
                {
-                       __pAlbumInfoList->InsertAt((Object&)*pNoNameAlbumInfo, insertIndex++);
+                       __pAlbumInfoList->InsertAt((Object&)*pNoNameAlbumInfo, ++insertIndex);
                }
                else
                {
@@ -882,7 +884,7 @@ AlbumListPresentationModel::GetContentIdListInDirectoryN(const String& directory
                delete pEnum;
        }
 
-       if ( pContentInfoList != NULL)
+       if (pContentInfoList != NULL)
        {
                pContentInfoList->RemoveAll(true);
                delete pContentInfoList;
index 14b84f5..6d2c892 100644 (file)
@@ -222,7 +222,7 @@ AlbumNameEditorForm::OnTextValueChanged(const Control& source)
                        CreateMessage(msg);
                        currentText = __pNameEditField->GetText();
 
-                       for (currentCharacter=0; checkByteCount < tempLength; currentCharacter++)
+                       for (currentCharacter=0; checkByteCount < tempLength; ++currentCharacter)
                        {
                                currentInputCharacter.Clear();
                                currentInputCharacter = currentText[currentCharacter];
@@ -234,9 +234,9 @@ AlbumNameEditorForm::OnTextValueChanged(const Control& source)
                                AppLogDebug("result of byte count is %s",GetErrorMessage(r));
                                checkByteCount = checkByteCount + byteCount;
 
-                               ifcheckByteCount < tempLength)
+                               if (checkByteCount < tempLength)
                                {
-                                       lengthOfFinalString++;
+                                       ++lengthOfFinalString;
                                }
                        }
 
@@ -367,7 +367,7 @@ AlbumNameEditorForm::OnCreateAlbum(void)
                AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
                delete __pMoveIndexList;
                __pMoveIndexList = null;
-               return ;
+               return;
        }
 
        if (__pMoveIndexList == null || __pMoveIndexList->GetCount() <= 0)
@@ -375,7 +375,7 @@ AlbumNameEditorForm::OnCreateAlbum(void)
                AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult()));
                delete __pMoveIndexList;
                __pMoveIndexList = null;
-               return ;
+               return;
        }
 
        delete __pFileMove;
@@ -450,7 +450,7 @@ AlbumNameEditorForm::OnActionPerformed(const Control& source, int actionId)
                else if (__albumNameEditorMode == ALBUM_NAME_EDITOR_MODE_RENAME)
                {
                        String albumName = __pNameEditField->GetText();
-                       if (__originalText.Equals(albumName , true))
+                       if (__originalText.Equals(albumName, true))
                        {
                                SceneManager* pSceneManager = SceneManager::GetInstance();
                                pSceneManager->GoBackward(BackwardSceneTransition());
@@ -552,7 +552,7 @@ AlbumNameEditorForm::OnSceneActivatedN(const SceneId& previousSceneId,
                        }
                        delete pEnum;
                        delete pArgs;
-                       pArgs = NULL ;
+                       pArgs = NULL;
                }
        }
 
@@ -635,7 +635,7 @@ AlbumNameEditorForm::OnContentUpdated(void)
 {
        AppLogDebug("ENTER");
 
-       if ( __mountState == false )
+       if (__mountState == false)
        {
                SceneManager* pSceneManager = SceneManager::GetInstance();
                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_LIST));
@@ -654,7 +654,7 @@ AlbumNameEditorForm::OnDeviceStateChanged(DeviceType deviceType, const Tizen::Ba
 
        if (deviceType == DEVICE_TYPE_STORAGE_CARD && state == DEVICE_STORAGE_CARD_UNMOUNTED)
        {
-               if ( __pFileMove && __pFileMove->IsStarted() )
+               if (__pFileMove && __pFileMove->IsStarted())
                {
                        __pFileMove->Cancel();
                        delete __pFileMove;
@@ -694,7 +694,7 @@ AlbumNameEditorForm::CreateMessage(String& str)
 void
 AlbumNameEditorForm::OnOrientationChanged(const Tizen::Ui::Control &source, Tizen::Ui::OrientationStatus orientationStatus)
 {
-       if ( __pProgressAnim != NULL)
+       if (__pProgressAnim != NULL)
        {
                __pProgressAnim->ChangeOrientation(GetClientAreaBounds());
                __pProgressAnim->Invalidate(true);
index 4ab8e08..e0ad585 100644 (file)
@@ -630,13 +630,14 @@ AllListEditorPanel::ChangeOrientation(void)
 {
        SceneManager* pSceneManager = SceneManager::GetInstance();
        const Form* pForm = dynamic_cast<Form*>(pSceneManager->GetCurrentScene()->GetForm());
-       TryReturn(pForm != null, , "[%s] fail to get the form.", GetErrorMessage(GetLastResult()));
+       TryReturn(pForm != null,, "[%s] fail to get the form.", GetErrorMessage(GetLastResult()));
 
        Rectangle clientAreaBounds = pForm->GetClientAreaBounds();
        SetBounds(0, 0, clientAreaBounds.width, clientAreaBounds.height);
        __pContentIconListView->SetBounds(0, 0, clientAreaBounds.width, clientAreaBounds.height - H_COUNT_LABEL);
        __pLabelSelectCnt->SetBounds(0, clientAreaBounds.height - H_COUNT_LABEL, clientAreaBounds.width, H_COUNT_LABEL);
-       __pButtonSelectRegion->SetBounds(clientAreaBounds.width - W_COUNT_LABEL_BUTTON - 10, clientAreaBounds.height - H_COUNT_LABEL_BUTTON - 4, W_COUNT_LABEL_BUTTON, H_COUNT_LABEL_BUTTON);
+       __pButtonSelectRegion->SetBounds(clientAreaBounds.width - W_COUNT_LABEL_BUTTON - 10,
+                       clientAreaBounds.height - H_COUNT_LABEL_BUTTON - 4, W_COUNT_LABEL_BUTTON, H_COUNT_LABEL_BUTTON);
 }
 
 result
@@ -799,7 +800,7 @@ AllListEditorPanel::ResetSelection(void)
        __itemCount = __pPresentationModel->GetCurrentAlbumContentInfoCount();
        __pContentIconListView->UpdateList();
 
-       for ( int index = 0; index < __itemCount; index++)
+       for (int index = 0; index < __itemCount; ++index)
        {
                __pContentIconListView->SetItemChecked(index, false);
                __pContentIconListView->RefreshList(index,LIST_REFRESH_TYPE_ITEM_MODIFY);
@@ -923,7 +924,7 @@ AllListEditorPanel::OnRequestRotate(RotateMode rotateMode)
 
 void AllListEditorPanel::CancelUpdateProgress(void)
 {
-       if__pFileUpdateTimer!= null && __pFileUpdateTimer->IsStarted())
+       if (__pFileUpdateTimer!= null && __pFileUpdateTimer->IsStarted())
        {
                __pFileUpdateTimer->Cancel();
                delete __pFileUpdateTimer;
index baa1479..20175cf 100644 (file)
@@ -317,7 +317,7 @@ AllListPanel::ChangeOrientation(void)
        AppLogDebug("ENTER");
        SceneManager* pSceneManager = SceneManager::GetInstance();
        const Form* pForm = dynamic_cast<Form*>(pSceneManager->GetCurrentScene()->GetForm());
-       TryReturn(pForm != null, , "[%s] fail to get the form.", GetErrorMessage(GetLastResult()));
+       TryReturn(pForm != null,, "[%s] fail to get the form.", GetErrorMessage(GetLastResult()));
 
        Rectangle clientAreaBounds = pForm->GetClientAreaBounds();
        SetBounds(0, 0, clientAreaBounds.width, clientAreaBounds.height);
@@ -329,7 +329,6 @@ AllListPanel::OnSceneActivatedN(const SceneId& previousSceneId,
                                                                const SceneId& currentSceneId, IList* pArgs)
 {
        AppLogDebug("ENTER");
-
        ChangeOrientation();
 
        __pPresentationModel = FileListPresentationModel::GetInstance();
@@ -373,7 +372,7 @@ AllListPanel::OnSceneActivatedN(const SceneId& previousSceneId,
                {
                        pFileListForm->SetTitleText(__pPresentationModel->GetCurrentAlbumName());
 
-                       if__itemCount == 0)
+                       if (__itemCount == 0)
                        {
                                pFileListForm->SetMenuState(false);
                        }
index ec38a0b..95f6ae6 100644 (file)
@@ -489,7 +489,7 @@ AllListSelectionPanel::ChangeOrientation()
 {
        SceneManager* pSceneManager = SceneManager::GetInstance();
        const Form* pForm = dynamic_cast<Form*>(pSceneManager->GetCurrentScene()->GetForm());
-       TryReturn(pForm != null, , "[%s] fail to get the form.", GetErrorMessage(GetLastResult()));
+       TryReturn(pForm != null,, "[%s] fail to get the form.", GetErrorMessage(GetLastResult()));
 
        Rectangle clientAreaBounds = pForm->GetClientAreaBounds();
        SetBounds(0, 0, clientAreaBounds.width, clientAreaBounds.height);
@@ -782,7 +782,7 @@ AllListSelectionPanel::OnRotateRequested(RotateMode rotateMode)
 
 void AllListSelectionPanel::CancelUpdateProgress(void)
 {
-       if__pFileUpdateTimer!= null && __pFileUpdateTimer->IsStarted())
+       if (__pFileUpdateTimer!= null && __pFileUpdateTimer->IsStarted())
        {
                __pFileUpdateTimer->Cancel();
                delete __pFileUpdateTimer;
index 3c0ce24..6d48339 100644 (file)
@@ -84,7 +84,7 @@ BaseForm::GetMoveFileIndexList(String& moveDir, IList* pMoveIndexList, FileListP
                                                pMoveIndexList->RemoveAt(j, true);
                                                --j;
                                                --innerLoopCount;
-                                               collisionCount++;
+                                               ++collisionCount;
                                        }
                                }
                        }
@@ -93,7 +93,7 @@ BaseForm::GetMoveFileIndexList(String& moveDir, IList* pMoveIndexList, FileListP
                pCollisionList->RemoveAll(true);
                delete pCollisionList;
 
-               if ( collisionCount > 0)
+               if (collisionCount > 0)
                {
                        MessageBox messageBox;
                        messageBox.Construct(L"", L"Unable to move some files. Same files exists",
index 6093b72..ec3931c 100644 (file)
@@ -161,7 +161,7 @@ void
 ContentUpdateEventListener::OnContentFileCreated(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r)
 {
        AppLogDebug("ENTER");
-       if ( contentType == CONTENT_TYPE_IMAGE || contentType == CONTENT_TYPE_VIDEO)
+       if (contentType == CONTENT_TYPE_IMAGE || contentType == CONTENT_TYPE_VIDEO)
        {
                Tizen::Content::ContentInfo* cntInfo = __pContentManager->GetContentInfoN(contentId);
                String path = cntInfo->GetContentPath();
@@ -181,7 +181,7 @@ ContentUpdateEventListener::OnContentFileUpdated(Tizen::Content::ContentId conte
 {
        AppLogDebug("ENTER");
        
-       if ( contentType == CONTENT_TYPE_IMAGE || contentType == CONTENT_TYPE_VIDEO)
+       if (contentType == CONTENT_TYPE_IMAGE || contentType == CONTENT_TYPE_VIDEO)
        {
                AlbumListPresentationModel::GetInstance()->OnContentUpdated();
                FileListPresentationModel::GetInstance()->OnContentUpdated();
@@ -194,7 +194,7 @@ ContentUpdateEventListener::OnContentFileDeleted(Tizen::Content::ContentId conte
 {
        AppLogDebug("ENTER");
 
-       if ( contentType == CONTENT_TYPE_IMAGE || contentType == CONTENT_TYPE_VIDEO)
+       if (contentType == CONTENT_TYPE_IMAGE || contentType == CONTENT_TYPE_VIDEO)
        {
                Tizen::App::UiApp* appPtr = Tizen::App::UiApp::GetInstance();
                if (appPtr->GetAppUiState() == Tizen::App::APP_UI_STATE_FOREGROUND)
@@ -221,7 +221,7 @@ ContentUpdateEventListener::OnContentDirectoryScanCompleted(const Tizen::Base::S
        {
                AlbumListPresentationModel::GetInstance()->OnContentDeleted();
                FileListPresentationModel::GetInstance()->OnContentDeleted();
-               AlbumListPresentationModel::GetInstance()->OnContentScanCompleted( directoryPath );
+               AlbumListPresentationModel::GetInstance()->OnContentScanCompleted(directoryPath);
        }
        else
        {
index 433c04d..8236118 100644 (file)
@@ -46,10 +46,10 @@ DropDownCustomItem::~DropDownCustomItem(void)
 }
 
 result
-DropDownCustomItem::Construct(int width , int height)
+DropDownCustomItem::Construct(int width, int height)
 {
        __width = width;
-       __height = height + 28 ;
+       __height = height + 28;
        Dimension dim(__width, __height);
        result r = CustomItem::Construct(dim, LIST_ANNEX_STYLE_NORMAL);
        return r;
@@ -86,14 +86,14 @@ DropDownCustomItem::Make(int fontsize, int itemHeight)
 
        int xMargin = 26;
        int yMargin = 22;
-       int subTextHeight = 42 ;
-       int mainTextHeight = itemHeight - yMargin - subTextHeight ;
+       int subTextHeight = 42;
+       int mainTextHeight = itemHeight - yMargin - subTextHeight;
 
        Tizen::Graphics::Bitmap* pDropperBitmapNormal = null;
 
-       AddElement(Rectangle(xMargin, yMargin, __width - 126, mainTextHeight ), IDA_FORMAT_MAIN_STRING,__mainText, fontsize,
+       AddElement(Rectangle(xMargin, yMargin, __width - 126, mainTextHeight), IDA_FORMAT_MAIN_STRING,__mainText, fontsize,
                        CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT);
-       AddElement(Rectangle(xMargin, yMargin + mainTextHeight , __width - 126, subTextHeight), IDA_FORMAT_SUB_STRING,__subText, 34, CUSTOM_COLOR_GREY,
+       AddElement(Rectangle(xMargin, yMargin + mainTextHeight, __width - 126, subTextHeight), IDA_FORMAT_SUB_STRING,__subText, 34, CUSTOM_COLOR_GREY,
                        CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY);
 
        AppResource* pAppResource = UiApp::GetInstance()->GetAppResource();
@@ -110,7 +110,6 @@ DropDownCustomItem::Make(int fontsize, int itemHeight)
 
                AddElement(Rectangle(__width - 95, (__height - 74) / 2, 74, 74), IDA_FORMAT_DROPPER, *pDropperBitmapNormal, pDropperBitmapNormal, pDropperBitmapNormal);
                delete pDropperBitmapNormal;
-
        }
 
        return E_SUCCESS;
index 48d2bac..94052ac 100644 (file)
@@ -362,14 +362,15 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
 
        case IDA_FOOTER_SHARE:
        {
-               if ( __pShareContextMenu != NULL)
+               if (__pShareContextMenu != NULL)
                {
                        delete __pShareContextMenu;
                        __pShareContextMenu = null;
                }
 
                __pShareContextMenu = new (std::nothrow) ContextMenu();
-               __pShareContextMenu->Construct(Point(GetClientAreaBounds().width/3 + 15, GetClientAreaBounds().height), CONTEXT_MENU_STYLE_LIST , CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
+               __pShareContextMenu->Construct(Point(GetClientAreaBounds().width/3 + 15, GetClientAreaBounds().height),
+                               CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
                __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MESSAGE"),
                                IDA_CONTEXT_MENU_SHARE_MESSAGE);
                __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"),
@@ -944,7 +945,7 @@ FileListEditorForm::RefreshFolderList(void)
        }
        __pContentDirectoryList = contentDirectory.GetContentDirectoryPathListN(SORT_ORDER_NONE);
 
-       if ( __pContentDirectoryNameList != NULL)
+       if (__pContentDirectoryNameList != NULL)
        {
                __pContentDirectoryNameList->RemoveAll(true);
                delete __pContentDirectoryNameList;
@@ -964,7 +965,7 @@ FileListEditorForm::RefreshFolderList(void)
                pDirPath = static_cast<String*>(__pContentDirectoryList->GetAt(i));
                pDirName = new (std::nothrow) String(GetDirecotyNameFromFullPath(*pDirPath));
 
-               if ( *pDirPath == mediaPath)
+               if (*pDirPath == mediaPath)
                {
                        *pDirName = ResourceManager::GetString(L"IDS_MEDIABR_POP_NO_NAME");
                        __pContentDirectoryNameList->Add(pDirName);
@@ -985,7 +986,7 @@ FileListEditorForm::RefreshFolderList(void)
                {
                        pDirName = static_cast<String*>(__pContentDirectoryNameList->GetAt(i));
 
-                       if ( *pDirName != __pPresentationModel->GetCurrentAlbumName())
+                       if (*pDirName != __pPresentationModel->GetCurrentAlbumName())
                        {
                                __pOptionMenu->AddItem(*(new (std::nothrow) String(*pDirName)),
                                                IDA_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START + i);
@@ -1031,7 +1032,7 @@ FileListEditorForm::OnFormBackRequested(Form& source)
                }
                else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
                {
-                       if (__pShareContextMenu != null && __pShareContextMenu->GetShowState() == true )
+                       if (__pShareContextMenu != null && __pShareContextMenu->GetShowState() == true)
                        {
                                __pShareContextMenu->SetShowState(false);
                        }
@@ -1298,16 +1299,16 @@ FileListEditorForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
                }
        }
 
-       if (__pShareContextMenu != null && __pShareContextMenu->GetShowState() == true )
+       if (__pShareContextMenu != null && __pShareContextMenu->GetShowState() == true)
        {
                __pShareContextMenu->SetShowState(false);
        }
 
-       if ( checkedCount > 0)
+       if (checkedCount > 0)
        {
-               if ( __pOptionMenu == null )
+               if (__pOptionMenu == null)
                {
-                       return ;
+                       return;
                }
 
                __pOptionMenu->RemoveAllItems();
@@ -1327,6 +1328,5 @@ FileListEditorForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
 
                __pOptionMenu->SetShowState(true);
                __pOptionMenu->Show();
-
        }
 }
index 52db43c..9c91119 100644 (file)
@@ -52,7 +52,7 @@ FileListForm::~FileListForm(void)
 {
        AppLogDebug("ENTER");
 
-       if ( __pPopUp != NULL )
+       if (__pPopUp != NULL)
        {
                delete __pPopUp;
                __pPopUp = NULL;
@@ -106,7 +106,7 @@ FileListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
 
-       if ( __pOptionMenu != null )
+       if (__pOptionMenu != null)
        {
                delete __pOptionMenu;
                __pOptionMenu = null;
@@ -331,19 +331,18 @@ void
 FileListForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
 {
 
-       if (__menuState == true )
+       if (__menuState == true)
        {
                InitializeFooter();
 
-               if ( __pOptionMenu == null )
+               if (__pOptionMenu == null)
                {
-                       return ;
+                       return;
                }
 
                __pOptionMenu->SetShowState(true);
                __pOptionMenu->Show();
        }
-
 }
 
 void
index 4e5016f..335d3dd 100644 (file)
@@ -57,7 +57,7 @@ static const int W_WIDE_THUMBNAIL = 171;
 static const int H_WIDE_THUMBNAIL = 127;
 static const int W_PLAY_FG = 64;
 static const int H_PLAY_FG = 64;
-static const int GAP_W_PLAY_FG = (W_DEFAULT_THUMBNAIL -W_PLAY_FG)/2 ;
+static const int GAP_W_PLAY_FG = (W_DEFAULT_THUMBNAIL -W_PLAY_FG)/2;
 static const int GAP_H_PLAY_FG = (H_DEFAULT_THUMBNAIL - H_PLAY_FG)/2;
 static const int GAP_H_DURATION = H_DEFAULT_THUMBNAIL - H_DURATION;
 static const int ALPHA_DURATION = 70;
@@ -695,7 +695,7 @@ FileListPresentationModel::OnContentUpdated(void)
                return;
        }
        //Clear the ImageCaches when content is updated like rotate.
-       if ( __pContentEventListener->GetCount() )
+       if (__pContentEventListener->GetCount())
        {
                ClearImageCache();
        }
@@ -1004,15 +1004,15 @@ FileListPresentationModel::MoveToContentFile(const ContentId& contentId, const S
 
        r = File::Copy(filePath, destPath, false);
 
-       if ( r == E_STORAGE_FULL)
+       if (r == E_STORAGE_FULL)
        {
                File::Remove(destPath);
        }
        ContentManager::ScanFile(destPath);
 
-       if ( r == E_SUCCESS )
+       if (r == E_SUCCESS)
        {
-               if ( isCopyOperation == false)
+               if (isCopyOperation == false)
                {
                        File::Remove(filePath);               // if Move Op remove original file
                        ContentManager::ScanFile(filePath);
@@ -1075,7 +1075,7 @@ FileListPresentationModel::SetCurrentAlbumInfo(const String& albumName, const IL
                        bool isMatched = false;
                        int outterLoopCount = __pDirectoryList->GetCount();
                        int innerLoopCount = 0;
-                       for (int i = 0; i < outterLoopCount ; ++i)
+                       for (int i = 0; i < outterLoopCount; ++i)
                        {
                                isMatched = false;
                                innerLoopCount = directoryList.GetCount();
@@ -1173,7 +1173,7 @@ FileListPresentationModel::AddDirectoryIfNew(const String& dirName)
                return;
        }
 
-       for (int i = 0; i < dirCount ; ++i)
+       for (int i = 0; i < dirCount; ++i)
        {
                if (static_cast<String*>(__pDirectoryList->GetAt(i))->CompareTo(fullDirName) == 0)
                {
@@ -1185,12 +1185,9 @@ FileListPresentationModel::AddDirectoryIfNew(const String& dirName)
        if (!isMatched)
        {
                __pDirectoryList->Add(new (std::nothrow) String(fullDirName));
-
        }
 }
 
-
-
 result
 FileListPresentationModel::RefreshContentInfoList(const ContentType contentType)
 {
index 064f7ba..557a7f3 100644 (file)
@@ -95,7 +95,7 @@ void FileMoveTimer::TimerCancel(int, enum FileActionCancelRes res)
 {
        AppLogDebug("ENTER");
 
-       if (res == CANCEL_USER || (res == CANCEL_SYS_ERROR && GetMovedCount() > 0) )
+       if (res == CANCEL_USER || (res == CANCEL_SYS_ERROR && GetMovedCount() > 0))
        {
                String albumName = __pPresentationModel->ConvertToAlbumName(__moveToDir);
 
@@ -113,7 +113,7 @@ void FileMoveTimer::TimerCancel(int, enum FileActionCancelRes res)
        }
        else if (res == CANCEL_SYS_ERROR && GetMovedCount() == 0)
        {
-               if ( __isCopyOperation == true )
+               if (__isCopyOperation == true)
                {
                        MessageBox messageBox;
                        messageBox.Construct(L"", L"Unable to copy files.",
index 5810276..40c1c2b 100644 (file)
@@ -51,7 +51,8 @@ FileUpdateTimer::~FileUpdateTimer(void)
        }
 }
 
-IList * FileUpdateTimer::TimerStart(void)
+IList*
+FileUpdateTimer::TimerStart(void)
 {
        if (_actionId == FILE_ACTION_DELETE)
        {
@@ -63,7 +64,8 @@ IList * FileUpdateTimer::TimerStart(void)
        }
 }
 
-result FileUpdateTimer::TimerExpired(const Object* contentId)
+result
+FileUpdateTimer::TimerExpired(const Object* contentId)
 {
        if (_actionId == FILE_ACTION_DELETE)
        {
@@ -76,7 +78,7 @@ result FileUpdateTimer::TimerExpired(const Object* contentId)
                if (pIndex != null)
                {
                    r = __pFileUpdateManager->RotateImage(pIndex->ToInt(), __rotateMode);
-                   if ( r == E_SUCCESS )
+                   if (r == E_SUCCESS)
                    {
                        __pFileUpdateManager->RequestThumbnail(pIndex->ToInt()); // do not request thumbnail for video files
                    }
index 236db24..6760adc 100644 (file)
@@ -647,11 +647,11 @@ ImageListEditorPanel::ChangeOrientation(void)
        AppLogDebug("ENTER");
        SceneManager* pSceneManager = SceneManager::GetInstance();
        const Form* pForm = dynamic_cast<Form*>(pSceneManager->GetCurrentScene()->GetForm());
-       TryReturn(pForm != null, , "[%s] fail to get the form.", GetErrorMessage(GetLastResult()));
+       TryReturn(pForm != null,, "[%s] fail to get the form.", GetErrorMessage(GetLastResult()));
 
        Rectangle clientAreaBounds = pForm->GetClientAreaBounds();
        SetBounds(0, 0, clientAreaBounds.width, clientAreaBounds.height);
-       if ( __pLabelSelectCnt != NULL )
+       if (__pLabelSelectCnt != NULL)
        {
        __pLabelSelectCnt->SetBounds(0, clientAreaBounds.height - H_COUNT_LABEL, clientAreaBounds.width, H_COUNT_LABEL);
        }
index 26b3cc5..0e40399 100644 (file)
@@ -195,7 +195,7 @@ GlProgressBar::IncProgress(const int count)
        counter.Append(L"/");
        counter.Append(__totalVal);
 
-       if( __pFileCounterLabel != null )
+       if (__pFileCounterLabel != null)
        {
                __pFileCounterLabel->SetText(counter);
                __pFileCounterLabel->Invalidate(true);
index 572891f..3d00940 100644 (file)
@@ -93,7 +93,7 @@ RadioCustomItem::Make(int fontSize)
                AppLogDebug("RadioCustomItem::the text is %ls", __text.GetPointer());
 
                r = AddElement(Rectangle(26 + pBitmap->GetWidth() + 10, 5, __width - 26 - 10 - pBitmap->GetWidth(),
-                               __height), IDA_FORMAT_STRING, __text, fontSize , textColor, textColor, textColor, true);
+                               __height), IDA_FORMAT_STRING, __text, fontSize, textColor, textColor, textColor, true);
                delete pBitmap;
        }
        TryCatch(!IsFailed(r),,"RadioCustomItem::the value is %s",GetErrorMessage(r));
index 68db47d..d2ba1cd 100644 (file)
@@ -186,7 +186,7 @@ void
 SettingMainForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, int groupIndex, int itemIndex, int elementId, ListItemStatus status)
 {
        int effectiveIndex = 0;
-       int inputValue = 0 ;
+       int inputValue = 0;
 
        effectiveIndex = effectiveIndex + itemIndex;
 
@@ -201,7 +201,7 @@ SettingMainForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, in
                        {
                                if (settingInfo[iter].itemType == ITEM_TYPE_RADIO)
                                {
-                                       settingInfo[effectiveIndex].childCount++;
+                                       ++settingInfo[effectiveIndex].childCount;
                                }
                                else
                                {
@@ -264,7 +264,7 @@ SettingMainForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, in
        {
        case SETTING_INTERVAL_2:
        {
-               inputValue = 2 ;
+               inputValue = 2;
                __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL,
                                inputValue);
                listView.UpdateList();
@@ -273,7 +273,7 @@ SettingMainForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, in
 
        case SETTING_INTERVAL_3:
        {
-               inputValue = 3 ;
+               inputValue = 3;
                __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER,
                                ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, inputValue);
                listView.UpdateList();
@@ -282,7 +282,7 @@ SettingMainForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, in
 
        case SETTING_INTERVAL_5:
        {
-               inputValue = 5 ;
+               inputValue = 5;
                __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER,
                                ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, inputValue);
                listView.UpdateList();
@@ -291,7 +291,7 @@ SettingMainForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, in
 
        case SETTING_INTERVAL_10:
        {
-               inputValue = 10 ;
+               inputValue = 10;
                __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER,
                                ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, inputValue);
                listView.UpdateList();
@@ -300,7 +300,7 @@ SettingMainForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, in
 
        case SETTING_INTERVAL_20:
        {
-               inputValue = 20 ;
+               inputValue = 20;
                __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER,
                                ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, inputValue);
                listView.UpdateList();
@@ -309,7 +309,7 @@ SettingMainForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, in
 
        case SETTING_TRANSITION_PAGE:
        {
-               inputValue = 0 ;
+               inputValue = 0;
                __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER,
                                ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT, inputValue);
                listView.UpdateList();
@@ -318,12 +318,12 @@ SettingMainForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, in
 
        case SETTING_TRANSITION_DISSOLVE:
        {
-               inputValue = 1 ;
+               inputValue = 1;
                result r = __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER,
                                ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT, inputValue);
                if (r == E_SUCCESS)
                {
-                       AppLogDebug(" Passed") ;
+                       AppLogDebug(" Passed");
                }
 
                listView.UpdateList();
@@ -332,7 +332,7 @@ SettingMainForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, in
 
        case SETTING_TRANSITION_ZOOM:
        {
-               inputValue = 2 ;
+               inputValue = 2;
                 __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER,
                                ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT, inputValue);
                listView.UpdateList();
@@ -341,7 +341,7 @@ SettingMainForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, in
 
        case SETTING_REPEAT:
        {
-               int repeatValue = 0 ;
+               int repeatValue = 0;
 
                __pPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER,
                                ENTRY_NAME_IMAGE_VIEWER_REPEAT_VALUE, repeatValue);
@@ -438,8 +438,8 @@ SettingMainForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        String fontSizeStr;
        int fontSize = 0;
        int itemHeight = 0;
-       int defaultHeight = 112 ;
-       int defaultFontSize = 44 ;
+       int defaultHeight = 112;
+       int defaultFontSize = 44;
 
        SettingInfo::GetValue("http://tizen.org/setting/font.size", fontSizeStr);
        AppLog("the font value is %S",fontSizeStr.GetPointer());
@@ -447,27 +447,27 @@ SettingMainForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        if(fontSizeStr == "medium")
        {
                fontSize = 44;
-               itemHeight = defaultHeight + ( fontSize - defaultFontSize);
+               itemHeight = defaultHeight + (fontSize - defaultFontSize);
        }
        else if(fontSizeStr == "huge")
        {
                fontSize =  81;
-               itemHeight = defaultHeight + ( fontSize - defaultFontSize);
+               itemHeight = defaultHeight + (fontSize - defaultFontSize);
        }
        else if(fontSizeStr == "giant")
        {
                fontSize = 98;
-               itemHeight = defaultHeight + ( fontSize - defaultFontSize);
+               itemHeight = defaultHeight + (fontSize - defaultFontSize);
        }
        else if(fontSizeStr == "small")
        {
                fontSize = 36;
-               itemHeight = defaultHeight + ( fontSize - defaultFontSize);
+               itemHeight = defaultHeight + (fontSize - defaultFontSize);
        }
        else if(fontSizeStr == "large")
        {
                fontSize = 64;
-               itemHeight = defaultHeight + ( fontSize - defaultFontSize);
+               itemHeight = defaultHeight + (fontSize - defaultFontSize);
        }
        else
        {
@@ -589,7 +589,7 @@ SettingMainForm::DeleteItem(int groupIndex, int itemIndex, ListItemBase* pItem,
 int
 SettingMainForm::GetGroupCount(void)
 {
-       int groupCount = 1 ;
+       int groupCount = 1;
 
        return groupCount;
 }
@@ -699,7 +699,7 @@ SettingMainForm::InitializeSettingValues(void)
        }
 
        settingInfo[SETTING_SLIDESHOW_INTERVAL_TITLE].titleText = ResourceManager::GetString(L"IDS_MEDIABR_BODY_SLIDESHOW_INTERVAL");
-       settingInfo[SETTING_SLIDESHOW_INTERVAL_TITLE].subText = selectedInterval ;
+       settingInfo[SETTING_SLIDESHOW_INTERVAL_TITLE].subText = selectedInterval;
        settingInfo[SETTING_SLIDESHOW_INTERVAL_TITLE].itemType = ITEM_TYPE_DROPDOWN;
 
        settingInfo[SETTING_INTERVAL_2].titleText = ResourceManager::GetString(L"IDS_MEDIABR_OPT_2_SECONDS");
@@ -729,11 +729,11 @@ SettingMainForm::InitializeSettingValues(void)
 
        if (repeatValue == 0)
        {
-               settingInfo[SETTING_REPEAT].isSelected = false ;
+               settingInfo[SETTING_REPEAT].isSelected = false;
        }
        else
        {
-               settingInfo[SETTING_REPEAT].isSelected = true ;
+               settingInfo[SETTING_REPEAT].isSelected = true;
        }
 
        r = __pPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER,
@@ -744,11 +744,11 @@ SettingMainForm::InitializeSettingValues(void)
 
        if (shuffletValue == 0)
        {
-               settingInfo[SETTING_SHUFFLE].isSelected = false ;
+               settingInfo[SETTING_SHUFFLE].isSelected = false;
        }
        else
        {
-               settingInfo[SETTING_SHUFFLE].isSelected = true ;
+               settingInfo[SETTING_SHUFFLE].isSelected = true;
        }
 
        settingInfo[SETTING_TRANSITION_EFFECT_TITLE].titleText = ResourceManager::GetString(L"IDS_MEDIABR_BODY_TRANSITION_EFFECT");
index e140215..26df142 100644 (file)
@@ -79,7 +79,7 @@ SettingPresentationModel::Construct(void)
 {
        AppLogDebug("ENTER");
        result r = CreateDefaultRegistry();
-       TryCatch(r == E_SUCCESS, , "CreateDefaultRegistry() failed[%s]", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "CreateDefaultRegistry() failed[%s]", GetErrorMessage(r));
 
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
@@ -126,7 +126,7 @@ SettingPresentationModel::GetValue(const String& strSectionName, const String& e
 {
        AppLogDebug("ENTER");
        result r = __pDefaultGalleryRegistry->GetValue(strSectionName, entryName, value);
-       TryCatch(r == E_SUCCESS, , "Registry::GetValue() failed[%s]", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "Registry::GetValue() failed[%s]", GetErrorMessage(r));
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return r;
@@ -142,7 +142,7 @@ SettingPresentationModel::GetValue(const String& strSectionName, const String& e
 {
        AppLogDebug("ENTER");
        result r = __pDefaultGalleryRegistry->GetValue(strSectionName, entryName, value);
-       TryCatch(r == E_SUCCESS, , "Registry::GetValue() failed[%s]", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "Registry::GetValue() failed[%s]", GetErrorMessage(r));
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return r;
@@ -158,7 +158,7 @@ SettingPresentationModel::SetValue(const String& strSectionName, const String& e
 {
        AppLogDebug("ENTER");
        result r= __pDefaultGalleryRegistry->SetValue(strSectionName, entryName, value);
-       TryCatch(r == E_SUCCESS, , "Registry::SetValue() failed[%s]", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "Registry::SetValue() failed[%s]", GetErrorMessage(r));
        r = __pDefaultGalleryRegistry->Flush();
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
@@ -175,7 +175,7 @@ SettingPresentationModel::SetValue(const String& strSectionName, const String& e
 {
        AppLogDebug("ENTER");
        result r = __pDefaultGalleryRegistry->SetValue(strSectionName, entryName, value);
-       TryCatch(r == E_SUCCESS, , "Registry::SetValue() failed[%s]", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "Registry::SetValue() failed[%s]", GetErrorMessage(r));
        r = __pDefaultGalleryRegistry->Flush();
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
@@ -211,26 +211,26 @@ SettingPresentationModel::CreateDefaultRegistry(void)
 
                __pDefaultGalleryRegistry->Construct(pathGalleryDefaultSetting, "w+");
                r = __pDefaultGalleryRegistry->AddSection(SECTION_IMAGE_VIEWER);
-               TryCatch(r == E_SUCCESS, , "Registry::AddSection() failed[%s]", GetErrorMessage(r));
+               TryCatch(r == E_SUCCESS,, "Registry::AddSection() failed[%s]", GetErrorMessage(r));
 
                r = __pDefaultGalleryRegistry->AddValue(SECTION_IMAGE_VIEWER, SLIDESHOW_INTERVAL_VALUE,
                                DEFAULT_VALUE_INTERVAL);
-               TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r));
+               TryCatch(r == E_SUCCESS,, "Registry::AddValue() failed[%s]", GetErrorMessage(r));
 
                r = __pDefaultGalleryRegistry->AddValue(SECTION_IMAGE_VIEWER, TRANSITION_EFFECT_VALUE,
                                DEFAULT_VALUE_EFFECT_SLIDE);
-               TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r));
+               TryCatch(r == E_SUCCESS,, "Registry::AddValue() failed[%s]", GetErrorMessage(r));
 
                r = __pDefaultGalleryRegistry->AddValue(SECTION_IMAGE_VIEWER, REPEAT_VALUE,
                                DEFAULT_VALUE_REPEAT);
-               TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r));
+               TryCatch(r == E_SUCCESS,, "Registry::AddValue() failed[%s]", GetErrorMessage(r));
 
                r = __pDefaultGalleryRegistry->AddValue(SECTION_IMAGE_VIEWER, SHUFFLE_VALUE,
                                DEFAULT_VALUE_SHUFFLE);
-               TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r));
+               TryCatch(r == E_SUCCESS,, "Registry::AddValue() failed[%s]", GetErrorMessage(r));
 
                r = __pDefaultGalleryRegistry->Flush();
-               TryCatch(r == E_SUCCESS, , "Registry::Flush() failed[%s]", GetErrorMessage(r));
+               TryCatch(r == E_SUCCESS,, "Registry::Flush() failed[%s]", GetErrorMessage(r));
        }
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
index 559ca33..87c3cd9 100755 (executable)
@@ -127,7 +127,7 @@ ThumbnailInfo::CloneBitmapN(const Bitmap& bitmap) const
                mainCanvas.DrawBitmap(mainRect, bitmap);
                pResultBitmap = new (std::nothrow) Bitmap();
                result r = pResultBitmap->Construct(mainCanvas, mainRect);
-               TryCatch(r == E_SUCCESS, , "pResultBitmap->Construct Failed:%s", GetErrorMessage(r));
+               TryCatch(r == E_SUCCESS,, "pResultBitmap->Construct Failed:%s", GetErrorMessage(r));
        }
        return pResultBitmap;
 
index cb2a68e..15e324d 100644 (file)
@@ -97,11 +97,11 @@ ThumbnailProvider::Construct(void)
 
        __pThumbnailEventListener = new (std::nothrow) ArrayList(SingleObjectDeleter);
        result r = __pThumbnailEventListener->Construct();
-       TryCatch(r == E_SUCCESS, , "[%s] Unable to set event listener", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "[%s] Unable to set event listener", GetErrorMessage(r));
 
        __pMutexCmd = new (std::nothrow) Mutex();
        r = __pMutexCmd->Create();
-       TryCatch(r == E_SUCCESS, , "[%s] Unable to create mutex", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "[%s] Unable to create mutex", GetErrorMessage(r));
 
        if (__pCmdQueue != null)
        {
@@ -109,7 +109,7 @@ ThumbnailProvider::Construct(void)
        }
        __pCmdQueue = new (std::nothrow) ArrayList(SingleObjectDeleter);
        r = __pCmdQueue->Construct();
-       TryCatch(r == E_SUCCESS, , "[%s] Unable to construct queue", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "[%s] Unable to construct queue", GetErrorMessage(r));
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return EventDrivenThread::Construct();
index 4c26db0..4fecce7 100644 (file)
@@ -68,7 +68,8 @@ GlTimerBase::StartTimer(void)
        if (__pContentIdList != null && __pContentIdList->GetCount() > 0)
        {
                AppLogDebug("Starting timer");
-               __pMoveProBar = new (std::nothrow) GlProgressBar(static_cast<IActionEventListener*>(this), static_cast<IPropagatedKeyEventListener*>(this));
+               __pMoveProBar = new (std::nothrow) GlProgressBar(static_cast<IActionEventListener*>(this),
+                               static_cast<IPropagatedKeyEventListener*>(this));
                __pMoveProBar->ShowFileProgressingPopup(__pContentIdList->GetCount(), _actionId);
                __moveToCount = 0;
                __moveTimer.Construct(*this);
@@ -114,7 +115,7 @@ GlTimerBase::OnTimerExpired(Timer& timer)
                                        return;
                                }
                        }
-                       __moveToCount++;
+                       ++__moveToCount;
                        __pMoveProBar->IncProgress(__moveToCount);
                        if (__pInvalidate)
                        {
@@ -152,12 +153,14 @@ GlTimerBase::OnActionPerformed(const Control& source, int actionId)
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
-int GlTimerBase::GetMovedCount() const
+int
+GlTimerBase::GetMovedCount() const
 {
        return __moveToCount;
 }
 
-void GlTimerBase::OnOpCancelled(enum FileActionCancelRes res)
+void
+GlTimerBase::OnOpCancelled(enum FileActionCancelRes res)
 {
        AppLogDebug("ENTER");
        __pMoveProBar->HideFileProgressingPopup();
@@ -199,7 +202,8 @@ void GlTimerBase::OnOpCancelled(enum FileActionCancelRes res)
        AppLogDebug("EXIT");
 }
 
-void GlTimerBase::OnOpComplete(enum FileActionCompleteRes res)
+void
+GlTimerBase::OnOpComplete(enum FileActionCompleteRes res)
 {
        AppLogDebug("ENTER");
        ContentUpdateEventListener* pContentListener = ContentUpdateEventListener::GetInstance();
@@ -214,20 +218,22 @@ void GlTimerBase::OnOpComplete(enum FileActionCompleteRes res)
        AppLogDebug("EXIT");
 }
 
-void GlTimerBase::SetActionMode(const enum FileActionMode actionId)
+void
+GlTimerBase::SetActionMode(const enum FileActionMode actionId)
 {
        _actionId = actionId;
 }
 
-
-bool GlTimerBase::IsStarted(void)
+bool
+GlTimerBase::IsStarted(void)
 {
        return __isStarted;
 }
 
-void GlTimerBase::Cancel(void)
+void
+GlTimerBase::Cancel(void)
 {
-       if ( __isStarted )
+       if (__isStarted)
        {
                ContentUpdateEventListener* pContentListener = ContentUpdateEventListener::GetInstance();
                pContentListener->AddContentListener();
@@ -235,7 +241,6 @@ void GlTimerBase::Cancel(void)
                __moveTimer.Cancel();
                __isStarted = false;
        }
-
 }
 
 bool
index 7943fa7..3b08f4c 100644 (file)
@@ -779,7 +779,7 @@ VideoListEditorPanel::ChangeOrientation(void)
        AppLogDebug("ENTER");
        SceneManager* pSceneManager = SceneManager::GetInstance();
        const Form* pForm = dynamic_cast<Form*>(pSceneManager->GetCurrentScene()->GetForm());
-       TryReturn(pForm != null, , "[%s] fail to get the form.", GetErrorMessage(GetLastResult()));
+       TryReturn(pForm != null,, "[%s] fail to get the form.", GetErrorMessage(GetLastResult()));
 
        Rectangle clientAreaBounds = pForm->GetClientAreaBounds();
        SetBounds(0, 0, clientAreaBounds.width, clientAreaBounds.height);