Fixed Coding Idioms Violations
authorShiv Pratap Singh <shivp.singh@samsung.com>
Fri, 27 Sep 2013 11:13:42 +0000 (16:43 +0530)
committerShiv Pratap Singh <shivp.singh@samsung.com>
Mon, 30 Sep 2013 05:00:27 +0000 (10:30 +0530)
Change-Id: I353a45e787a4f1d1a6c254ea33fd91cd79f3ca07
Signed-off-by: Shiv Pratap Singh <shivp.singh@samsung.com>
54 files changed:
src/ui/controls/FUiCtrl_CheckButtonImpl.cpp
src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
src/ui/controls/FUiCtrl_ColorPickerImpl.cpp
src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp
src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp
src/ui/controls/FUiCtrl_ContextMenuModel.cpp
src/ui/controls/FUiCtrl_DateTimeBar.cpp
src/ui/controls/FUiCtrl_DateTimeDisplayBox.cpp
src/ui/controls/FUiCtrl_DateTimePicker.cpp
src/ui/controls/FUiCtrl_DateTimePresenter.cpp
src/ui/controls/FUiCtrl_EditAreaImpl.cpp
src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
src/ui/controls/FUiCtrl_EditFieldImpl.cpp
src/ui/controls/FUiCtrl_EditPresenter.cpp
src/ui/controls/FUiCtrl_EditTimePresenter.cpp
src/ui/controls/FUiCtrl_ExpandableListImpl.cpp
src/ui/controls/FUiCtrl_FastScrollPresenter.cpp
src/ui/controls/FUiCtrl_Form.cpp
src/ui/controls/FUiCtrl_FormImpl.cpp
src/ui/controls/FUiCtrl_GalleryImageReader.cpp
src/ui/controls/FUiCtrl_GroupContainer.cpp
src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp
src/ui/controls/FUiCtrl_IconListImpl.cpp
src/ui/controls/FUiCtrl_IconListItem.cpp
src/ui/controls/FUiCtrl_IconListPresenter.cpp
src/ui/controls/FUiCtrl_Indicator.cpp
src/ui/controls/FUiCtrl_Keypad.cpp
src/ui/controls/FUiCtrl_ListImpl.cpp
src/ui/controls/FUiCtrl_ListViewImpl.cpp
src/ui/controls/FUiCtrl_MessageBox.cpp
src/ui/controls/FUiCtrl_OptionMenuModel.cpp
src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp
src/ui/controls/FUiCtrl_OverlayAgent.cpp
src/ui/controls/FUiCtrl_OverlayPanelImpl.cpp
src/ui/controls/FUiCtrl_OverlayRegionImpl.cpp
src/ui/controls/FUiCtrl_PanelImpl.cpp
src/ui/controls/FUiCtrl_PopupImpl.cpp
src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp
src/ui/controls/FUiCtrl_ProgressPresenter.cpp
src/ui/controls/FUiCtrl_ScrollPresenter.cpp
src/ui/controls/FUiCtrl_SearchBarImpl.cpp
src/ui/controls/FUiCtrl_SlidableGroupedListImpl.cpp
src/ui/controls/FUiCtrl_SlidableListImpl.cpp
src/ui/controls/FUiCtrl_Slider.cpp
src/ui/controls/FUiCtrl_SliderPresenter.cpp
src/ui/controls/FUiCtrl_SplitPanelPresenter.cpp
src/ui/controls/FUiCtrl_Tab.cpp
src/ui/controls/FUiCtrl_TabBar.cpp
src/ui/controls/FUiCtrl_TabPresenter.cpp
src/ui/controls/FUiCtrl_TableView.cpp
src/ui/controls/FUiCtrl_TableViewItem.cpp
src/ui/controls/FUiCtrl_TableViewPresenter.cpp
src/ui/controls/FUiCtrl_Toolbar.cpp
src/ui/controls/FUiCtrl_ToolbarPresenter.cpp

index e1d9889..e95d734 100644 (file)
@@ -805,7 +805,6 @@ protected:
 
                                if (r != E_SUCCESS)
                                {
-                                       //      SysLogExceptionxception( "[E_SYSTEM] UiBuilder::__MakeCheck: Failed to create Group(%s)",buffer);
                                        delete pCheck;
                                        delete pGroup;
                                        return null;
index 7ccc4dd..de0a178 100644 (file)
@@ -242,24 +242,24 @@ _CheckButtonPresenter::DrawBackground(void)
        if (checkStyle == CHECK_BUTTON_STYLE_MARK || checkStyle == CHECK_BUTTON_STYLE_MARK_WITH_DIVIDER || checkStyle == CHECK_BUTTON_STYLE_ONOFF
                        || checkStyle == CHECK_BUTTON_STYLE_ONOFF_WITH_DIVIDER || checkStyle == CHECK_BUTTON_STYLE_RADIO || checkStyle == CHECK_BUTTON_STYLE_RADIO_WITH_DIVIDER)
        {
-               if (bounds.width < minDimension.width )
+               if (bounds.width < minDimension.width)
                {
                        bounds.width = minDimension.width;
                }
 
-               if (bounds.height < minDimension.height )
+               if (bounds.height < minDimension.height)
                {
                        bounds.height = minDimension.height;
                }
        }
        else
        {
-               if (bounds.width < minDimensionWithAnnex.width )
+               if (bounds.width < minDimensionWithAnnex.width)
                {
                        bounds.width = minDimensionWithAnnex.width;
                }
 
-               if (bounds.height < minDimensionWithAnnex.height )
+               if (bounds.height < minDimensionWithAnnex.height)
                {
                        bounds.height = minDimensionWithAnnex.height;
                }
@@ -1439,7 +1439,7 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
 
                FloatRectangle bounds(0.0f, 0.0f, __pCheckButton->GetBoundsF().width, __pCheckButton->GetBoundsF().height);
 
-               if (bounds.height < minDimension.height )
+               if (bounds.height < minDimension.height)
                {
                        bounds.height = minDimension.height;
                }
@@ -1895,7 +1895,7 @@ _CheckButtonPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& to
                }
                else
                {
-                       if (isInCheckButtonArea == true && __touchMoveHandled == false && isInOnOffHandlerArea == false )
+                       if (isInCheckButtonArea == true && __touchMoveHandled == false && isInOnOffHandlerArea == false)
                        {
                                __pCheckButton->SetCheckButtonStatus(_CHECK_BUTTON_STATUS_PRESSED);
                        }
@@ -1917,7 +1917,7 @@ _CheckButtonPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& to
                {
                        __detailedPressed = false;
 
-                       if (isInCheckButtonArea == true && __touchMoveHandled == false && isDetailedArea == false )
+                       if (isInCheckButtonArea == true && __touchMoveHandled == false && isDetailedArea == false)
                        {
                                __pCheckButton->SetCheckButtonStatus(_CHECK_BUTTON_STATUS_PRESSED);
                        }
@@ -2477,24 +2477,24 @@ _CheckButtonPresenter::CalculateTitleTextBounds(void)
        if (checkStyle == CHECK_BUTTON_STYLE_MARK || checkStyle == CHECK_BUTTON_STYLE_MARK_WITH_DIVIDER || checkStyle == CHECK_BUTTON_STYLE_ONOFF
                        || checkStyle == CHECK_BUTTON_STYLE_ONOFF_WITH_DIVIDER || checkStyle == CHECK_BUTTON_STYLE_RADIO || checkStyle == CHECK_BUTTON_STYLE_RADIO_WITH_DIVIDER)
        {
-               if (bounds.width < minDimension.width )
+               if (bounds.width < minDimension.width)
                {
                        bounds.width = minDimension.width;
                }
 
-               if (bounds.height < minDimension.height )
+               if (bounds.height < minDimension.height)
                {
                        bounds.height = minDimension.height;
                }
        }
        else
        {
-               if (bounds.width < minDimensionWithAnnex.width )
+               if (bounds.width < minDimensionWithAnnex.width)
                {
                        bounds.width = minDimensionWithAnnex.width;
                }
 
-               if (bounds.height < minDimensionWithAnnex.height )
+               if (bounds.height < minDimensionWithAnnex.height)
                {
                        bounds.height = minDimensionWithAnnex.height;
                }
@@ -2561,24 +2561,24 @@ _CheckButtonPresenter::CalculateTextBounds(void)
        if (checkStyle == CHECK_BUTTON_STYLE_MARK || checkStyle == CHECK_BUTTON_STYLE_MARK_WITH_DIVIDER || checkStyle == CHECK_BUTTON_STYLE_ONOFF
                        || checkStyle == CHECK_BUTTON_STYLE_ONOFF_WITH_DIVIDER || checkStyle == CHECK_BUTTON_STYLE_RADIO || checkStyle == CHECK_BUTTON_STYLE_RADIO_WITH_DIVIDER)
        {
-               if (bounds.width < minDimension.width )
+               if (bounds.width < minDimension.width)
                {
                        bounds.width = minDimension.width;
                }
 
-               if (bounds.height < minDimension.height )
+               if (bounds.height < minDimension.height)
                {
                        bounds.height = minDimension.height;
                }
        }
        else
        {
-               if (bounds.width < minDimensionWithAnnex.width )
+               if (bounds.width < minDimensionWithAnnex.width)
                {
                        bounds.width = minDimensionWithAnnex.width;
                }
 
-               if (bounds.height < minDimensionWithAnnex.height )
+               if (bounds.height < minDimensionWithAnnex.height)
                {
                        bounds.height = minDimensionWithAnnex.height;
                }
@@ -2674,24 +2674,24 @@ _CheckButtonPresenter::CalculateButtonBounds(void)
        if (checkStyle == CHECK_BUTTON_STYLE_MARK || checkStyle == CHECK_BUTTON_STYLE_MARK_WITH_DIVIDER || checkStyle == CHECK_BUTTON_STYLE_ONOFF
                        || checkStyle == CHECK_BUTTON_STYLE_ONOFF_WITH_DIVIDER || checkStyle == CHECK_BUTTON_STYLE_RADIO || checkStyle == CHECK_BUTTON_STYLE_RADIO_WITH_DIVIDER)
        {
-               if (bounds.width < minDimension.width )
+               if (bounds.width < minDimension.width)
                {
                        bounds.width = minDimension.width;
                }
 
-               if (bounds.height < minDimension.height )
+               if (bounds.height < minDimension.height)
                {
                        bounds.height = minDimension.height;
                }
        }
        else
        {
-               if (bounds.width < minDimensionWithAnnex.width )
+               if (bounds.width < minDimensionWithAnnex.width)
                {
                        bounds.width = minDimensionWithAnnex.width;
                }
 
-               if (bounds.height < minDimensionWithAnnex.height )
+               if (bounds.height < minDimensionWithAnnex.height)
                {
                        bounds.height = minDimensionWithAnnex.height;
                }
index d0aa64d..b0edbaf 100644 (file)
@@ -284,7 +284,7 @@ _ColorPickerImpl::GetPublicClassName(void) const
 void
 _ColorPickerImpl::OnColorChanged(const _Control& source, const Color& color)
 {
-       IEventArg * pColorChangeEventArg = _PublicColorChangeEvent::CreateColorChangeEventArgN(color);
+       IEventArg* pColorChangeEventArg = _PublicColorChangeEvent::CreateColorChangeEventArgN(color);
        if (pColorChangeEventArg == null)
        {
                return;
index c80d88d..b033121 100644 (file)
@@ -779,7 +779,7 @@ _ColorPickerPresenter::DrawFocus(_ColorPickerComponentType currentFocusedIndex,
        {
                case HUE_HANDLER:
                {
-                       Canvas *pCanvas = __pColorPicker->GetHueHandler()->GetCanvasN();
+                       CanvaspCanvas = __pColorPicker->GetHueHandler()->GetCanvasN();
                        r = GetLastResult();
                        SysTryReturnResult(NID_UI_CTRL, pCanvas != null, r, "[%s] Propagating.", GetErrorMessage(r));
                        r = DrawResourceBitmap(*pCanvas, FloatRectangle(0, 0, __componentBounds[HUE_HANDLER].width, __componentBounds[HUE_HANDLER].height), __pFocusBitmap);
@@ -788,7 +788,7 @@ _ColorPickerPresenter::DrawFocus(_ColorPickerComponentType currentFocusedIndex,
                break;
                case SAT_HANDLER:
                {
-                       Canvas *pCanvas = __pColorPicker->GetSaturationHandler()->GetCanvasN();
+                       CanvaspCanvas = __pColorPicker->GetSaturationHandler()->GetCanvasN();
                        r = GetLastResult();
                        SysTryReturnResult(NID_UI_CTRL, pCanvas != null, r, "[%s] Propagating.", GetErrorMessage(r));
                        r = DrawResourceBitmap(*pCanvas, FloatRectangle(0, 0, __componentBounds[SAT_HANDLER].width, __componentBounds[SAT_HANDLER].height), __pFocusBitmap);
@@ -797,7 +797,7 @@ _ColorPickerPresenter::DrawFocus(_ColorPickerComponentType currentFocusedIndex,
                break;
                case LUM_HANDLER:
                {
-                       Canvas *pCanvas = __pColorPicker->GetLuminanceHandler()->GetCanvasN();
+                       CanvaspCanvas = __pColorPicker->GetLuminanceHandler()->GetCanvasN();
                        r = GetLastResult();
                        SysTryReturnResult(NID_UI_CTRL, pCanvas != null, r, "[%s] Propagating.", GetErrorMessage(r));
                        r = DrawResourceBitmap(*pCanvas, FloatRectangle(0, 0, __componentBounds[LUM_HANDLER].width, __componentBounds[LUM_HANDLER].height), __pFocusBitmap);
@@ -820,7 +820,7 @@ _ColorPickerPresenter::ClearFocus(_ColorPickerComponentType index)
        {
                case HUE_HANDLER:
                {
-                       Canvas *pCanvas = __pColorPicker->GetHueHandler()->GetCanvasN();
+                       CanvaspCanvas = __pColorPicker->GetHueHandler()->GetCanvasN();
                         r = GetLastResult();
                        SysTryReturnResult(NID_UI_CTRL, pCanvas != null, r, "Propagating.");
                        pCanvas->SetBackgroundColor(Color());
@@ -831,7 +831,7 @@ _ColorPickerPresenter::ClearFocus(_ColorPickerComponentType index)
                break;
                case SAT_HANDLER:
                {
-                       Canvas *pCanvas = __pColorPicker->GetSaturationHandler()->GetCanvasN();
+                       CanvaspCanvas = __pColorPicker->GetSaturationHandler()->GetCanvasN();
                         r = GetLastResult();
                        SysTryReturnResult(NID_UI_CTRL, pCanvas != null, r, "Propagating.");
                        pCanvas->SetBackgroundColor(Color());
@@ -842,7 +842,7 @@ _ColorPickerPresenter::ClearFocus(_ColorPickerComponentType index)
                break;
                case LUM_HANDLER:
                {
-                       Canvas *pCanvas = __pColorPicker->GetLuminanceHandler()->GetCanvasN();
+                       CanvaspCanvas = __pColorPicker->GetLuminanceHandler()->GetCanvasN();
                         r = GetLastResult();
                        SysTryReturnResult(NID_UI_CTRL, pCanvas != null, r, "Propagating.");
                        pCanvas->SetBackgroundColor(Color());
index 4219d71..59b2013 100644 (file)
@@ -187,7 +187,7 @@ _ContextMenuListPresenter::CreateItemN(const Base::String& text, int actionId, c
                pLabel->SetBackgroundBitmap(*pNormalBitmap);
                pLabel->SetBackgroundColor(Color(0, 0, 0, 0));
 
-               int bitmapY = (__itemHeight - __itemBitmapHeight ) / 2;
+               int bitmapY = (__itemHeight - __itemBitmapHeight) / 2;
                pLabel->SetBounds(FloatRectangle(__leftMargin, bitmapY,  __itemBitmapWidth, __itemBitmapHeight));
                pLabel->SetTouchPressThreshold(TOUCH_PRESS_THRESHOLD_INSENSITIVE);
                pItem->AttachChild(*pLabel);
index 097816c..9145baf 100644 (file)
@@ -92,7 +92,7 @@ _ContextMenuModel::AddItem(_ContextMenuItem* pItem)
 }
 
 result
-_ContextMenuModel::InsertItem( _ContextMenuItem* pItem, int index)
+_ContextMenuModel::InsertItem(_ContextMenuItem* pItem, int index)
 {
        SysTryReturnResult(NID_UI_CTRL, IsValidItem(pItem), E_SYSTEM, "A system error has occurred. pItem is not valid.");
 
index 888ae8e..9a4e6e7 100644 (file)
@@ -438,7 +438,7 @@ void
 _DateTimeBar::OnActivated(void)
 {
        VisualElement* pVisualElement = null;
-       VisualElementAnimation *pAnimation = null;
+       VisualElementAnimationpAnimation = null;
 
        if (GetOwner() == null)
        {
@@ -682,7 +682,7 @@ _DateTimeBar::RefreshItems(void)
 void
 _DateTimeBar::RemoveAllAnimations(void)
 {
-       VisualElement *pDateTimeBarElement = GetVisualElement();
+       VisualElementpDateTimeBarElement = GetVisualElement();
 
        if (pDateTimeBarElement != null)
        {
@@ -966,7 +966,7 @@ void
 _DateTimeBar::CloseDateTimeBar()
 {
        VisualElement* pVisualElement = null;
-       VisualElementAnimation *pAnimation = null;
+       VisualElementAnimationpAnimation = null;
 
        pVisualElement = GetVisualElement();
        SysTryReturnVoidResult(NID_UI_CTRL, pVisualElement != null, E_SYSTEM, "[E_SYSTEM] A system error has occurred. Failed to get visual element.");
index 040fa0c..32dc772 100644 (file)
@@ -88,7 +88,7 @@ _DateTimeDisplayBox::SetText(const String& text)
        result r = E_SUCCESS;
        TextSimple* pSimpleText = null;
 
-       TextObject * pTextObject = new (std::nothrow) TextObject;
+       TextObject* pTextObject = new (std::nothrow) TextObject;
        SysTryReturn(NID_UI_CTRL, (pTextObject != null), false, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
        __text.Clear();
index adfc9d8..2631674 100644 (file)
@@ -674,7 +674,7 @@ _DateTimePicker::SetYearRange(int minYear, int maxYear)
                                           "Invalid argument(s) is used. The maxYear (%d) must be greater than or equal to minYear (%d).", maxYear, minYear);
 
        r = SetProperty("minYearRange", Variant(minYear));
-       if (r != E_SUCCESS )
+       if (r != E_SUCCESS)
        {
                return r;
        }
index c092f96..4f4f2cc 100644 (file)
@@ -1026,7 +1026,7 @@ _DateTimePresenter::HandleSaveCancelAction(int actionId)
                return;
        }
 
-       if (actionId != DATETIME_EVENT_ID_SAVE && actionId != DATETIME_EVENT_ID_CANCEL )
+       if (actionId != DATETIME_EVENT_ID_SAVE && actionId != DATETIME_EVENT_ID_CANCEL)
        {
                return;
        }
index 5f45467..c0f1d31 100644 (file)
@@ -929,7 +929,7 @@ _EditAreaImpl::SetInputModeCategory(unsigned long categories, bool enable)
                EditInputModeCategory tempInputMode = EDIT_INPUTMODE_ALPHA;
                for (int i = 0; i  < INPUT_MODE_CATEGORY_MAX; i++)
                {
-                       if ( (categories & tempInputMode) && (tempInputMode != EDIT_INPUTMODE_PREDICTIVE))
+                       if ((categories & tempInputMode) && (tempInputMode != EDIT_INPUTMODE_PREDICTIVE))
                        {
                                newInputMode = tempInputMode;
                                break;
index 80ea818..2132bbb 100644 (file)
@@ -1997,19 +1997,19 @@ _EditCopyPasteManager::CreateCopyPastePopup(void)
                }
 
                //Both of handlers are located on the top of the Editor.
-               if ( ((startRect.y + startRect.height) < editShowAreaAbsRect.y) && ((endRect.y + endRect.height) < editShowAreaAbsRect.y))
+               if (((startRect.y + startRect.height) < editShowAreaAbsRect.y) && ((endRect.y + endRect.height) < editShowAreaAbsRect.y))
                {
                        SysLog(NID_UI_CTRL, "Both of handlers are located on the top of the Editor.\n");
                        return;
                }
                //Both of handlers are located on the bottom of the Editor.
-               else if( ((startRect.y + startRect.height) > editShowAreaAbsRect.y + editShowAreaAbsRect.height ) && ((endRect.y + endRect.height) > editShowAreaAbsRect.y + editShowAreaAbsRect.height))
+               else if(((startRect.y + startRect.height) > editShowAreaAbsRect.y + editShowAreaAbsRect.height) && ((endRect.y + endRect.height) > editShowAreaAbsRect.y + editShowAreaAbsRect.height))
                {
                        SysLog(NID_UI_CTRL, "Both of handlers are located on the bottom of the Editor.\n");
                        return;
                }
                // Left handler is located on the top of the Editor and Right handler is located on the bottom of the Editor.
-               else if ( ((startRect.y + startRect.height) < editShowAreaAbsRect.y) && ((endRect.y + endRect.height) > (editShowAreaAbsRect.y + editShowAreaAbsRect.height)))
+               else if (((startRect.y + startRect.height) < editShowAreaAbsRect.y) && ((endRect.y + endRect.height) > (editShowAreaAbsRect.y + editShowAreaAbsRect.height)))
                {
                        copyPastePoint.y = editShowAreaAbsRect.y + editShowAreaAbsRect.height/2;
 
@@ -2020,9 +2020,9 @@ _EditCopyPasteManager::CreateCopyPastePopup(void)
 
                }
                // Left handler is located on the top of the Editor and Right handler is located on the Editor
-               else if ( ((startRect.y + startRect.height) < editShowAreaAbsRect.y) && ((endRect.y + endRect.height) <= (editShowAreaAbsRect.y + editShowAreaAbsRect.height)) )
+               else if (((startRect.y + startRect.height) < editShowAreaAbsRect.y) && ((endRect.y + endRect.height) <= (editShowAreaAbsRect.y + editShowAreaAbsRect.height)))
                {
-                       if ( (endRect.y + endRect.height + handlerHeight + __contextMenuHeight) < keypadBounds.y)
+                       if ((endRect.y + endRect.height + handlerHeight + __contextMenuHeight) < keypadBounds.y)
                        {
                                __contextMenuAlign = CONTEXT_MENU_CORE_ALIGN_DOWN;
                                copyPastePoint.y = endRect.y + endRect.height + handlerHeight;
@@ -2042,7 +2042,7 @@ _EditCopyPasteManager::CreateCopyPastePopup(void)
                        }
                }
                // Left handler is located on the Editor and Right handler is located on the bottom of the Editor
-               else if ( ((startRect.y + startRect.height) >= editShowAreaAbsRect.y) && ((endRect.y + endRect.height) > (editShowAreaAbsRect.y + editShowAreaAbsRect.height)) )
+               else if (((startRect.y + startRect.height) >= editShowAreaAbsRect.y) && ((endRect.y + endRect.height) > (editShowAreaAbsRect.y + editShowAreaAbsRect.height)))
                {
                        if (__contextMenuHeight < startRect.y)
                        {
@@ -2059,7 +2059,7 @@ _EditCopyPasteManager::CreateCopyPastePopup(void)
                        copyPastePoint.y = startRect.y;
                }
                // There is a  space on the bottom of the Editor.
-               else if ( screenSize.height  > (endRect.y + endRect.height + handlerHeight + __contextMenuHeight))
+               else if (screenSize.height  > (endRect.y + endRect.height + handlerHeight + __contextMenuHeight))
                {
                        __contextMenuAlign = CONTEXT_MENU_CORE_ALIGN_DOWN;
 
@@ -2124,7 +2124,7 @@ _EditCopyPasteManager::CreateCopyPastePopup(void)
        __pCopyPastePopup = _ContextMenu::CreateContextMenuN(copyPastePoint, CONTEXT_MENU_CORE_STYLE_GRID, __contextMenuAlign);
        SysTryReturnVoidResult(NID_UI_CTRL, __pCopyPastePopup, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
-       if ( __pEdit->GetTextLength() != 0  && !isPasswordStyle)
+       if (__pEdit->GetTextLength() != 0  && !isPasswordStyle)
        {
                if (__pEdit->IsBlocked())
                {
@@ -2713,7 +2713,7 @@ _EditCopyPasteManager::MoveHandler(HandlerMoveType moveType)
                        {
                                int curCursorLine = pTextObject->GetLineIndexAtTextIndex(pTextObject->GetCursorIndex());
 
-                               if (curCursorLine !=0 )
+                               if (curCursorLine !=0)
                                {
                                        int offset = rightHandlerPosition - pTextObject->GetFirstTextIndexAt(curCursorLine);
                                        int firstTextIndex = pTextObject->GetFirstTextIndexAt(curCursorLine-1);
index 82ad859..3e214ce 100755 (executable)
@@ -1120,7 +1120,7 @@ _EditFieldImpl::SetInputModeCategory(unsigned long categories, bool enable)
                EditInputModeCategory tempInputMode = EDIT_INPUTMODE_ALPHA;
                for (int i = 0; i  < INPUT_MODE_CATEGORY_MAX; i++)
                {
-                       if ( (categories & tempInputMode) && (tempInputMode != EDIT_INPUTMODE_PREDICTIVE))
+                       if ((categories & tempInputMode) && (tempInputMode != EDIT_INPUTMODE_PREDICTIVE))
                        {
                                newInputMode = tempInputMode;
                                break;
index a8e3426..d442f02 100755 (executable)
@@ -895,10 +895,10 @@ _EditPresenter::GetPreviousText(InputConnection& source, String& text, int& curs
                {
                        int previousTextSize = 0;
 
-                       forint index = 0; index < __cursorPos; index++)
+                       for (int index = 0; index < __cursorPos; index++)
                        {
                                previousTextSize++;
-                               if ( __pTextBuffer[__cursorPos-index-1] != 0x20)
+                               if (__pTextBuffer[__cursorPos-index-1] != 0x20)
                                {
                                        break;
                                }
@@ -4248,7 +4248,7 @@ _EditPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
        {
                if (!__isCopyPasteManagerExist)
                {
-                       if ( (keyCode == _KEY_LEFT) || (keyCode == _KEY_UP) || (keyCode == _KEY_DOWN) || (keyCode == _KEY_RIGHT) )
+                       if ((keyCode == _KEY_LEFT) || (keyCode == _KEY_UP) || (keyCode == _KEY_DOWN) || (keyCode == _KEY_RIGHT))
                        {
                                if (__pEdit->GetEditStyle() & EDIT_STYLE_TOKEN)
                                {
@@ -4472,7 +4472,7 @@ _EditPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
                }
 
                int curCursorLine = __pTextObject->GetLineIndexAtTextIndex(__pTextObject->GetCursorIndex());
-               if (curCursorLine !=0 )
+               if (curCursorLine !=0)
                {
                        int offset = __cursorPos - __pTextObject->GetFirstTextIndexAt(curCursorLine);
                        int firstTextIndex = __pTextObject->GetFirstTextIndexAt(curCursorLine-1);
@@ -4871,7 +4871,7 @@ _EditPresenter::OnClipboardPopupClosed(const ClipboardItem* pClipboardItem)
                        return;
                }
                
-               if (__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE || __pEdit->GetEditStyle() & EDIT_STYLE_TOKEN )
+               if (__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE || __pEdit->GetEditStyle() & EDIT_STYLE_TOKEN)
                {
                                int length = filteredString.GetLength();
                                for (int i = length-1; i >= 0; i--)
@@ -5293,7 +5293,7 @@ _EditPresenter::CopyText(void)
                }
                TextImage* pImageText = null;
                pImageText = dynamic_cast < TextImage* >(pTextElement);
-               if ( pImageText == null)
+               if (pImageText == null)
                {
                        continue;
                }
@@ -5416,7 +5416,7 @@ _EditPresenter::PasteText(void)
                        delete pClipboardItem;
                        return E_SUCCESS;
                }
-               if (__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE || __pEdit->GetEditStyle() & EDIT_STYLE_TOKEN )
+               if (__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE || __pEdit->GetEditStyle() & EDIT_STYLE_TOKEN)
                {
                                int length = filteredString.GetLength();
                                for (int i = length-1; i >= 0; i--)
@@ -5628,7 +5628,7 @@ _EditPresenter::GetText(int start, int end) const
                if (objectType == TEXT_ELEMENT_TYPE_TEXT || objectType == TEXT_ELEMENT_TYPE_CUTLINK)
                {
                        pSimpleText = dynamic_cast < TextSimple* >(pTextElement);
-                       if ( pSimpleText == null)
+                       if (pSimpleText == null)
                        {
                                continue;
                        }
@@ -5847,7 +5847,7 @@ _EditPresenter::InsertTextAt(int index, const String& text)
                SysTryReturnResult(NID_UI_CTRL, totalLength <= __limitLength, E_MAX_EXCEEDED, "The Invalid argument is given.");
        }
 
-       if (__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE || __pEdit->GetEditStyle() & EDIT_STYLE_TOKEN )
+       if (__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE || __pEdit->GetEditStyle() & EDIT_STYLE_TOKEN)
        {
                while (insertText.Contains(String(L"\n")))
                {
@@ -6062,7 +6062,7 @@ _EditPresenter::DeleteText(int startCursorPosition, int endCursorPosition)
        const TextSimple* pLastSimpleText = dynamic_cast <const TextSimple*>(pLastTextElement);
        if (pLastSimpleText != null && pLastSimpleText->GetBitmap() != null)
        {
-               if(pLastSimpleText->GetTextOffset() + pLastSimpleText->GetTextLength()) > endCursorPosition)
+               if ((pLastSimpleText->GetTextOffset() + pLastSimpleText->GetTextLength()) > endCursorPosition)
                {
                        endCursorPosition = pLastSimpleText->GetTextOffset() + pLastSimpleText->GetTextLength();
                }
@@ -10094,7 +10094,7 @@ _EditPresenter::OnTitleSlidingTimerExpired(void)
                SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, "A system error has occurred. Failed to draw title text");
        }
 
-       Canvas *pTitleTextCanvas = __pTitleTextVisualElement->GetCanvasN();
+       CanvaspTitleTextCanvas = __pTitleTextVisualElement->GetCanvasN();
        SysTryReturnResult(NID_UI_CTRL, pTitleTextCanvas, E_SYSTEM, "A system error has occurred. Failed to get canvas of VisualElement");
 
        if (__isTouchPressed)
@@ -11511,7 +11511,7 @@ _EditPresenter::IsUnsupportedChracterExist(const KeypadStyle keypadStyle, const
        {
                isSupportedCharacterExist = false;
                wchar_t checkChar =0;
-               if ( text.GetCharAt(i, checkChar) != E_SUCCESS)
+               if (text.GetCharAt(i, checkChar) != E_SUCCESS)
                {
                        break;
                }
index 970c7e0..273bfed 100644 (file)
@@ -1238,7 +1238,7 @@ _EditTimePresenter::OnKeyReleased(const _Control& source, const _KeyCode& keyCod
 
        if (__isAnimating)
        {
-               VisualElement *pEditTimeElement = __pEditTime->GetVisualElement();
+               VisualElementpEditTimeElement = __pEditTime->GetVisualElement();
                result r = GetLastResult();
                SysTryReturn(NID_UI_CTRL, (pEditTimeElement != null), false, r, "[%s] Propagating.", GetErrorMessage(r));
                pEditTimeElement->RemoveAllAnimations();
@@ -1764,8 +1764,8 @@ _EditTimePresenter::Animate(void)
        VisualElement* pEditTimeElement = null;
        VisualElementPropertyAnimation* pNewBoundsAnimation = null;
        VisualElementPropertyAnimation* pOldBoundsAnimation = null;
-       Canvas *pCanvas = null;
-       Canvas *pContentCanvas = null;
+       CanvaspCanvas = null;
+       CanvaspContentCanvas = null;
        Color contentBgColor;
        Color textNormalColor;
        Color textPressedColor;
index 7a4be50..b110b04 100644 (file)
@@ -1973,7 +1973,7 @@ void
 _ExpandableListImpl::ProcessItemStateChange(int mainIndex, int subIndex, ItemStatus itemStatus)
 {
        int itemId = -1;
-       if (subIndex == -1 )
+       if (subIndex == -1)
        {
                itemId = GetItemIdAt(mainIndex);
        }
index e01a096..0e9b837 100644 (file)
@@ -729,7 +729,7 @@ _FastScrollIndexView::AddAccessibilityElement(const _AccessibilityContainer& con
 
        _AccessibilityElement* pAccessibilityElement = null;
        result r = E_SUCCESS;
-       for (int i = 0; i < omittedChildCount; )
+       for (int i = 0; i < omittedChildCount;)
        {
                _FastScrollIndex* pChildIndex = __pBaseIndex->GetChildIndex(i, true);
                SysTryReturnResult(NID_UI_CTRL, pChildIndex, GetLastResult(), "Failed to get the child index.");
@@ -3000,7 +3000,7 @@ _FastScrollPresenter::SetPopupIndex(_FastScrollIndex& popupIndex, const FloatPoi
                SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Failed to set bounds of the popup index ve.");
 
                _FastScrollIndex* pFormerIndex = null;
-               if ( i == __focusedIndexLevel )
+               if (i == __focusedIndexLevel)
                {
                        pFormerIndex = pIndexView->GetFormerIndex();
                        r = __pPopupView->SelectIndex(i, &popupIndex, pFormerIndex);
@@ -3154,7 +3154,7 @@ _FastScrollPresenter::AddIndexView(int indexLevel, _FastScrollIndex& baseIndex)
 {
        result r = E_SUCCESS;
 
-       _FastScrollIndexView* pNewIndexView = _FastScrollIndexView::CreateFastScrollIndexViewN( *__pCtrlVe, *__pViewConfig);
+       _FastScrollIndexView* pNewIndexView = _FastScrollIndexView::CreateFastScrollIndexViewN(*__pCtrlVe, *__pViewConfig);
        SysTryReturnResult(NID_UI_CTRL, pNewIndexView, GetLastResult(), "Propagating.");
 
        r = __fastScroll.SetBounds(CalculateFastScrollBounds(GetIndexViewCount() + 1));
index f46ea28..75ef967 100644 (file)
@@ -3262,7 +3262,7 @@ _Form::OnBoundsChanged(void)
 }
 
 FloatDimension
-_Form::TranslateSize(FloatDimension size ) const
+_Form::TranslateSize(FloatDimension size) const
 {
        FloatDimension returnSize(0.0f, 0.0f);
        returnSize = CoordinateSystem::AlignToDevice(size);
index eb96ec9..34a380e 100644 (file)
@@ -1963,14 +1963,14 @@ protected:
                                return null;
                        }
 
-                       if ( layoutType == UIBUILDER_LAYOUT_GRID)
+                       if (layoutType == UIBUILDER_LAYOUT_GRID)
                        {
                                for (int i = 0; i < UIBUILDER_ATTRIBUTE_NUM; i++)
                                {
                                        GridLayout* pGridLayout = null;
                                        pControlProperty = pControl->GetAttribute(i);
 
-                                       if ( i == UIBUILDER_ATTRIBUTE_PORTRAIT)
+                                       if (i == UIBUILDER_ATTRIBUTE_PORTRAIT)
                                        {
                                                pGridLayout = dynamic_cast<GridLayout*>(pPortraitLayout);
                                        }
index e304b50..2e3f3a2 100644 (file)
@@ -135,7 +135,7 @@ _GalleryImageReader::LoadPartialImageFromFile(int index, const FloatDimension& i
        __pTmpFileBitmap = new (std::nothrow) Bitmap();
        SysTryCatch(NID_UI_CTRL, __pTmpFileBitmap != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
-       // TODO : need Bitmap::ConstructF(ByteBuffer, )
+       // TODO : need Bitmap::ConstructF(ByteBuffer,)
        //FloatDimension bitmapSizeF(bitmapSize.width, bitmapSize.height);
        r = __pTmpFileBitmap->Construct(*pBuffer, bitmapSize, pItem->GetGalleryItemImage()->GetInternalBitmap()->GetPixelColorFormat());
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
index 8a0f48d..fe06e2e 100644 (file)
@@ -1211,7 +1211,7 @@ _GroupContainer::UpdateStretchableCellBounds(FloatRectangle gridRect, FloatRecta
                stretchableHeight = (controlRect.height - gridRect.height) / stretchableRowCount;
                balanceHeightPixels = fmod((controlRect.height - gridRect.height), stretchableRowCount);
 
-               if ( balanceHeightPixels > 0)
+               if (balanceHeightPixels > 0)
                {
                        height = Math::Round((balanceHeightPixels + ROUNDOFF_VALUE) * 10.0);
                }
index af251b0..b849d14 100644 (file)
@@ -1640,7 +1640,7 @@ _GroupedListViewImpl::AdjustLayoutOfEmptyList(void)
                if (__pEmptyText != null)
                {
                        textPos.x = ((_FloatCompare(listDimension.width, emptyText.width)) ? 0.0f : (listDimension.width - emptyText.width) / 2.0f);
-                       textPos.y = ((listDimension.height <= totalHeight ) ? (bitmapPos.y + emptyBitmap.height + horizontalSpacing) : (listDimension.height - totalHeight) / 2.0f);
+                       textPos.y = ((listDimension.height <= totalHeight) ? (bitmapPos.y + emptyBitmap.height + horizontalSpacing) : (listDimension.height - totalHeight) / 2.0f);
                }
        }
 
index 04a52fe..a6ec99e 100644 (file)
@@ -137,7 +137,7 @@ _IconListImpl::SetIconListStyle(IconListStyle style)
                break;
        }
 
-       SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Invalid Icon List style" );
+       SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Invalid Icon List style");
 
        r = GetCore().SetStyle(__annexStyle);
        SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "[%s] Failed to set style", GetErrorMessage(r));
index f2c7cbd..d286356 100644 (file)
@@ -152,7 +152,7 @@ _IconListItem::~_IconListItem(void)
 
        if (__pAccessibilityElement != null)
        {
-               if (__pAccessibilityElement->GetParent() != null )
+               if (__pAccessibilityElement->GetParent() != null)
                {
                        __pAccessibilityElement->GetParent()->RemoveElement(*__pAccessibilityElement);
                }
index 3a8311b..e645a7b 100644 (file)
@@ -2387,7 +2387,7 @@ _IconListPresenter::SetScrollPosition(float position, bool enableFadeEffect)
        }
 
        result r = E_SUCCESS;
-       _Scroll *pScroll =__pIconListView->GetScroll();
+       _ScrollpScroll =__pIconListView->GetScroll();
        if (pScroll != null)
        {
                pScroll->SetScrollingEffectVisibility(true);
@@ -5220,7 +5220,7 @@ _IconListPresenter::DrawFocusUi(int focusUiIndex)
        ResetMagneticScrollTimer();
 
        int lastItemIndex = __pListModel->GetItemCountInGroup(DEFAULT_GROUP_INDEX) - 1;
-       if (focusUiIndex < 0 )
+       if (focusUiIndex < 0)
        {
                __highlightedIndex = 0;
        }
index 4ded06f..c6da460 100644 (file)
@@ -387,9 +387,9 @@ _Indicator::AddIndicatorObject(_Control* pControl, _Window* pWindow)
                r = ChangeCurrentVisualElement(__pLandscapeVisualElement);
        }
 
-       Ecore_Evas *pPortraitEe = ecore_evas_object_ecore_evas_get(__pPortraitIndicatorEvasObject);
+       Ecore_EvaspPortraitEe = ecore_evas_object_ecore_evas_get(__pPortraitIndicatorEvasObject);
        SysTryReturn(NID_UI_CTRL, pPortraitEe, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] Unable to get evas.");
-       Ecore_Evas *pLandscapeEe = ecore_evas_object_ecore_evas_get(__pLandscapeIndicatorEvasObject);
+       Ecore_EvaspLandscapeEe = ecore_evas_object_ecore_evas_get(__pLandscapeIndicatorEvasObject);
        SysTryReturn(NID_UI_CTRL, pLandscapeEe, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] Unable to get evas.");
 
        ecore_evas_data_set(pPortraitEe, pPortPublicKey, __pPortraitIndicatorEvasObject);
@@ -430,8 +430,8 @@ _Indicator::DeleteIndicatorObject(void)
                }
        }
 
-       Ecore_Evas *pPortraitEe = ecore_evas_object_ecore_evas_get(__pPortraitIndicatorEvasObject);
-       Ecore_Evas *pLandscapeEe = ecore_evas_object_ecore_evas_get(__pLandscapeIndicatorEvasObject);
+       Ecore_EvaspPortraitEe = ecore_evas_object_ecore_evas_get(__pPortraitIndicatorEvasObject);
+       Ecore_EvaspLandscapeEe = ecore_evas_object_ecore_evas_get(__pLandscapeIndicatorEvasObject);
 
        if (pPortraitEe)
        {
@@ -596,7 +596,7 @@ _Indicator::OnTimerExpired(Timer& timer)
 }
 
 void
-_Indicator::OnDisconnected(Ecore_Evas *pEe)
+_Indicator::OnDisconnected(Ecore_EvaspEe)
 {
        _Indicator* pIndicator = (_Indicator*)ecore_evas_data_get(pEe, pIndicatorKey);
        SysTryReturnVoidResult(NID_UI_CTRL, pIndicator, E_SYSTEM, "[E_SYSTEM] Unable to get Indicator Object");
@@ -674,7 +674,7 @@ _Indicator::IsNotificationTrayOpenEnabled(void) const
 }
 
 void
-_Indicator::OnMessageHandle(Ecore_Evas *pEe, int msgDomain, int msgId, void *data, int size)
+_Indicator::OnMessageHandle(Ecore_EvaspEe, int msgDomain, int msgId, void *data, int size)
 {
        if (!data)
        {
@@ -691,7 +691,7 @@ _Indicator::OnMessageHandle(Ecore_Evas *pEe, int msgDomain, int msgId, void *dat
        {
                if (msgId == MSG_ID_INDICATOR_REPEAT_EVENT)
                {
-                       int *repeat = (int*)data;
+                       intrepeat = (int*)data;
                        if (1 == *repeat)
                        {
                                if (pPortraitIndicatorEvasObject)
@@ -810,7 +810,7 @@ _Indicator::ShowIndicatorEffect(bool down, int duration)
        SysTryReturnResult(NID_UI_CTRL, pSlideAnimation, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
        pSlideAnimation->SetDuration(duration);
-       pSlideAnimation->SetPropertyName( L"bounds.position");
+       pSlideAnimation->SetPropertyName(L"bounds.position");
        pSlideAnimation->SetVisualElementAnimationStatusEventListener(this);
 
        float indicatorHeight = 0.0f;
@@ -852,7 +852,7 @@ _Indicator::ShowIndicatorEffect(bool down, int duration)
                SysTryReturnResult(NID_UI_CTRL, pUserData, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
        }
        pSlideAnimation->SetUserData((void*)(pUserData));
-       AddAnimation( L"bounds.position", *pSlideAnimation);
+       AddAnimation(L"bounds.position", *pSlideAnimation);
 
        delete pSlideAnimation;
 
@@ -928,7 +928,7 @@ _Indicator::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo)
                }
        }
 
-       if (pTouchManager->IsListenerOnly(pointId) == true )
+       if (pTouchManager->IsListenerOnly(pointId) == true)
        {
                return true;
        }
index ab641b3..c04b57a 100644 (file)
@@ -169,7 +169,7 @@ _Keypad::Initialize(int editStyle, _KeypadStyleInfo keypadStyleInfo, int limitLe
                __pCallerEdit = null;
        }
 
-       if ( __pChildEdit == null)
+       if (__pChildEdit == null)
        {
                __pChildEdit = _Edit::CreateEditN();
                SysTryCatch(NID_UI_CTRL, __pChildEdit, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "Memory allocation failed.");
@@ -481,7 +481,7 @@ _Keypad::ChangeLayoutInternal(LayoutChangeState layoutChangeState)
        }
        else
        {
-               if ( isKeypadExist || isClipboardExist)
+               if (isKeypadExist || isClipboardExist)
                {
                        if (isKeypadExist)
                        {
index a8d69e4..8b7c2d7 100644 (file)
@@ -580,7 +580,7 @@ _ListImpl::InsertItemAt(int index, const String* pText1, const String* pText2,
        SysTryReturnResult(NID_UI_CTRL, (index >= 0 && index <= GetItemCount()),
                        E_OUT_OF_RANGE, "The index(%d) is out of range.", index);
 
-       CustomListItem *pItem = GetNewItemN(pText1, pText2, pBitmap1, pBitmap2, itemId, index);
+       CustomListItempItem = GetNewItemN(pText1, pText2, pBitmap1, pBitmap2, itemId, index);
        SysTryReturnResult(NID_UI_CTRL, pItem, GetLastResult(),
                        "A system error has occurred. CustomListItem instance is null.");
 
@@ -626,7 +626,7 @@ _ListImpl::SetItemAt(int index, const String* pText1, const String* pText2,
                __pNumberElements->RemoveAt(index, true);
        }
 
-       CustomListItem *pItem = GetNewItemN(pText1, pText2, pBitmap1, pBitmap2, itemId, index);
+       CustomListItempItem = GetNewItemN(pText1, pText2, pBitmap1, pBitmap2, itemId, index);
        SysTryReturnResult(NID_UI_CTRL, pItem, GetLastResult(),
                        "A system error has occurred. CustomListItem instance is null.");
 
@@ -884,7 +884,7 @@ _ListImpl::EnableTextSlide(ListItemText textIndex)
                SysTryReturnVoidResult(NID_UI_CTRL, (pItem), E_SYSTEM,
                                        "[E_SYSTEM] A system error has occurred. Failed to get item at %d.", itemCount);
 
-               _CustomListItemImpl *pItemImpl = pItem->__pCustomListItemImpl;
+               _CustomListItemImplpItemImpl = pItem->__pCustomListItemImpl;
                SysTryReturnVoidResult(NID_UI_CTRL, (pItemImpl), E_SYSTEM,
                                                        "[E_SYSTEM] A system error has occurred. Failed to get item at %d.", itemCount);
 
@@ -908,7 +908,7 @@ _ListImpl::DisableTextSlide(void)
                SysTryReturnVoidResult(NID_UI_CTRL, (pItem), E_SYSTEM,
                                        "[E_SYSTEM] A system error has occurred. Failed to get item at %d.", itemCount);
 
-               _CustomListItemImpl *pItemImpl = pItem->__pCustomListItemImpl;
+               _CustomListItemImplpItemImpl = pItem->__pCustomListItemImpl;
                SysTryReturnVoidResult(NID_UI_CTRL, (pItemImpl), E_SYSTEM,
                                                        "[E_SYSTEM] A system error has occurred. Failed to get item at %d.", itemCount);
 
index 1e22988..9962e4c 100644 (file)
@@ -1339,7 +1339,7 @@ _ListViewImpl::AdjustLayoutOfEmptyList(void)
                if (__pEmptyText != null)
                {
                        textPos.x = ((_FloatCompare(listDimension.width, emptyText.width)) ? 0.0f : (listDimension.width - emptyText.width) / 2.0f);
-                       textPos.y = ((listDimension.height <= totalHeight ) ? (bitmapPos.y + emptyBitmap.height + horizontalSpacing) : (listDimension.height - totalHeight) / 2.0f);
+                       textPos.y = ((listDimension.height <= totalHeight) ? (bitmapPos.y + emptyBitmap.height + horizontalSpacing) : (listDimension.height - totalHeight) / 2.0f);
                }
        }
 
index cbdbde2..3c337b4 100644 (file)
@@ -242,7 +242,7 @@ _MessageBox::OnDraw()
 }
 
 void
-_MessageBox::OnFontChanged(Font * pFont)
+_MessageBox::OnFontChanged(Font* pFont)
 {
        __pMsgboxPresenter->OnFontChanged(pFont);
 }
index f3fd3f5..569c9d8 100755 (executable)
@@ -106,7 +106,7 @@ _OptionMenuModel::AddItem(_OptionMenuItem* pItem, int mainIndex)
 }
 
 result
-_OptionMenuModel::InsertItemAt( _OptionMenuItem* pItem, int mainIndex, int subIndex)
+_OptionMenuModel::InsertItemAt(_OptionMenuItem* pItem, int mainIndex, int subIndex)
 {
        result r = E_SUCCESS;
 
index e578c11..b7e2430 100755 (executable)
@@ -214,7 +214,7 @@ _OptionMenuPresenter::CreateItemN(const String& text, int actionId, const Bitmap
        pLabel->SetBackgroundBitmap(*pNormalBitmap);
        pLabel->SetBackgroundColor(Color(0, 0, 0, 0));
 
-       int bitmapY = (__itemHeight - __itemBitmapHeight ) / 2;
+       int bitmapY = (__itemHeight - __itemBitmapHeight) / 2;
        pLabel->SetBounds(FloatRectangle(__leftMargin, bitmapY,  __itemBitmapWidth, __itemBitmapHeight));
        pLabel->SetTouchPressThreshold(TOUCH_PRESS_THRESHOLD_INSENSITIVE);
        pItem->AttachChild(*pLabel);
index 3eb7b69..6b79b75 100644 (file)
@@ -639,7 +639,7 @@ _OverlayAgent::PutXvImage(void)
        SysTryReturnResult(NID_UI_CTRL, pDisplay != null, E_SYSTEM, "The current value of Display is null");
 
        if (__pXvImage == null || __needToRellaocImage)
-               //||(__pXvImage && __pXvImage->data_size != currentSourceBufferSize->GetCapacity()) )
+               //||(__pXvImage && __pXvImage->data_size != currentSourceBufferSize->GetCapacity()))
        {
                if (__xvPort != -1)
                {
@@ -856,7 +856,7 @@ _OverlayAgent::SetRotation(_OverlayAgentRotation rotation)
 
        //Set bounds of rotated renderer
        FloatRectangle rendererBounds = __standardRendererBounds;
-       if (rotatedZAngle == 90.0f || rotatedZAngle == 270.0f )
+       if (rotatedZAngle == 90.0f || rotatedZAngle == 270.0f)
        {
                rendererBounds.x = __standardRendererBounds.x - ((__standardRendererBounds.height - __standardRendererBounds.width) / 2.0f);
                rendererBounds.y = __standardRendererBounds.y + ((__standardRendererBounds.height - __standardRendererBounds.width) / 2.0f);
@@ -1105,7 +1105,7 @@ _OverlayAgent::CreatePixmap(const Rectangle& physicalBounds)
                E_SYSTEM, "input size (%d, %d) is too small to create a pixmap",pixmapSize.width, pixmapSize.height);
 
        // Create pixmap
-       Display *pDisplay = (Display*)ecore_x_display_get();
+       DisplaypDisplay = (Display*)ecore_x_display_get();
        SysTryReturnResult(NID_UI_CTRL, pDisplay != null, E_SYSTEM, "The current value of Display is null");
 
        __pixmap = XCreatePixmap(pDisplay, DefaultRootWindow(pDisplay), pixmapSize.width, pixmapSize.height, DefaultDepth(pDisplay, DefaultScreen(pDisplay)));
@@ -1248,7 +1248,7 @@ _OverlayAgent::GetPixelFormatListN(void)
                __OverlayAgentBufferPixelFormat[0] = set;
        }
 
-       std::unique_ptr< ArrayListT<bool> > pFormatList( new (std::nothrow) ArrayListT<bool>());
+       std::unique_ptr< ArrayListT<bool> > pFormatList(new (std::nothrow) ArrayListT<bool>());
        SysTryReturn(NID_UI_CTRL, pFormatList != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] failed to create a list instance");
 
        result r = pFormatList->Construct();
index df63399..af6aed2 100644 (file)
@@ -376,7 +376,7 @@ _OverlayPanelImpl::GetSupportedBufferPixelFormatListN(void)
                SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
        }
 
-       std::unique_ptr< ArrayListT<OverlayPanel::BufferPixelFormat> > pFormatList( new (std::nothrow) ArrayListT<OverlayPanel::BufferPixelFormat>());
+       std::unique_ptr< ArrayListT<OverlayPanel::BufferPixelFormat> > pFormatList(new (std::nothrow) ArrayListT<OverlayPanel::BufferPixelFormat>());
        SysTryReturn(NID_UI_CTRL, pFormatList != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] failed to create a list instance");
 
        r = pFormatList->Construct();
index 7bb6efe..1caf3e8 100755 (executable)
@@ -524,7 +524,7 @@ _OverlayRegionImpl::GetSupportedBufferPixelFormatListN(void)
                SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
        }
 
-       std::unique_ptr< ArrayListT<OverlayRegionBufferPixelFormat> > pFormatList( new (std::nothrow) ArrayListT<OverlayRegionBufferPixelFormat>());
+       std::unique_ptr< ArrayListT<OverlayRegionBufferPixelFormat> > pFormatList(new (std::nothrow) ArrayListT<OverlayRegionBufferPixelFormat>());
        SysTryReturn(NID_UI_CTRL, pFormatList != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed to create a list instance");
 
        r = pFormatList->Construct();
index 5d526f3..e24e287 100644 (file)
@@ -344,14 +344,14 @@ protected:
                                return null;
                        }
 
-                       if ( layoutType == UIBUILDER_LAYOUT_GRID)
+                       if (layoutType == UIBUILDER_LAYOUT_GRID)
                        {
                                for (int i = 0; i < UIBUILDER_ATTRIBUTE_NUM; i++)
                                {
                                        GridLayout* pGridLayout = null;
                                        pControlProperty = pControl->GetAttribute(i);
 
-                                       if ( i == UIBUILDER_ATTRIBUTE_PORTRAIT)
+                                       if (i == UIBUILDER_ATTRIBUTE_PORTRAIT)
                                        {
                                                pGridLayout = dynamic_cast<GridLayout*>(pPortraitLayout);
                                        }
index 274fa79..8e59bce 100644 (file)
@@ -501,14 +501,14 @@ protected:
                                return null;
                        }
 
-                       if ( layoutType == UIBUILDER_LAYOUT_GRID)
+                       if (layoutType == UIBUILDER_LAYOUT_GRID)
                        {
                                for (int i = 0; i < UIBUILDER_ATTRIBUTE_NUM; i++)
                                {
                                        GridLayout* pGridLayout = null;
                                        pControlProperty = pControl->GetAttribute(i);
 
-                                       if ( i == UIBUILDER_ATTRIBUTE_PORTRAIT)
+                                       if (i == UIBUILDER_ATTRIBUTE_PORTRAIT)
                                        {
                                                pGridLayout = dynamic_cast<GridLayout*>(pPortraitLayout);
                                        }
index a5f1c4d..93da7f8 100644 (file)
@@ -580,7 +580,7 @@ _ProgressPopupPresenter::Draw(void)
                _pTitleTextObject->Draw(*_CanvasImpl::GetInstance(*pCanvas));
        }
 
-       if( __cancelButton )
+       if(__cancelButton)
        {
                const Bitmap* pButtonBitmap = __pProgressPopup->GetButtonBackgroundBitmap();
                const Bitmap* pButtonEffectBitmap = __pProgressPopup->GetButtonBackgroundEffectBitmap();
index ca02761..082314a 100644 (file)
@@ -78,7 +78,7 @@ _ProgressPresenter::CreateInstanceN(const _Progress& progress)
                 "Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
        r = pProgressPresenter->LoadResource();
-       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] A system error has occurred. The loading of resource failed", GetErrorMessage(E_SYSTEM) );
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] A system error has occurred. The loading of resource failed", GetErrorMessage(E_SYSTEM));
 
        return pProgressPresenter;
 
index d354731..60490f2 100644 (file)
@@ -2303,7 +2303,7 @@ _ScrollPresenter::OnTouchMovedHandler(const _Control& source, const _TouchInfo&
                }
 
                float touchDistance = touchPosition - __handlerTouchedPosition;
-               float scrollDistance = ( __scrollRange * touchDistance) / scrollBoundsRange;
+               float scrollDistance = (__scrollRange * touchDistance) / scrollBoundsRange;
 
                scrollPosition += scrollDistance;
 
index c79c27e..d1b00d1 100644 (file)
@@ -1482,7 +1482,7 @@ _SearchBarImpl::OnFocusGained(const Tizen::Ui::Control& source)
 
                        IFocusEventListener* pFocusEventListener = dynamic_cast <IFocusEventListener*>(pListener);
 
-                       if (pFocusEventListener != null )
+                       if (pFocusEventListener != null)
                        {
                                pFocusEventListener->OnFocusGained(GetPublic());
                        }
@@ -1512,7 +1512,7 @@ _SearchBarImpl::OnFocusLost(const Tizen::Ui::Control& source)
 
                        IFocusEventListener* pFocusEventListener = dynamic_cast <IFocusEventListener*>(pListener);
 
-                       if (pFocusEventListener != null )
+                       if (pFocusEventListener != null)
                        {
                                pFocusEventListener->OnFocusLost(GetPublic());
                        }
@@ -1537,7 +1537,7 @@ _SearchBarImpl::OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCod
 
                        IKeyEventListener* pKeyEventListener = dynamic_cast <IKeyEventListener*>(pListener);
 
-                       if (pKeyEventListener != null )
+                       if (pKeyEventListener != null)
                        {
                                pKeyEventListener->OnKeyPressed(GetPublic(), keyCode);
                        }
@@ -1562,7 +1562,7 @@ _SearchBarImpl::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCo
 
                        IKeyEventListener* pKeyEventListener = dynamic_cast <IKeyEventListener*>(pListener);
 
-                       if (pKeyEventListener != null )
+                       if (pKeyEventListener != null)
                        {
                                pKeyEventListener->OnKeyReleased(GetPublic(), keyCode);
                        }
@@ -1587,7 +1587,7 @@ _SearchBarImpl::OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::Ke
 
                        IKeyEventListener* pKeyEventListener = dynamic_cast <IKeyEventListener*>(pListener);
 
-                       if (pKeyEventListener != null )
+                       if (pKeyEventListener != null)
                        {
                                pKeyEventListener->OnKeyLongPressed(GetPublic(), keyCode);
                        }
index 6d77a92..779d7d9 100644 (file)
@@ -1713,7 +1713,7 @@ _SlidableGroupedListImpl::SetAllItemsChecked(int groupIndex, bool check)
 
                pGroupObject->__pCheckedList->SetAt(*pChecked, indexItem, true);
 
-               _CheckElementModel *pCheckElement = GetCheckElementAt(groupIndex, indexItem);
+               _CheckElementModelpCheckElement = GetCheckElementAt(groupIndex, indexItem);
 
                if (pCheckElement)
                {
index 4795aa1..2845057 100644 (file)
@@ -710,7 +710,7 @@ _SlidableListImpl::InsertItemAt(int index, const CustomListItem& item, int itemI
 
        if (__pCheckedList)
        {
-               Boolean *pChecked = new (std::nothrow) Boolean(false);
+               BooleanpChecked = new (std::nothrow) Boolean(false);
                SysTryReturn(NID_UI_CTRL, pChecked, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
                __pCheckedList->InsertAt(*pChecked, index);
index 66404c6..f7d9185 100644 (file)
@@ -352,7 +352,7 @@ _Slider::OnFocusModeStateChanged()
 {
        __pSliderPresenter->SetFocusMode(false);
 
-       if ((GetStyle() & _SLIDER_STYLE_OVERLAY) && __isKeyPressed )
+       if ((GetStyle() & _SLIDER_STYLE_OVERLAY) && __isKeyPressed)
        {
                _SliderOverlay* pSliderOverlay = __pSliderPresenter->GetSliderOverlay();
                pSliderOverlay->SetVisibleState(false);
@@ -1071,7 +1071,7 @@ _Slider::FireSliderMoveEvent(int value)
        {
                IEventArg* pEventArg = _SliderEvent::CreateSliderEventArgN(value);
 
-               if( pEventArg == null)
+               if(pEventArg == null)
                {
                        return;
                }
@@ -1086,7 +1086,7 @@ _Slider::FireAdjustmentValueEvent(int adjustment)
        if (__pAdjustmentEvent != null)
        {
                IEventArg* pEventArg = _AdjustmentEvent::CreateAdjustmentEventArgN(adjustment);
-               if( pEventArg == null)
+               if(pEventArg == null)
                {
                        return;
                }
index c537b00..bb55ddd 100644 (file)
@@ -327,12 +327,12 @@ _SliderPresenter::Resize(void)
                titleTextBounds = GetTitleTextBounds();
                sliderY = titleTextBounds.y + titleTextBounds.height;
                __touchRect = FloatRectangle(barLeftMargin + __barOffset - __handleOffset, sliderY + (__rect.height - (sliderY + __handleRect.height)) / 2.0f,
-                                                               __rect.width - (barLeftMargin + barRightMargin) + (2.0f * __handleOffset) - ( 2.0 * __barOffset), __handleRect.height);
+                                                               __rect.width - (barLeftMargin + barRightMargin) + (2.0f * __handleOffset) - (2.0 * __barOffset), __handleRect.height);
        }
        else
        {
                __touchRect = FloatRectangle(barLeftMargin + __barOffset - __handleOffset, (__rect.height - __handleRect.height) / 2.0f,
-                                                               (__rect.width - (barLeftMargin + barRightMargin ) - ( 2.0 * __barOffset)) + (2.0f * __handleOffset), __handleRect.height);
+                                                               (__rect.width - (barLeftMargin + barRightMargin ) - (2.0 * __barOffset)) + (2.0f * __handleOffset), __handleRect.height);
        }
 
        if (__pSlider->GetIcon(ICON_POSITION_LEFT) != null)
@@ -627,12 +627,12 @@ _SliderPresenter::CalculateSliderValue(float positionX, float offsetX)
        __handleRect.x = __touchRect.x + __handleX;
        __handleRect.y = __touchRect.y;
 
-       if (__handleRect.x < __touchRect.x )
+       if (__handleRect.x < __touchRect.x)
        {
                __handleRect.x = __touchRect.x;
        }
 
-       if (__handleRect.x + __handleRect.width > __touchRect.x + __touchRect.width )
+       if (__handleRect.x + __handleRect.width > __touchRect.x + __touchRect.width)
        {
                __handleRect.x = __touchRect.x + __touchRect.width - __handleRect.width;
        }
@@ -891,7 +891,7 @@ _SliderPresenter::DrawBackground(Canvas& canvas)
                }
 
                DrawBitmap(canvas, __rect, pBgBitmap);
-               if ( __groupStyle != GROUP_STYLE_NONE)
+               if (__groupStyle != GROUP_STYLE_NONE)
                {
                        if (!isCustomBitmap)
                        {
@@ -983,12 +983,12 @@ _SliderPresenter::DrawSliderBar(Canvas& canvas)
        __handleRect.x = __touchRect.x + __handleX;
        __handleRect.y = __touchRect.y;
 
-       if (__handleRect.x < __touchRect.x )
+       if (__handleRect.x < __touchRect.x)
        {
                __handleRect.x = __touchRect.x;
        }
 
-       if (__handleRect.x + __handleRect.width > __touchRect.x + __touchRect.width )
+       if (__handleRect.x + __handleRect.width > __touchRect.x + __touchRect.width)
        {
                __handleRect.x = __touchRect.x + __touchRect.width - __handleRect.width;
        }
@@ -1074,13 +1074,13 @@ _SliderPresenter::DrawSliderBar(Canvas& canvas)
                if (!_BitmapImpl::CheckNinePatchedBitmapStrictly(*pHandleBitmap))
                {
                        // to clip the center portion of the larger bitmap.
-                       if( bitmapWidth > __handleRect.width )
+                       if(bitmapWidth > __handleRect.width)
                        {
                                bitmapPositionX = (bitmapWidth / 2.0f) - (__handleRect.width / 2.0f);
                                bitmapWidth = __handleRect.width;
                        }
 
-                       if( bitmapHeight > __handleRect.height )
+                       if(bitmapHeight > __handleRect.height)
                        {
                                bitmapPositionY = (bitmapHeight / 2.0f) - (__handleRect.height / 2.0f);
                                bitmapHeight = __handleRect.height;
index c7b4fbe..6f37c3d 100644 (file)
@@ -530,9 +530,9 @@ result
 _SplitPanelPresenter::LoadBitmap(SplitPanelDividerDirection splitPanelDividerDirection)
 {
        result r = E_SUCCESS;
-       Bitmap *pDividerBackgroundBitmap = null;
+       BitmappDividerBackgroundBitmap = null;
 
-       // Modified - Changeable Color / Resource ( Fixed Style )
+       // Modified - Changeable Color / Resource (Fixed Style)
        r = GET_BITMAP_CONFIG_N(SPLITPANEL::DIVIDER_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDividerBackgroundBitmap);
        SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Failed to load bitmap.");
 
index 9e24709..5997edf 100644 (file)
@@ -224,7 +224,7 @@ _Tab::AddItem(const Bitmap& icon, const String& text, int actionId)
 
        SysTryReturnResult(NID_UI_CTRL, itemCount < _TAB_ITEM_MAXCOUNT, E_SYSTEM, "A system error has occurred. The tab has maximum number of items.");
 
-       _TabItem *pItem = new (std::nothrow) _TabItem;
+       _TabItempItem = new (std::nothrow) _TabItem;
        SysTryReturnResult(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
        pItem->SetIcon(icon);
@@ -275,7 +275,7 @@ _Tab::AddItem(const Bitmap& icon, int actionId)
 
        SysTryReturnResult(NID_UI_CTRL, itemCount < _TAB_ITEM_MAXCOUNT, E_SYSTEM, "A system error has occurred. The tab has maximum number of items.");
 
-       _TabItem *pItem = new (std::nothrow) _TabItem;
+       _TabItempItem = new (std::nothrow) _TabItem;
        SysTryReturnResult(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
        pItem->SetIcon(icon);
@@ -325,7 +325,7 @@ _Tab::AddItem(const String& text, int actionId)
 
        SysTryReturnResult(NID_UI_CTRL, itemCount < _TAB_ITEM_MAXCOUNT, E_SYSTEM, "A system error has occurred. The tab has maximum number of items.");
 
-       _TabItem *pItem = new (std::nothrow) _TabItem;
+       _TabItempItem = new (std::nothrow) _TabItem;
        SysTryReturnResult(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
        pItem->SetText(text);
@@ -380,7 +380,7 @@ _Tab::InsertItemAt(int index, const Bitmap& icon, const String& text, int action
 
        SysTryReturnResult(NID_UI_CTRL, itemCount < _TAB_ITEM_MAXCOUNT, E_SYSTEM, "A system error has occurred. The tab has maximum number of items.");
 
-       _TabItem *pItem = new (std::nothrow) _TabItem;
+       _TabItempItem = new (std::nothrow) _TabItem;
        SysTryReturnResult(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
        pItem->SetIcon(icon);
@@ -392,7 +392,7 @@ _Tab::InsertItemAt(int index, const Bitmap& icon, const String& text, int action
 
        if (selectedIndex >= index)
        {
-               _TabItem *pSelectedItem = null;
+               _TabItempSelectedItem = null;
                pSelectedItem = GetItemAt(selectedIndex);
                if (pSelectedItem != null)
                {
@@ -449,7 +449,7 @@ _Tab::InsertItemAt(int index, const Bitmap& icon, int actionId)
 
        SysTryReturnResult(NID_UI_CTRL, itemCount < _TAB_ITEM_MAXCOUNT, E_SYSTEM, "A system error has occurred. The tab has maximum number of items.");
 
-       _TabItem *pItem = new (std::nothrow) _TabItem;
+       _TabItempItem = new (std::nothrow) _TabItem;
        SysTryReturnResult(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
        pItem->SetIcon(icon);
@@ -459,7 +459,7 @@ _Tab::InsertItemAt(int index, const Bitmap& icon, int actionId)
 
        if (selectedIndex >= index)
        {
-               _TabItem *pSelectedItem = null;
+               _TabItempSelectedItem = null;
                pSelectedItem = GetItemAt(selectedIndex);
                if (pSelectedItem != null)
                {
@@ -516,7 +516,7 @@ _Tab::InsertItemAt(int index, const String& text, int actionId)
 
        SysTryReturnResult(NID_UI_CTRL, itemCount < _TAB_ITEM_MAXCOUNT, E_SYSTEM, "A system error has occurred. The tab has maximum number of items.");
 
-       _TabItem *pItem = new (std::nothrow) _TabItem;
+       _TabItempItem = new (std::nothrow) _TabItem;
        SysTryReturnResult(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
        pItem->SetText(text);
@@ -526,7 +526,7 @@ _Tab::InsertItemAt(int index, const String& text, int actionId)
 
        if (selectedIndex >= index)
        {
-               _TabItem *pSelectedItem = null;
+               _TabItempSelectedItem = null;
                pSelectedItem = GetItemAt(selectedIndex);
                if (pSelectedItem != null)
                {
@@ -589,7 +589,7 @@ _Tab::SetItemAt(int index, const Bitmap& icon, const String& text, int actionId)
                return E_SYSTEM;
        }
 
-       _TabItem *pItem = static_cast<_TabItem*>(__tabItems.GetAt(index));
+       _TabItempItem = static_cast<_TabItem*>(__tabItems.GetAt(index));
        result r = GetLastResult();
        SysTryReturnResult(NID_UI_CTRL, pItem != null, r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -631,7 +631,7 @@ _Tab::SetItemAt(int index, const Bitmap& icon, int actionId)
                return E_SYSTEM;
        }
 
-       _TabItem *pItem = static_cast<_TabItem*>(__tabItems.GetAt(index));
+       _TabItempItem = static_cast<_TabItem*>(__tabItems.GetAt(index));
        result r = GetLastResult();
        SysTryReturnResult(NID_UI_CTRL, pItem != null, r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -670,7 +670,7 @@ _Tab::SetItemAt(int index, const String& text, int actionId)
                return E_SYSTEM;
        }
 
-       _TabItem *pItem = static_cast<_TabItem*>(__tabItems.GetAt(index));
+       _TabItempItem = static_cast<_TabItem*>(__tabItems.GetAt(index));
        result r = GetLastResult();
        SysTryReturnResult(NID_UI_CTRL, pItem != null, r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -691,7 +691,7 @@ _Tab::RemoveItemAt(int index)
 
        if (selectedIndex >= index)
        {
-               _TabItem *pSelectedItem = null;
+               _TabItempSelectedItem = null;
                pSelectedItem = GetItemAt(selectedIndex);
                if (pSelectedItem != null)
                {
@@ -838,7 +838,7 @@ _Tab::SetBadgeIcon(int actionId, const Bitmap* pBadgeIcon)
 
        int itemIndex = GetItemIndexFromActionId(actionId);
 
-       _TabItem *pItem = null;
+       _TabItempItem = null;
 
        if (itemIndex < 0)
        {
@@ -878,7 +878,7 @@ _Tab::GetItemIndexFromActionId(int actionId) const
 
        for (index = 0; index < itemCount; index++)
        {
-               const _TabItem *pItem = dynamic_cast<const _TabItem*>(__tabItems.GetAt(index));
+               const _TabItempItem = dynamic_cast<const _TabItem*>(__tabItems.GetAt(index));
 
                if (pItem != null)
                {
@@ -895,12 +895,12 @@ _Tab::GetItemIndexFromActionId(int actionId) const
 int
 _Tab::GetItemActionIdAt(int index) const
 {
-       if (__tabItems.GetAt(index) == null )
+       if (__tabItems.GetAt(index) == null)
        {
                return -1;
        }
 
-       const _TabItem *pItem = dynamic_cast<const _TabItem*>(__tabItems.GetAt(index));
+       const _TabItempItem = dynamic_cast<const _TabItem*>(__tabItems.GetAt(index));
        SysTryReturn(NID_UI_CTRL, pItem != null, E_SYSTEM, E_SYSTEM,"[E_SYSTEM] A system error has occurred. Failed to get an item at index (%d).", index);
 
        return pItem->GetActionId();
@@ -909,12 +909,12 @@ _Tab::GetItemActionIdAt(int index) const
 _TabItem*
 _Tab::GetItemAt(int index)
 {
-       if (__tabItems.GetAt(index) == null )
+       if (__tabItems.GetAt(index) == null)
        {
                return null;
        }
 
-       _TabItem *pItem = static_cast<_TabItem*>(__tabItems.GetAt(index));
+       _TabItempItem = static_cast<_TabItem*>(__tabItems.GetAt(index));
        result r = GetLastResult();
        SysTryReturn(NID_UI_CTRL, pItem != null, null, r, "[%s] Propagating.", GetErrorMessage(r));
 
index e880f64..9b82cfc 100644 (file)
@@ -558,7 +558,7 @@ _TabBar::OnTouchMoved(const _Control& source, const _TouchInfo& touchinfo)
 }
 
 void
-_TabBar::OnFontChanged(Font * pFont)
+_TabBar::OnFontChanged(Font* pFont)
 {
        __pTabBarPresenter->OnFontChanged(pFont);
 }
index fff5a9f..61bb8f8 100644 (file)
@@ -380,7 +380,7 @@ _TabPresenter::GetItemAt(int index)
 result
 _TabPresenter::SetItemStatus(int index, _TabItemStatus status)
 {
-       _TabItem *pItem = GetItemAt(index);
+       _TabItempItem = GetItemAt(index);
        SysTryReturn(NID_UI_CTRL, pItem, GetLastResult(), GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
        pItem->SetUpdateState(true);
@@ -393,7 +393,7 @@ _TabItemStatus
 _TabPresenter::GetItemStatus(int index) const
 {
 
-       _TabItem *pItem = __pTab->GetItemAt(index);
+       _TabItempItem = __pTab->GetItemAt(index);
 
        if (pItem == null)
        {
@@ -457,7 +457,7 @@ _TabPresenter::Draw(void)
                __isRecalculateNeeded = false;
                CalculateItemBounds();
        }
-       else if (__isFlickEnabled )
+       else if (__isFlickEnabled)
        {
                DrawHorizontal();
        }
@@ -1558,7 +1558,7 @@ _TabPresenter::DrawEditIconTextItem(Canvas* pCanvas)
 void
 _TabPresenter::SetEditItemBounds(const FloatPoint& point)
 {
-       _TabItem *pTabItem = null;
+       _TabItempTabItem = null;
        FloatRectangle editRect(0.0f, 0.0f, 0.0f, 0.0f);
        pTabItem = GetItemAt(__editItemIndex);
        SysTryReturnVoidResult(NID_UI_CTRL, pTabItem, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
@@ -1963,9 +1963,9 @@ _TabPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& touchinfo)
                return true;
        }
 
-       _TabItem *pTabItem = null;
-       _TabItem *pNextItem = null;
-       _TabItem *pPrevItem = null;
+       _TabItempTabItem = null;
+       _TabItempNextItem = null;
+       _TabItempPrevItem = null;
        FloatPoint movedPosition = touchinfo.GetCurrentPosition();
 
        int index = GetNextItemIndexFromPosition(movedPosition, __editItemIndex);
@@ -2071,7 +2071,7 @@ _TabPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& touchinfo)
                {
                        if (__isDirectionRight)
                        {
-                               _TabItem *pLastItem = GetItemAt(__lastItemIndex);
+                               _TabItempLastItem = GetItemAt(__lastItemIndex);
                                SysTryReturn(NID_UI_CTRL, pLastItem, false, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
                                if ((pLastItem->GetItemBounds().x + pLastItem->GetItemBounds().width) > __width)
@@ -2151,7 +2151,7 @@ _TabPresenter::ShiftItems(void)
 
                bounds = pTabItem->GetItemBounds();
                bounds.x = bounds.x + fitDistance;
-               if ( i == __firstItemIndex && ( bounds.x ) >= (2.0f * __itemWidth))
+               if (i == __firstItemIndex && ( bounds.x ) >= (2.0f * __itemWidth))
                {
                        return;
                }
@@ -2647,7 +2647,7 @@ _TabPresenter::StartReorderAnimation(int index, int timerIndex)
 void
 _TabPresenter::SwapItems(int indexDest, float distance)
 {
-       _TabItem *pItem;
+       _TabItempItem;
        FloatRectangle itemBounds(0.0f, 0.0f, 0.0f, 0.0f);
        pItem = GetItemAt(indexDest);
        SysTryReturnVoidResult(NID_UI_CTRL, pItem, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
index e3d3f07..7e0eeb0 100644 (file)
@@ -629,7 +629,7 @@ _TableView::SetFastScrollIndex(const String& text, bool useSearchIcon)
                                (__scrollStyle == TABLE_VIEW_SCROLL_BAR_STYLE_FAST_SCROLL || __scrollStyle == TABLE_VIEW_SCROLL_BAR_STYLE_FAST_SCROLL_FIXED),
                 E_INVALID_OPERATION, E_INVALID_OPERATION, "[%s]The style of TableView scroll is not TABLE_VIEW_SCROLL_BAR_STYLE_FAST_SCROLL", GetErrorMessage(E_INVALID_OPERATION));
        SysTryReturn(NID_UI_CTRL, __pFastScroll != null, E_OBJ_NOT_FOUND, E_OBJ_NOT_FOUND, "[%s] This instance is not available.", GetErrorMessage(E_OBJ_NOT_FOUND));
-       SysTryReturn(NID_UI_CTRL, (useSearchIcon || (!useSearchIcon && text.GetLength() > 0)), E_INVALID_ARG, E_INVALID_ARG,"[%s] Invalid input argument.",GetErrorMessage(E_INVALID_ARG) );
+       SysTryReturn(NID_UI_CTRL, (useSearchIcon || (!useSearchIcon && text.GetLength() > 0)), E_INVALID_ARG, E_INVALID_ARG,"[%s] Invalid input argument.",GetErrorMessage(E_INVALID_ARG));
 
        result r = E_SUCCESS;
 
index 26c84b7..32f400a 100644 (file)
@@ -2358,7 +2358,7 @@ _TableViewItem::DrawSectionStyleBackground(void)
                        r = E_SYSTEM;
                }
        }
-       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred.  SectionStyle image load failed", GetErrorMessage(E_SYSTEM) );
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred.  SectionStyle image load failed", GetErrorMessage(E_SYSTEM));
 
        if (__enabledState)
        {
@@ -2369,7 +2369,7 @@ _TableViewItem::DrawSectionStyleBackground(void)
                                if (IS_CUSTOM_BITMAP(TABLEVIEW::SECTIONITEM_SINGLE_BG_PRESSED))
                                {
                                        r = GET_REPLACED_BITMAP_CONFIG_N(TABLEVIEW::SECTIONITEM_SINGLE_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, bgColor, pReplacementSectionPressBg);
-                                       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM) );
+                                       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM));
                                }
                        }
                        else if (__itemType == TABLE_VIEW_ITEM_TYPE_TOP)
@@ -2377,7 +2377,7 @@ _TableViewItem::DrawSectionStyleBackground(void)
                                if (IS_CUSTOM_BITMAP(TABLEVIEW::SECTIONITEM_TOP_BG_PRESSED))
                                {
                                        r = GET_REPLACED_BITMAP_CONFIG_N(TABLEVIEW::SECTIONITEM_TOP_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, bgColor, pReplacementSectionPressBg);
-                                       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM) );
+                                       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM));
                                }
                        }
                        else if (__itemType == TABLE_VIEW_ITEM_TYPE_MIDDLE)
@@ -2385,7 +2385,7 @@ _TableViewItem::DrawSectionStyleBackground(void)
                                if (IS_CUSTOM_BITMAP(TABLEVIEW::SECTIONITEM_CENTER_BG_PRESSED))
                                {
                                        r = GET_REPLACED_BITMAP_CONFIG_N(TABLEVIEW::SECTIONITEM_CENTER_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, bgColor, pReplacementSectionPressBg);
-                                       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM) );
+                                       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM));
                                }
                        }
                        else if (__itemType == TABLE_VIEW_ITEM_TYPE_BOTTOM)
@@ -2393,7 +2393,7 @@ _TableViewItem::DrawSectionStyleBackground(void)
                                if (IS_CUSTOM_BITMAP(TABLEVIEW::SECTIONITEM_BOTTOM_BG_PRESSED))
                                {
                                        r = GET_REPLACED_BITMAP_CONFIG_N(TABLEVIEW::SECTIONITEM_BOTTOM_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, bgColor, pReplacementSectionPressBg);
-                                       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM) );
+                                       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM));
                                }
                        }
 
@@ -2422,7 +2422,7 @@ _TableViewItem::DrawSectionStyleBackground(void)
                        if (IS_CUSTOM_BITMAP(TABLEVIEW::SECTIONITEM_SINGLE_BG_DISABLED))
                        {
                                r = GET_REPLACED_BITMAP_CONFIG_N(TABLEVIEW::SECTIONITEM_SINGLE_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, bgColor, pReplacementSectionDisabledBg);
-                               SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM) );
+                               SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM));
                        }
                }
                else if (__itemType == TABLE_VIEW_ITEM_TYPE_TOP)
@@ -2430,7 +2430,7 @@ _TableViewItem::DrawSectionStyleBackground(void)
                        if (IS_CUSTOM_BITMAP(TABLEVIEW::SECTIONITEM_TOP_BG_DISABLED))
                        {
                                r = GET_REPLACED_BITMAP_CONFIG_N(TABLEVIEW::SECTIONITEM_TOP_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, bgColor, pReplacementSectionDisabledBg);
-                               SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM) );
+                               SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM));
                        }
                }
                else if (__itemType == TABLE_VIEW_ITEM_TYPE_MIDDLE)
@@ -2438,7 +2438,7 @@ _TableViewItem::DrawSectionStyleBackground(void)
                        if (IS_CUSTOM_BITMAP(TABLEVIEW::SECTIONITEM_CENTER_BG_DISABLED))
                        {
                                r = GET_REPLACED_BITMAP_CONFIG_N(TABLEVIEW::SECTIONITEM_CENTER_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, bgColor, pReplacementSectionDisabledBg);
-                               SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM) );
+                               SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM));
                        }
                }
                else if (__itemType == TABLE_VIEW_ITEM_TYPE_BOTTOM)
@@ -2446,7 +2446,7 @@ _TableViewItem::DrawSectionStyleBackground(void)
                        if (IS_CUSTOM_BITMAP(TABLEVIEW::SECTIONITEM_BOTTOM_BG_DISABLED))
                        {
                                r = GET_REPLACED_BITMAP_CONFIG_N(TABLEVIEW::SECTIONITEM_BOTTOM_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, bgColor, pReplacementSectionDisabledBg);
-                               SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM) );
+                               SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM));
                        }
                }
 
@@ -2502,7 +2502,7 @@ _TableViewItem::DrawSectionStyleBackgroundCover(void)
        if (__enabledState)
        {
                _TableView* pParent = dynamic_cast<_TableView*>(GetParent());
-               SysTryCatch(NID_UI_CTRL, pParent != null, , E_SYSTEM, "[%s] A system error has been occurred. SectionTableView  load failed", GetErrorMessage(E_SYSTEM) );
+               SysTryCatch(NID_UI_CTRL, pParent != null, , E_SYSTEM, "[%s] A system error has been occurred. SectionTableView  load failed", GetErrorMessage(E_SYSTEM));
 
                bgColor = pParent->GetBackgroundColor();
        }
@@ -2531,7 +2531,7 @@ _TableViewItem::DrawSectionStyleBackgroundCover(void)
        {
                r = E_SYSTEM;
        }
-       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM) );
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM));
 
        if (__itemType == TABLE_VIEW_ITEM_TYPE_ONE)
        {
@@ -2553,7 +2553,7 @@ _TableViewItem::DrawSectionStyleBackgroundCover(void)
        {
                r = E_SYSTEM;
        }
-       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM) );
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[%s] A system error has been occurred. SectionStyle image load failed", GetErrorMessage(E_SYSTEM));
 
        __pItemCover->SetBounds(FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height));
 
@@ -2977,7 +2977,7 @@ _TableViewItem::AdjustAnnexOnOffHandlerPosition()
                if (annexStartPositionX <= __annexOnOffHandlerPositionX
                        && annexEndPositionX >= __annexOnOffHandlerPositionX)
                {
-                       if (((annexEndPositionX - annexStartPositionX) / 2) < (__annexOnOffHandlerPositionX + (handlerBounds.width / 2)) - annexStartPositionX )
+                       if (((annexEndPositionX - annexStartPositionX) / 2) < (__annexOnOffHandlerPositionX + (handlerBounds.width / 2)) - annexStartPositionX)
                        {
                                handlerPositionX = annexEndPositionX;
                                SetChecked(true);
index f3fcaa8..4a7e31a 100644 (file)
@@ -1308,7 +1308,7 @@ _TableViewPresenter::SetItemChecked(int groupIndex, int itemIndex, bool checked)
        }
 
        TableViewItemTag itemTag = {groupIndex, itemIndex};
-       _TableViewItem *pItem = FindItem(itemTag);
+       _TableViewItempItem = FindItem(itemTag);
 
        TableViewItemTag topDrawnItemTag = {-1, -1};
        GetTopDrawnItem(topDrawnItemTag);
@@ -1712,7 +1712,7 @@ _TableViewPresenter::UnloadItem(TableViewItemTag& itemTag)
 void
 _TableViewPresenter::DetachItem(TableViewItemTag& itemTag)
 {
-       _TableViewItem *pItem = FindItem(itemTag);
+       _TableViewItempItem = FindItem(itemTag);
 
        if (pItem != null && pItem->HasParent())
        {
@@ -1723,7 +1723,7 @@ _TableViewPresenter::DetachItem(TableViewItemTag& itemTag)
 void
 _TableViewPresenter::DetachContextItem(TableViewItemTag& itemTag)
 {
-       _TableViewItem *pItem = FindItem(itemTag);
+       _TableViewItempItem = FindItem(itemTag);
        if (pItem == null)
        {
                return;
@@ -1969,7 +1969,7 @@ _TableViewPresenter::OnPreviewTouchPressed(const _Control& source, const _TouchI
 
        if (__focusItemTag.groupIndex != -1)
        {
-               _TableViewItem *pItem = FindItem(__focusItemTag);
+               _TableViewItempItem = FindItem(__focusItemTag);
                if (pItem)
                {
                        pItem->ResetItemState();
@@ -2390,7 +2390,7 @@ _TableViewPresenter::IsEmpty(void) const
        }
        else
        {
-               if (GetGroupCount() <= 0 )
+               if (GetGroupCount() <= 0)
                {
                        return true;
                }
@@ -2772,7 +2772,7 @@ _TableViewPresenter::ExpandGroup(int groupIndex, bool withAnimation)
 
        if (withAnimation)
        {
-               _TableViewItem *pItem = FindItem(itemTag);
+               _TableViewItempItem = FindItem(itemTag);
                if (pItem == null)
                {
                        return E_SUCCESS;
@@ -2897,7 +2897,7 @@ _TableViewPresenter::CollapseGroup(int groupIndex, bool withAnimation)
 
        if (withAnimation)
        {
-               _TableViewItem *pItem = FindItem(itemTag);
+               _TableViewItempItem = FindItem(itemTag);
                if (pItem == null)
                {
                        return E_SUCCESS;
@@ -2996,7 +2996,7 @@ _TableViewPresenter::LoadAllItemsInGroup(int groupIndex, bool downward)
 
                        if (pItem == null)
                        {
-                               SysLogException(NID_UI_CTRL, E_SYSTEM, "[%s] A system error has been occurred. Unable to load item.", GetErrorMessage(E_SYSTEM) );
+                               SysLogException(NID_UI_CTRL, E_SYSTEM, "[%s] A system error has been occurred. Unable to load item.", GetErrorMessage(E_SYSTEM));
                        }
                }
        }
@@ -3008,7 +3008,7 @@ _TableViewPresenter::LoadAllItemsInGroup(int groupIndex, bool downward)
 
                        if (pItem == null)
                        {
-                               SysLogException(NID_UI_CTRL, E_SYSTEM, "[%s] A system error has been occurred. Unable to load item.", GetErrorMessage(E_SYSTEM) );
+                               SysLogException(NID_UI_CTRL, E_SYSTEM, "[%s] A system error has been occurred. Unable to load item.", GetErrorMessage(E_SYSTEM));
                        }
                }
        }
@@ -3059,7 +3059,7 @@ _TableViewPresenter::LoadItemsToBeVisible(const TableViewItemTag& from)
        TableViewItemTag current;
        TableViewItemTag next;
 
-       _TableViewItem *pItem = LoadItem(from.groupIndex, from.itemIndex);
+       _TableViewItempItem = LoadItem(from.groupIndex, from.itemIndex);
 
        if (pItem == null)
        {
@@ -3096,7 +3096,7 @@ _TableViewPresenter::AttachNextItemsToBottom(const TableViewItemTag& anchor)
        TableViewItemTag current;
        TableViewItemTag next;
 
-       _TableViewItem *pItem = FindItem(itemTag);
+       _TableViewItempItem = FindItem(itemTag);
        if (pItem == null)
        {
                return;
@@ -3959,7 +3959,7 @@ _TableViewPresenter::IsContextItemOpened(int groupIndex, int itemIndex) const
        SysTryReturn(NID_UI_CTRL, groupIndex >= 0 && groupIndex < GetGroupCount(), false, E_OUT_OF_RANGE, "[%s] Group Index (%d) is out of range.  ", GetErrorMessage(E_OUT_OF_RANGE), groupIndex);
 
 
-       if ( __sweptItemTag.groupIndex == -1 && __sweptItemTag.itemIndex == -1)
+       if (__sweptItemTag.groupIndex == -1 && __sweptItemTag.itemIndex == -1)
        {
                return false;
        }
@@ -4082,7 +4082,7 @@ _TableViewPresenter::StopAllItemAnimation(void)
 
        do
        {
-               _TableViewItem *pItem = FindItem(currentItemTag);
+               _TableViewItempItem = FindItem(currentItemTag);
                if (pItem != null)
                {
                        pItem->StopAllAnimation();
@@ -4557,7 +4557,7 @@ _TableViewPresenter::ReorderItem(int destinationGroupIndex, int destinationItemI
 
        FloatPoint destinationItemPosition = FloatPoint(destinationItemBounds.x, 0.0f);
 
-       if ( __reorderInfo.itemIndex > destinationItemIndex && __reorderInfo.groupIndex == destinationGroupIndex)
+       if (__reorderInfo.itemIndex > destinationItemIndex && __reorderInfo.groupIndex == destinationGroupIndex)
        {
                destinationItemPosition.y = __reorderInfo.itemBounds.y + __reorderInfo.itemBounds.height - destinationItemBounds.height;
                __reorderInfo.itemBounds.y = destinationItemBounds.y;
@@ -4745,7 +4745,7 @@ _TableViewPresenter::RestoreItemHeightList(float defaultGroupHeight, float defau
        r = __itemHeightList.SetCapacity(GetItemCount());
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
-       for (int backUpListIndex = 0, actualListIndex = 0; actualListIndex < GetItemCount() && groupIndex < groupCount; )
+       for (int backUpListIndex = 0, actualListIndex = 0; actualListIndex < GetItemCount() && groupIndex < groupCount;)
        {
                backupItemHeightList.GetAt(backUpListIndex, backupItem);
                if (groupIndex < groupCount)
index e3bc1f0..bc6e2a0 100644 (file)
@@ -2886,7 +2886,7 @@ _Toolbar::SetTitleText(const String& text, HorizontalAlignment alignment)
                GetAccessibilityContainer()->AddElement(*__pTitleTextElement);
        }
 
-       if( __descriptionText.IsEmpty())
+       if(__descriptionText.IsEmpty())
        {
                __pTitleTextElement->SetLabel(__titleText);
                __pTitleTextElement->SetBounds(FloatRectangle(__pToolbarPresenter->GetTitleTextBoundsF()));
@@ -3461,7 +3461,7 @@ _Toolbar::OnBoundsChanged(void)
 
        if(__pTitleTextElement)
        {
-               if( __descriptionText.IsEmpty())
+               if(__descriptionText.IsEmpty())
                {
                        __pTitleTextElement->SetBounds(FloatRectangle(__pToolbarPresenter->GetTitleTextBoundsF()));
                }
@@ -5963,7 +5963,7 @@ _Toolbar::OnDraw(void)
 
        if(__pTitleTextElement)
        {
-               if( __descriptionText.IsEmpty())
+               if(__descriptionText.IsEmpty())
                {
                        __pTitleTextElement->SetBounds(FloatRectangle(__pToolbarPresenter->GetTitleTextBoundsF()));
                }
@@ -8374,7 +8374,7 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
                GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE, GetOrientation(), fontSize);
                GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_MULTILINE_FONT_SIZE, GetOrientation(), multilineFontSize);
        }
-       else if ( __itemCount == 2)
+       else if (__itemCount == 2)
        {
                if (__pButtonItems[LEFT_BUTTON])
                {
index 3dbdab6..9b5b704 100644 (file)
@@ -337,7 +337,7 @@ _ToolbarPresenter::DrawDivider(void)
                }
        }
 
-       Canvas * pCanvas = null;
+       Canvas* pCanvas = null;
        int Z_ORDER_GROUP_CONTROL = 2001;
 
        if (__pDividerVe == null)
@@ -720,7 +720,7 @@ _ToolbarPresenter::DrawDescriptionText(void)
 void
 _ToolbarPresenter::DrawEditItem(const FloatPoint& point)
 {
-       if (__pEditItem == null )
+       if (__pEditItem == null)
        {
                return;
        }