Modified deprecated APIs

Change-Id: I476fb17c51143c206d283e863c1a5c5aaa61b4ac
Signed-off-by: Hongryeol Gil <hr.gil@samsung.com>

diff --git a/manifest.xml b/manifest.xml
index c93db6d..a52a00a 100644 (file)
--- a/manifest.xml
+++ b/manifest.xml
@@ -66,37 +66,36 @@
         <Feature Name="http://tizen.org/feature/screen.coordinate_system.logical">Normal</Feature>
     </Requirements>
     <Apps>
-        <ApiVersion>2.0</ApiVersion>
+        <ApiVersion>2.1</ApiVersion>
         <Privileges>
-            <Privilege>http://tizen.org/privilege/wifi.read</Privilege>
-            <Privilege>http://tizen.org/privilege/certificate.read</Privilege>
-            <Privilege>http://tizen.org/privilege/imemanager</Privilege>
-            <Privilege>http://tizen.org/privilege/bluetooth.admin</Privilege>
-            <Privilege>http://tizen.org/privilege/alarm</Privilege>
             <Privilege>http://tizen.org/privilege/application.launch</Privilege>
+            <Privilege>http://tizen.org/privilege/appmanager.kill</Privilege>
+            <Privilege>http://tizen.org/privilege/appsetting</Privilege>
+            <Privilege>http://tizen.org/privilege/bluetooth.admin</Privilege>
             <Privilege>http://tizen.org/privilege/bluetooth.gap</Privilege>
-            <Privilege>http://tizen.org/privilege/packageinfo</Privilege>
-            <Privilege>http://tizen.org/privilege/systemsetting.read</Privilege>
-            <Privilege>http://tizen.org/privilege/nfc.admin</Privilege>
-            <Privilege>http://tizen.org/privilege/packagemanager.install</Privilege>
-            <Privilege>http://tizen.org/privilege/systeminfo</Privilege>
+            <Privilege>http://tizen.org/privilege/bluetoothmanager</Privilege>
+            <Privilege>http://tizen.org/privilege/certificate.read</Privilege>
+            <Privilege>http://tizen.org/privilege/certificate.write</Privilege>
             <Privilege>http://tizen.org/privilege/content.read</Privilege>
-            <Privilege>http://tizen.org/privilege/appsetting</Privilege>
-            <Privilege>http://tizen.org/privilege/wifimanager</Privilege>
-            <Privilege>http://tizen.org/privilege/systemsetting.write</Privilege>
-            <Privilege>http://tizen.org/privilege/packagesetting</Privilege>
-           <Privilege>http://tizen.org/privilege/package.info</Privilege>
-            <Privilege>http://tizen.org/privilege/setting</Privilege>
+            <Privilege>http://tizen.org/privilege/imemanager</Privilege>
+            <Privilege>http://tizen.org/privilege/nfc.admin</Privilege>
             <Privilege>http://tizen.org/privilege/nfc.p2p</Privilege>
-            <Privilege>http://tizen.org/privilege/wifi.admin</Privilege>
+            <Privilege>http://tizen.org/privilege/nfcmanager</Privilege>
+            <Privilege>http://tizen.org/privilege/package.info</Privilege>
+            <Privilege>http://tizen.org/privilege/packagemanager.install</Privilege>
+            <Privilege>http://tizen.org/privilege/packagemanager.setting</Privilege>
+            <Privilege>http://tizen.org/privilege/power</Privilege>
             <Privilege>http://tizen.org/privilege/privacymanager.read</Privilege>
             <Privilege>http://tizen.org/privilege/privacymanager.write</Privilege>
-            <Privilege>http://tizen.org/privilege/networkmanager</Privilege>
+            <Privilege>http://tizen.org/privilege/setting</Privilege>
+            <Privilege>http://tizen.org/privilege/settingmanager.write</Privilege>
+            <Privilege>http://tizen.org/privilege/system</Privilege>
             <Privilege>http://tizen.org/privilege/telephony</Privilege>
-            <Privilege>http://tizen.org/privilege/certificate.write</Privilege>
-            <Privilege>http://tizen.org/privilege/application.kill</Privilege>
-            <Privilege>http://tizen.org/privilege/platforminfo</Privilege>
-            <Privilege>http://tizen.org/privilege/nfcmanager</Privilege>
+            <Privilege>http://tizen.org/privilege/wifi.admin</Privilege>
+            <Privilege>http://tizen.org/privilege/wifi.read</Privilege>
+            <Privilege>http://tizen.org/privilege/wifi.wifidirect.admin</Privilege>
+            <Privilege>http://tizen.org/privilege/wifi.wifidirect.read</Privilege>
+            <Privilege>http://tizen.org/privilege/wifimanager</Privilege>
         </Privileges>
         <UiApp Main="True" MenuIconVisible="True" Name="Settings" SubMode="True">
             <UiScalability BaseScreenSize="Normal" CoordinateSystem="Logical" LogicalCoordinate="720"/>

diff --git a/src/StAboutPhoneForm.cpp b/src/StAboutPhoneForm.cpp
index c62b4a9..26b3093 100644 (file)
--- a/src/StAboutPhoneForm.cpp
+++ b/src/StAboutPhoneForm.cpp
@@ -281,7 +281,7 @@ PhoneInfoForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        pItem->SetEnabled(false);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -336,10 +336,12 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                case ID_ITEM_ABOUT_PHONE_MAIN_MY_NUMBER:
                        {
-                               SimInfo* pSimInfo = new (std::nothrow) SimInfo();
-                               if (pSimInfo->Construct() == E_SUCCESS)
+                               SimStateManager* pSimStateManager = new (std::nothrow) SimStateManager();
+                               SimInfo simInfo;
+
+                               if (pSimStateManager->Construct() == E_SUCCESS && pSimStateManager->GetSimInfo(simInfo) == E_SUCCESS)
                                {
-                                       itemSubText = pSimInfo->GetPhoneNumber();
+                                       itemSubText = simInfo.GetPhoneNumber();
 
                                        if (itemSubText.IsEmpty() == true)
                                        {
@@ -352,7 +354,7 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                }
 
                                itemMainText = ResourceManager::GetString(L"IDS_ST_BODY_MY_NUMBER");
-                               delete pSimInfo;
+                               delete pSimStateManager;
                        }
                        break;
 
@@ -490,7 +492,7 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                __pEditField->AddKeypadEventListener(*this);
 
                pItem->SetIndividualSelectionEnabled(__pEditField, true);
-               pItem->AddControl(*__pEditField);
+               pItem->AddControl(__pEditField);
 
                relativeLayout.SetMargin(*__pEditField, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*__pEditField, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -510,7 +512,7 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED);
                        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_HIGHLIGHTED);
                }
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
 
                relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -529,7 +531,7 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL);
                        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED);
                        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_HIGHLIGHTED);
-                       pItem->AddControl(*pLabel);
+                       pItem->AddControl(pLabel);
                        relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -670,11 +672,13 @@ PhoneInfoForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Ta
                                pFirstLine->SetText(ResourceManager::GetString(L"IDS_ST_BODY_MY_NUMBER"));
                                pFirstLine->Invalidate(false);
 
-                               SimInfo* pSimInfo = new (std::nothrow) SimInfo();
-                               if (pSimInfo->Construct() == E_SUCCESS)
+                               SimStateManager* pSimStateManager = new (std::nothrow) SimStateManager();
+                               SimInfo simInfo;
+
+                               if (pSimStateManager->Construct() == E_SUCCESS && pSimStateManager->GetSimInfo(simInfo) == E_SUCCESS)
                                {
                                        tempValue.Remove(0, tempValue.GetLength());
-                                       tempValue = pSimInfo->GetPhoneNumber();
+                                       tempValue = simInfo.GetPhoneNumber();
 
                                        if (pSecondLine->GetText().Equals(tempValue, false) == false)
                                        {
@@ -686,7 +690,7 @@ PhoneInfoForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Ta
                                        pSecondLine->SetText(ResourceManager::GetString(L"IDS_ST_HEADER_UNAVAILABLE"));
                                        pSecondLine->Invalidate(false);
                                }
-                               delete pSimInfo;
+                               delete pSimStateManager;
                        }
                        break;
 

diff --git a/src/StAccessibilityForm.cpp b/src/StAccessibilityForm.cpp
index 49836f3..13cf004 100644 (file)
--- a/src/StAccessibilityForm.cpp
+++ b/src/StAccessibilityForm.cpp
@@ -230,7 +230,7 @@ AccessibilityForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        pItem->SetEnabled(false);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 0, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -389,7 +389,7 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
 
        if (style == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING)
        {
@@ -410,7 +410,7 @@ AccessibilityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_SUB_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
 
                relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);

diff --git a/src/StAppSettingForm.cpp b/src/StAppSettingForm.cpp
index 2d6ed36..3a0acf2 100644 (file)
--- a/src/StAppSettingForm.cpp
+++ b/src/StAppSettingForm.cpp
@@ -1042,7 +1042,7 @@ AppSettingForm::CreateNoContents(void)
        pInvalidFormatLabel->SetTextConfig(GetFontSize(), LABEL_TEXT_STYLE_NORMAL);
        pInvalidFormatLabel->SetBackgroundColor(COLOR_BG_GROUP_ITEM_LISTITEM);
        pInvalidFormatLabel->SetName(L"InvalidFormat");
-       AddControl(*pInvalidFormatLabel);
+       AddControl(pInvalidFormatLabel);
        Invalidate(true);
 }
 
@@ -1217,7 +1217,7 @@ AppSettingForm::CreateGroupItem(int groupIndex, int itemWidth)
                pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
                pLabel->SetName(pNode->GetId());
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED);
                pItem->SetEnabled(true);
                delete groupText;
@@ -1234,7 +1234,7 @@ AppSettingForm::CreateGroupItem(int groupIndex, int itemWidth)
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
 
                pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
                pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
@@ -1302,7 +1302,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -1358,7 +1358,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pSlider->AddSliderEventListener(*this);
                pSlider->SetName(pItemNode->GetId());
 
-               pItem->AddControl(*pSlider);
+               pItem->AddControl(pSlider);
                relativeLayout.SetMargin(*pSlider, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -1427,7 +1427,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pEditField->SetName(id);
                pEditField->AddKeypadEventListener(*this);
 
-               pItem->AddControl(*pEditField);
+               pItem->AddControl(pEditField);
                pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED);
                pItem->SetIndividualSelectionEnabled(pEditField, true);
 
@@ -1445,7 +1445,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED);
        }
        else if ((pItemNode->GetType()).Equals(ID_APPSETTING_ITEM_TYPE_EXPAND_LIST, false))
@@ -1480,7 +1480,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
                pLabel->SetName(pItemNode->GetId());
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED);
        }
        else if ((pItemNode->GetType()).Equals(ID_APPSETTING_ITEM_TYPE_EXPAND_ITEM, false))
@@ -1507,7 +1507,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                delete pParentValue;
                delete pCurrentValue;
                relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_LEFT_MARGIN, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
@@ -1532,7 +1532,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel = new (std::nothrow) Label();
                pLabel->Construct(itemMainRectangle, L" ");
                pLabel->SetBackgroundBitmap(*pBitmap);
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
 
                delete pBitmap;
                pItem->SetEnabled(false);

diff --git a/src/StBaseForm.cpp b/src/StBaseForm.cpp
index c490ed6..f9b9cbd 100644 (file)
--- a/src/StBaseForm.cpp
+++ b/src/StBaseForm.cpp
@@ -91,7 +91,7 @@ BaseForm::CreateTableView(void)
        __pTableView->Construct(bounds, false, TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT);
        __pTableView->SetItemProvider(this);
 
-       AddControl(*__pTableView);
+       AddControl(__pTableView);
        __pTableView->SetGroupedLookEnabled(true);
        __pTableView->AddGroupedTableViewItemEventListener(*this);
 

diff --git a/src/StBluetoothDetailForm.cpp b/src/StBluetoothDetailForm.cpp
index 39d888e..2b7022a 100644 (file)
--- a/src/StBluetoothDetailForm.cpp
+++ b/src/StBluetoothDetailForm.cpp
@@ -209,7 +209,7 @@ BluetoothDetailForm::CreateGroupItem(int groupIndex, int itemWidth)
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        pItem->SetEnabled(false);
        relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -310,7 +310,7 @@ BluetoothDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
 
        relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -336,7 +336,7 @@ BluetoothDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pSecondLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pSecondLabel->SetTextColor(COLOR_SUB_TEXT);
 
-               pItem->AddControl(*pSecondLabel);
+               pItem->AddControl(pSecondLabel);
                relativeLayout.SetMargin(*pSecondLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StBluetoothForm.cpp b/src/StBluetoothForm.cpp
index 3836dc8..c4f88dc 100644 (file)
--- a/src/StBluetoothForm.cpp
+++ b/src/StBluetoothForm.cpp
@@ -372,7 +372,7 @@ BluetoothForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
        pLabel->SetName(groupText);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -622,7 +622,7 @@ BluetoothForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
                pLabel->SetBackgroundBitmap(*pBitmap);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, itemIconRect.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -649,7 +649,7 @@ BluetoothForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        if (style == TABLE_VIEW_ANNEX_STYLE_RADIO)
        {
                relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_LEFT_MARGIN, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
@@ -687,7 +687,7 @@ BluetoothForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pSecondLabel->SetTextColor(COLOR_SUB_TEXT);
                pSecondLabel->SetName(itemSetname);
 
-               pItem->AddControl(*pSecondLabel);
+               pItem->AddControl(pSecondLabel);
                relativeLayout.SetMargin(*pSecondLabel, itemRectSecondLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -1533,7 +1533,7 @@ BluetoothForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Ta
                                pAnimation->SetRepeatCount(ID_IN_PROGRESS__REPEAT_COUNT);
                                pAnimation->SetName(L"SearchAnimation");
                                pAnimation->SetShowState(true);
-                               pItem->AddControl(*pAnimation);
+                               pItem->AddControl(pAnimation);
                                pAnimation->Play();
                        }
                        else

diff --git a/src/StBrightnessForm.cpp b/src/StBrightnessForm.cpp
index 0de6005..8723f2c 100644 (file)
--- a/src/StBrightnessForm.cpp
+++ b/src/StBrightnessForm.cpp
@@ -151,7 +151,7 @@ BrightnessForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -195,7 +195,7 @@ BrightnessForm::CreateItem(int groupIndex, int itemIndex,int itemWidth)
                        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-                       pItem->AddControl(*pLabel);
+                       pItem->AddControl(pLabel);
                        relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -225,7 +225,7 @@ BrightnessForm::CreateItem(int groupIndex, int itemIndex,int itemWidth)
                        pSlider->AddAdjustmentEventListener(*this);
                        pSlider->AddSliderEventListener(*this);
 
-                       pItem->AddControl(*pSlider);
+                       pItem->AddControl(pSlider);
                        relativeLayout.SetMargin(*pSlider, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                        relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                        relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StCertificateDetailForm.cpp b/src/StCertificateDetailForm.cpp
index ff11e15..d705b1a 100644 (file)
--- a/src/StCertificateDetailForm.cpp
+++ b/src/StCertificateDetailForm.cpp
@@ -90,7 +90,7 @@ CertificateDetailForm::CreateTableView(void)
        __pTableView->Construct(tableViewBounds, true, TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT);
        __pTableView->SetItemProvider(this);
 
-       AddControl(*__pTableView);
+       AddControl(__pTableView);
        __pTableView->SetGroupedLookEnabled(true);
        __pTableView->AddGroupedTableViewItemEventListener(*this);
        RelativeLayout* pRelativeLayout = dynamic_cast<RelativeLayout*>(this->GetLayoutN());
@@ -193,7 +193,7 @@ CertificateDetailForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        pItem->SetEnabled(false);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -378,7 +378,7 @@ CertificateDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -398,7 +398,7 @@ CertificateDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pSecondLabel->SetTextConfig(H_GROUP_INDEX_TEXT_GAP, LABEL_TEXT_STYLE_NORMAL);
 
        pItem->SetEnabled(false);
-       pItem->AddControl(*pSecondLabel);
+       pItem->AddControl(pSecondLabel);
        relativeLayout.SetMargin(*pSecondLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StCertificateForm.cpp b/src/StCertificateForm.cpp
index c30742d..4bc9dd2 100644 (file)
--- a/src/StCertificateForm.cpp
+++ b/src/StCertificateForm.cpp
@@ -82,7 +82,7 @@ CertificateForm::CreateTableView(void)
        __pTableView->Construct(tableViewBounds, true, TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT);
        __pTableView->SetItemProvider(this);
 
-       AddControl(*__pTableView);
+       AddControl(__pTableView);
        __pTableView->SetGroupedLookEnabled(true);
        __pTableView->AddGroupedTableViewItemEventListener(*this);
        RelativeLayout* pRelativeLayout = dynamic_cast<RelativeLayout*>(this->GetLayoutN());
@@ -172,7 +172,7 @@ CertificateForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -225,7 +225,7 @@ CertificateForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StCertificateTrustedRootForm.cpp b/src/StCertificateTrustedRootForm.cpp
index eed2471..2d8682b 100644 (file)
--- a/src/StCertificateTrustedRootForm.cpp
+++ b/src/StCertificateTrustedRootForm.cpp
@@ -89,7 +89,7 @@ CertificateTrustedRootForm::CreateTableView(void)
        __pTableView->Construct(tableViewBounds, true, TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT);
        __pTableView->SetItemProvider(this);
 
-       AddControl(*__pTableView);
+       AddControl(__pTableView);
        __pTableView->SetGroupedLookEnabled(true);
        __pTableView->AddGroupedTableViewItemEventListener(*this);
        RelativeLayout* pRelativeLayout = dynamic_cast<RelativeLayout*>(this->GetLayoutN());
@@ -184,7 +184,7 @@ CertificateTrustedRootForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        pItem->SetEnabled(false);
 
        return pItem;
@@ -232,7 +232,7 @@ CertificateTrustedRootForm::CreateItem(int groupIndex, int itemIndex, int itemWi
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -418,7 +418,7 @@ CertificateTrustedRootForm::CreateNoContents(void)
                pLabelNoContents->SetTextColor(textColor);
                pLabelNoContents->SetText(labelText);
 
-               AddControl(*pLabel);
-               AddControl(*pLabelNoContents);
+               AddControl(pLabel);
+               AddControl(pLabelNoContents);
        }
 }
\ No newline at end of file

diff --git a/src/StCertificateUserForm.cpp b/src/StCertificateUserForm.cpp
index 2a1347b..021a2d6 100644 (file)
--- a/src/StCertificateUserForm.cpp
+++ b/src/StCertificateUserForm.cpp
@@ -169,8 +169,8 @@ CertificateUserForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previou
                        pLabelNoContents->SetTextColor(textColor);
                        pLabelNoContents->SetText(labelText);
 
-                       AddControl(*pLabel);
-                       AddControl(*pLabelNoContents);
+                       AddControl(pLabel);
+                       AddControl(pLabelNoContents);
                }
                DisableUninstallFooter();
        }
@@ -258,7 +258,7 @@ CertificateUserForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -277,7 +277,7 @@ CertificateUserForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pSecondLabel->SetTextColor(COLOR_SUB_TEXT);
        pSecondLabel->SetTextConfig(H_GROUP_INDEX_TEXT_GAP, LABEL_TEXT_STYLE_NORMAL);
 
-       pItem->AddControl(*pSecondLabel);
+       pItem->AddControl(pSecondLabel);
        relativeLayout.SetMargin(*pSecondLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -515,14 +515,14 @@ CertificateUserForm::CreateAlertPopup(void)
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
        pLabel->SetTextConfig(ALERT_POPUP_LABEL_FONT_SIZE, LABEL_TEXT_STYLE_BOLD);
-       __installFromSDCardPopup->AddControl(*pLabel);
+       __installFromSDCardPopup->AddControl(pLabel);
 
        buttonText = ResourceManager::GetString(L"IDS_ST_BUTTON_YES");
        pLhsButton = new (std::nothrow) Button();
        pLhsButton->Construct(itemRectLhsButton, buttonText);
        pLhsButton->SetActionId(IDA_SD_INSTALL_POPUP_OK);
 
-       __installFromSDCardPopup->AddControl(*pLhsButton);
+       __installFromSDCardPopup->AddControl(pLhsButton);
 
        buttonText = ResourceManager::GetString(L"IDS_COM_SK_NO");
 
@@ -530,7 +530,7 @@ CertificateUserForm::CreateAlertPopup(void)
        pRhslButton->Construct(itemRectRhsButton, buttonText);
        pRhslButton->SetActionId(IDA_SD_INSTALL_POPUP_CANCEL);
 
-       __installFromSDCardPopup->AddControl(*pRhslButton);
+       __installFromSDCardPopup->AddControl(pRhslButton);
 
        pLhsButton->AddActionEventListener(*this);
        pRhslButton->AddActionEventListener(*this);

diff --git a/src/StCertificateUserInstallForm.cpp b/src/StCertificateUserInstallForm.cpp
index 8092877..f65b40b 100644 (file)
--- a/src/StCertificateUserInstallForm.cpp
+++ b/src/StCertificateUserInstallForm.cpp
@@ -138,8 +138,8 @@ CertificateUserInstallForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId&
                        pLabelNoContents->SetTextColor(textColor);
                        pLabelNoContents->SetText(labelText);
 
-                       AddControl(*pLabel);
-                       AddControl(*pLabelNoContents);
+                       AddControl(pLabel);
+                       AddControl(pLabelNoContents);
                }
        }
 }
@@ -225,7 +225,7 @@ CertificateUserInstallForm::CreateItem(int groupIndex, int itemIndex, int itemWi
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -386,5 +386,5 @@ CertificateUserInstallForm::CreateTableView(void)
                delete pRelativeLayout;
        }
 
-       AddControl(*__pTableView);
+       AddControl(__pTableView);
 }
\ No newline at end of file

diff --git a/src/StCertificateUserInstallPasswordForm.cpp b/src/StCertificateUserInstallPasswordForm.cpp
index 0df9cd1..b9428c6 100644 (file)
--- a/src/StCertificateUserInstallPasswordForm.cpp
+++ b/src/StCertificateUserInstallPasswordForm.cpp
@@ -104,7 +104,7 @@ CertificateUserInstallPasswordForm::CreateTableView(void)
        __pTableView->Construct(tableViewBounds, true, TABLE_VIEW_SCROLL_BAR_STYLE_NONE);
        __pTableView->SetItemProvider(this);
 
-       AddControl(*__pTableView);
+       AddControl(__pTableView);
        __pTableView->SetGroupedLookEnabled(true);
        __pTableView->AddGroupedTableViewItemEventListener(*this);
        RelativeLayout* pRelativeLayout = dynamic_cast<RelativeLayout*>(this->GetLayoutN());
@@ -212,7 +212,7 @@ CertificateUserInstallPasswordForm::CreateGroupItem(int groupIndex, int itemWidt
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -260,7 +260,7 @@ CertificateUserInstallPasswordForm::CreateItem(int groupIndex, int itemIndex, in
                        __pEditField->AddTextEventListener(*this);
                        __pEditField->SetText(__pPassword);
                        pItem->SetIndividualSelectionEnabled(__pEditField, true);
-                       pItem->AddControl(*__pEditField);
+                       pItem->AddControl(__pEditField);
                        relativeLayout.SetMargin(*__pEditField, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                        relativeLayout.SetRelation(*__pEditField, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                        relativeLayout.SetRelation(*__pEditField, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -275,7 +275,7 @@ CertificateUserInstallPasswordForm::CreateItem(int groupIndex, int itemIndex, in
                        pButton->AddActionEventListener(*this);
 
                        pItem->SetIndividualSelectionEnabled(pButton, true);
-                       pItem->AddControl(*pButton);
+                       pItem->AddControl(pButton);
                        relativeLayout.SetMargin(*pButton, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                        relativeLayout.SetRelation(*pButton, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                        relativeLayout.SetRelation(*pButton, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -290,7 +290,7 @@ CertificateUserInstallPasswordForm::CreateItem(int groupIndex, int itemIndex, in
                        pButton->AddActionEventListener(*this);
 
                        pItem->SetIndividualSelectionEnabled(pButton, true);
-                       pItem->AddControl(*pButton);
+                       pItem->AddControl(pButton);
                        relativeLayout.SetMargin(*pButton, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                        relativeLayout.SetRelation(*pButton, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                        relativeLayout.SetRelation(*pButton, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -500,7 +500,7 @@ CertificateUserInstallPasswordForm::CreateUserInstallResultPopup(result r)
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_CENTER);
        pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
        pLabel->SetTextConfig(INSERT_RESULT_POPUP_FONT_SIZE, LABEL_TEXT_STYLE_BOLD);
-       __pInstallResultPopup->AddControl(*pLabel);
+       __pInstallResultPopup->AddControl(pLabel);
 
        buttonText = ResourceManager::GetString(L"IDS_ST_BUTTON_OK");
        pLhsButton = new (std::nothrow) Button();
@@ -508,7 +508,7 @@ CertificateUserInstallPasswordForm::CreateUserInstallResultPopup(result r)
        pLhsButton->SetActionId(buttonId);
        pLhsButton->AddActionEventListener(*this);
 
-       __pInstallResultPopup->AddControl(*pLhsButton);
+       __pInstallResultPopup->AddControl(pLhsButton);
 }
 
 void

diff --git a/src/StCertificateUserUnInstallForm.cpp b/src/StCertificateUserUnInstallForm.cpp
index db9ed70..d81e740 100644 (file)
--- a/src/StCertificateUserUnInstallForm.cpp
+++ b/src/StCertificateUserUnInstallForm.cpp
@@ -174,7 +174,7 @@ CertificateUserUnInstallForm::CreateItem(int groupIndex, int itemIndex, int item
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_LEFT_RADIO_BUTTON_MARGIN, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -355,7 +355,7 @@ CertificateUserUnInstallForm::CreateTableView(void)
        __pTableView = new (std::nothrow) GroupedTableView();
        __pTableView->Construct(tableViewBounds, true, TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT);
        __pTableView->SetItemProvider(this);
-       AddControl(*__pTableView);
+       AddControl(__pTableView);
        __pTableView->SetGroupedLookEnabled(true);
        __pTableView->AddGroupedTableViewItemEventListener(*this);
        RelativeLayout* pRelativeLayout = dynamic_cast<RelativeLayout*>(this->GetLayoutN());

diff --git a/src/StDateTimeForm.cpp b/src/StDateTimeForm.cpp
index b5b38bc..318e735 100644 (file)
--- a/src/StDateTimeForm.cpp
+++ b/src/StDateTimeForm.cpp
@@ -296,7 +296,7 @@ DateTimeForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -550,7 +550,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pEditDate->AddDateChangeEventListener(*this);
                pEditDate->SetName(L"EditDate");
 
-               pItem->AddControl(*pEditDate);
+               pItem->AddControl(pEditDate);
 
                EditTime* pEditTime = new (std::nothrow) EditTime();
                pEditTime->Construct(Point(pEditDate->GetWidth(), 0), L" ");
@@ -564,7 +564,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pEditTime->AddTimeChangeEventListener(*this);
                pEditTime->SetName(L"EditTime");
 
-               pItem->AddControl(*pEditTime);
+               pItem->AddControl(pEditTime);
                pItem->SetIndividualSelectionEnabled(pEditDate, true);
                pItem->SetIndividualSelectionEnabled(pEditTime, true);
        }
@@ -585,7 +585,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                if (groupIndex == ID_GROUP_DATE_AND_TIME_FORMAT)
                {
                        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON, 0, 0);
@@ -620,7 +620,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                        pLabel->SetBackgroundBitmap(*pBitmap);
 
-                       pItem->AddControl(*pLabel);
+                       pItem->AddControl(pLabel);
                        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON, 0, 0);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
                }
@@ -632,7 +632,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_SUB_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, itemSubRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -651,7 +651,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
 
                switch (style)
                {

diff --git a/src/StDeveloperOptionForm.cpp b/src/StDeveloperOptionForm.cpp
index 0130555..3b1d7e8 100644 (file)
--- a/src/StDeveloperOptionForm.cpp
+++ b/src/StDeveloperOptionForm.cpp
@@ -302,7 +302,7 @@ DeveloperOptionForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, 0, 0, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -358,7 +358,7 @@ DeveloperOptionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -560,14 +560,14 @@ DeveloperOptionForm::CreateAlertPopup(void)
        pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
        pLabel->SetTextConfig(ALERT_POPUP_LABEL_FONT_SIZE, LABEL_TEXT_STYLE_BOLD);
 
-       __usbDebuggingPopup->AddControl(*pLabel);
+       __usbDebuggingPopup->AddControl(pLabel);
 
        buttonText = ResourceManager::GetString(L"IDS_ST_BUTTON_OK");
        pLhsButton = new (std::nothrow) Button();
        pLhsButton->Construct(itemRectLhsButton, buttonText);
        pLhsButton->SetActionId(IDA_USB_DEBUGGING_POPUP_OK);
 
-       __usbDebuggingPopup->AddControl(*pLhsButton);
+       __usbDebuggingPopup->AddControl(pLhsButton);
 
        buttonText = ResourceManager::GetString(L"IDS_ST_BODY_CANCEL");
 
@@ -575,7 +575,7 @@ DeveloperOptionForm::CreateAlertPopup(void)
        pRhslButton->Construct(itemRectRhsButton, buttonText);
        pRhslButton->SetActionId(IDA_USB_DEBUGGING_POPUP_CANCEL);
 
-       __usbDebuggingPopup->AddControl(*pRhslButton);
+       __usbDebuggingPopup->AddControl(pRhslButton);
 
        pLhsButton->AddActionEventListener(*this);
        pRhslButton->AddActionEventListener(*this);

diff --git a/src/StDisplayForm.cpp b/src/StDisplayForm.cpp
index e955fcd..28e47d7 100644 (file)
--- a/src/StDisplayForm.cpp
+++ b/src/StDisplayForm.cpp
@@ -203,7 +203,7 @@ DisplayForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -293,7 +293,7 @@ DisplayForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
 
        switch (style)
        {
@@ -332,7 +332,7 @@ DisplayForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                pLabel->SetBackgroundBitmap(*pBitmap);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
@@ -343,7 +343,7 @@ DisplayForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_SUB_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StDownloadedApplicationForm.cpp b/src/StDownloadedApplicationForm.cpp
index e6176d5..4eaa2cf 100644 (file)
--- a/src/StDownloadedApplicationForm.cpp
+++ b/src/StDownloadedApplicationForm.cpp
@@ -176,7 +176,7 @@ DownloadedApplicationForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -229,7 +229,7 @@ DownloadedApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWid
        pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
        pLabel->SetBackgroundBitmap(*pBitmap);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
 
        pLabel = new (std::nothrow) Label();
        pLabel->Construct(itemMainRectangle, itemMainText);
@@ -237,7 +237,7 @@ DownloadedApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWid
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, MAIN_RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -770,8 +770,8 @@ DownloadedApplicationForm::UpdateTableViewAndNoContent(void)
                        pLabelNoContents->SetTextColor(textColor);
                        pLabelNoContents->SetText(labelText);
 
-                       AddControl(*pLabel);
-                       AddControl(*pLabelNoContents);
+                       AddControl(pLabel);
+                       AddControl(pLabelNoContents);
                }
        }
 }
\ No newline at end of file

diff --git a/src/StEventsNotificationForm.cpp b/src/StEventsNotificationForm.cpp
index 034f4de..45c1214 100644 (file)
--- a/src/StEventsNotificationForm.cpp
+++ b/src/StEventsNotificationForm.cpp
@@ -152,7 +152,7 @@ NotificationForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -211,7 +211,7 @@ NotificationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StFontForm.cpp b/src/StFontForm.cpp
index c086335..50b5094 100644 (file)
--- a/src/StFontForm.cpp
+++ b/src/StFontForm.cpp
@@ -288,7 +288,7 @@ FontForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -346,7 +346,7 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
 
@@ -371,7 +371,7 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                        pLabelArrow->SetBackgroundBitmap(*pBitmap);
 
-                       pItem->AddControl(*pLabelArrow);
+                       pItem->AddControl(pLabelArrow);
                        relativeLayout.SetMargin(*pLabelArrow, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON, 0, 0);
                        relativeLayout.SetRelation(*pLabelArrow, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
                        relativeLayout.SetRelation(*pLabel, *pLabelArrow, RECT_EDGE_RELATION_RIGHT_TO_LEFT);
@@ -388,7 +388,7 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_SUB_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, itemSubRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -408,7 +408,7 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_LEFT_MARGIN, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StFontSizeForm.cpp b/src/StFontSizeForm.cpp
index b6f1cca..0d4bf36 100644 (file)
--- a/src/StFontSizeForm.cpp
+++ b/src/StFontSizeForm.cpp
@@ -244,7 +244,7 @@ FontSizeForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        pItem->SetEnabled(false);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 0, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -353,7 +353,7 @@ FontSizeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_LEFT_MARGIN, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StHomeAndLockScreenForm.cpp b/src/StHomeAndLockScreenForm.cpp
index 67a4e4e..a89e4a5 100644 (file)
--- a/src/StHomeAndLockScreenForm.cpp
+++ b/src/StHomeAndLockScreenForm.cpp
@@ -175,7 +175,7 @@ HomeAndLockScreenForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, LABEL_TEXT_STYLE_BOLD);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -225,7 +225,7 @@ HomeAndLockScreenForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
 
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -238,7 +238,7 @@ HomeAndLockScreenForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_SUB_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
 
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StKeyboardForm.cpp b/src/StKeyboardForm.cpp
index a4715ff..c4a84f1 100644 (file)
--- a/src/StKeyboardForm.cpp
+++ b/src/StKeyboardForm.cpp
@@ -192,7 +192,7 @@ KeyboardForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -283,7 +283,7 @@ KeyboardForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        if (style == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING)
        {
                relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);

diff --git a/src/StKeyboardInfoForm.cpp b/src/StKeyboardInfoForm.cpp
index 08e0b76..6c79c87 100644 (file)
--- a/src/StKeyboardInfoForm.cpp
+++ b/src/StKeyboardInfoForm.cpp
@@ -153,8 +153,8 @@ KeyboardInfoForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSc
                        pLabelNoContents->SetTextColor(textColor);
                        pLabelNoContents->SetText(labelText);
 
-                       AddControl(*pLabel);
-                       AddControl(*pLabelNoContents);
+                       AddControl(pLabel);
+                       AddControl(pLabelNoContents);
                }
        }
 }
@@ -258,7 +258,7 @@ KeyboardInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        pItem->SetIndividualSelectionEnabled(pLabel, true);
 
        relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);

diff --git a/src/StKeyboardSelectionForm.cpp b/src/StKeyboardSelectionForm.cpp
index 97e4202..eb464dc 100644 (file)
--- a/src/StKeyboardSelectionForm.cpp
+++ b/src/StKeyboardSelectionForm.cpp
@@ -201,7 +201,7 @@ KeyboardSelectionForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        pItem->SetEnabled(false);
 
        return pItem;
@@ -270,7 +270,7 @@ KeyboardSelectionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
 
        return pItem;
 }

diff --git a/src/StLanguageAndRegionForm.cpp b/src/StLanguageAndRegionForm.cpp
index 327ca6f..14b8ede 100644 (file)
--- a/src/StLanguageAndRegionForm.cpp
+++ b/src/StLanguageAndRegionForm.cpp
@@ -758,7 +758,7 @@ LocaleForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 0, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -892,7 +892,7 @@ LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -904,7 +904,7 @@ LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_SUB_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -923,7 +923,7 @@ LocaleForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StLanguageForm.cpp b/src/StLanguageForm.cpp
index 49eb29d..4243ee6 100644 (file)
--- a/src/StLanguageForm.cpp
+++ b/src/StLanguageForm.cpp
@@ -172,7 +172,7 @@ LocaleLanguageForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -218,7 +218,7 @@ LocaleLanguageForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StLocationForm.cpp b/src/StLocationForm.cpp
index 6d78675..dc15fc0 100644 (file)
--- a/src/StLocationForm.cpp
+++ b/src/StLocationForm.cpp
@@ -256,7 +256,7 @@ LocationForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -335,7 +335,7 @@ LocationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StLocationHelpForm.cpp b/src/StLocationHelpForm.cpp
index 4a1a6bf..e5df03f 100644 (file)
--- a/src/StLocationHelpForm.cpp
+++ b/src/StLocationHelpForm.cpp
@@ -127,7 +127,7 @@ LocationHelpForm::CreateHelpText(const Rectangle& bounds)
                pLabel->SetTextConfig(FONT_SIZE_TITLE_HELP_TEXT, LABEL_TEXT_STYLE_BOLD);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               AddControl(*pLabel);
+               AddControl(pLabel);
 
                Label* pSecondLabel = new (std::nothrow) Label();
                pSecondLabel->Construct(HelpContentsRect, itemHelp);
@@ -136,7 +136,7 @@ LocationHelpForm::CreateHelpText(const Rectangle& bounds)
                pSecondLabel->SetTextConfig(FONT_SIZE_TITLE_HELP_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pSecondLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-               AddControl(*pSecondLabel);
+               AddControl(pSecondLabel);
 
                helpTitleRect.y = (HelpContentsRect.y + HelpContentsRect.height);
        }

diff --git a/src/StMainMenuForm.cpp b/src/StMainMenuForm.cpp
index 86dbcf6..2e8f8bf 100644 (file)
--- a/src/StMainMenuForm.cpp
+++ b/src/StMainMenuForm.cpp
@@ -340,7 +340,7 @@ MainMenuForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemRectangle.x, 0, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -608,7 +608,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
                        pLabel->SetBackgroundBitmap(*pBitmap);
 
-                       pItem->AddControl(*pLabel);
+                       pItem->AddControl(pLabel);
                }
 
                pLabel = new (std::nothrow) Label();
@@ -617,7 +617,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                if (style == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING)
                {
                        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);

diff --git a/src/StManageApplicationForm.cpp b/src/StManageApplicationForm.cpp
index 7c43ce4..b8eb3c2 100644 (file)
--- a/src/StManageApplicationForm.cpp
+++ b/src/StManageApplicationForm.cpp
@@ -333,7 +333,7 @@ ManageApplicationForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        pItem->SetEnabled(false);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 0, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -378,7 +378,7 @@ ManageApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel = new (std::nothrow) Label();
        pLabel->Construct(itemIconRectangle, L"");
        pLabel->SetBackgroundBitmap(*pBitmap);
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
 
        pLabel = new (std::nothrow) Label();
        pLabel->Construct(itemMainRectangle, itemMainText);
@@ -387,7 +387,7 @@ ManageApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
 
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -571,14 +571,14 @@ ManageApplicationForm::CreateAlertPopup(Tizen::Base::String* appName, bool unins
        pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
        pLabel->SetTextConfig(ALERT_POPUP_LABEL_FONT_SIZE, LABEL_TEXT_STYLE_BOLD);
 
-       __uninstallResultPopup->AddControl(*pLabel);
+       __uninstallResultPopup->AddControl(pLabel);
 
        buttonText = ResourceManager::GetString(L"IDS_ST_BUTTON_OK");
        pOkButton = new (std::nothrow) Button();
        pOkButton->Construct(itemRectLhsButton, buttonText);
        pOkButton->SetActionId(IDA_UNINSTALL_OK);
 
-       __uninstallResultPopup->AddControl(*pOkButton);
+       __uninstallResultPopup->AddControl(pOkButton);
 
        pOkButton->AddActionEventListener(*this);
 

diff --git a/src/StManageApplicationInfoForm.cpp b/src/StManageApplicationInfoForm.cpp
index 6d55182..045a9b2 100644 (file)
--- a/src/StManageApplicationInfoForm.cpp
+++ b/src/StManageApplicationInfoForm.cpp
@@ -291,7 +291,7 @@ ManageApplicationInfoForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_MAIN_TEXT_SIZE_SMALL, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        pItem->SetEnabled(false);
        relativeLayout.SetMargin(*pLabel, itemRectangle.x, 0, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -517,8 +517,8 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
                pUninstallButton->SetActionId(IDA_UNINSTALL);
                pUninstallButton->AddActionEventListener(*this);
 
-               pItem->AddControl(*pStopButton);
-               pItem->AddControl(*pUninstallButton);
+               pItem->AddControl(pStopButton);
+               pItem->AddControl(pUninstallButton);
                pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED);
        }
        else
@@ -531,7 +531,7 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
                        pBitmapLabel = new (std::nothrow) Label();
                        pBitmapLabel->Construct(itemIconRectangle, L"");
                        pBitmapLabel->SetBackgroundBitmap(*pBitmap);
-                       pItem->AddControl(*pBitmapLabel);
+                       pItem->AddControl(pBitmapLabel);
                }
 
                pLabel = new (std::nothrow) Label();
@@ -540,7 +540,7 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 0, 0, 0);
 
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -554,7 +554,7 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
                        pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                        pLabel->SetTextColor(COLOR_SUB_TEXT);
 
-                       pItem->AddControl(*pLabel);
+                       pItem->AddControl(pLabel);
 
                        relativeLayout.SetMargin(*pLabel, itemSubRectangle.x, 0, 0, 0);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -811,14 +811,14 @@ ManageApplicationInfoForm::CreateUninstallPopup(void)
        pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
        pLabel->SetTextConfig(ALERT_POPUP_LABEL_FONT_SIZE, LABEL_TEXT_STYLE_BOLD);
 
-       __uninstallConfirmPopup->AddControl(*pLabel);
+       __uninstallConfirmPopup->AddControl(pLabel);
 
        buttonText = ResourceManager::GetString(L"IDS_ST_BUTTON_UNINSTALL");
        pOkButton = new (std::nothrow) Button();
        pOkButton->Construct(itemRectLhsButton, buttonText);
        pOkButton->SetActionId(IDA_UNINSTALL_CONFIRM_OK);
 
-       __uninstallConfirmPopup->AddControl(*pOkButton);
+       __uninstallConfirmPopup->AddControl(pOkButton);
 
        buttonText = ResourceManager::GetString(L"IDS_COM_SK_NO");
 
@@ -826,7 +826,7 @@ ManageApplicationInfoForm::CreateUninstallPopup(void)
        pCancelButton->Construct(itemRectRhsButton, buttonText);
        pCancelButton->SetActionId(IDA_UNINSTALL_CONFIRM_CANCEL);
 
-       __uninstallConfirmPopup->AddControl(*pCancelButton);
+       __uninstallConfirmPopup->AddControl(pCancelButton);
 
        pOkButton->AddActionEventListener(*this);
        pCancelButton->AddActionEventListener(*this);

diff --git a/src/StMemoryForm.cpp b/src/StMemoryForm.cpp
index cce680d..16a195d 100644 (file)
--- a/src/StMemoryForm.cpp
+++ b/src/StMemoryForm.cpp
@@ -149,7 +149,7 @@ MemoryForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -190,7 +190,7 @@ MemoryForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StMemoryStatusForm.cpp b/src/StMemoryStatusForm.cpp
index 6374b6a..4447431 100644 (file)
--- a/src/StMemoryStatusForm.cpp
+++ b/src/StMemoryStatusForm.cpp
@@ -197,7 +197,7 @@ MemoryStatusForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -312,7 +312,7 @@ MemoryStatusForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -338,7 +338,7 @@ MemoryStatusForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        
                pSecondLabel->SetTextColor(COLOR_SUB_TEXT);
 
-               pItem->AddControl(*pSecondLabel);
+               pItem->AddControl(pSecondLabel);
                relativeLayout.SetMargin(*pSecondLabel, itemSubRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StMoreConnectivityForm.cpp b/src/StMoreConnectivityForm.cpp
index d1d1b79..86ff3b5 100644 (file)
--- a/src/StMoreConnectivityForm.cpp
+++ b/src/StMoreConnectivityForm.cpp
@@ -177,7 +177,7 @@ MoreConnectivityForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -287,7 +287,7 @@ MoreConnectivityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->Construct(itemLabelRect, itemText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, itemLabelRect.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -300,7 +300,7 @@ MoreConnectivityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
                pLabel->SetBackgroundBitmap(*pBitmap);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
 
                pLabel = new (std::nothrow) Label();
                pLabel->Construct(itemIconLabelRect, itemText);
@@ -308,7 +308,7 @@ MoreConnectivityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, itemIconLabelRect.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -322,7 +322,7 @@ MoreConnectivityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                        pLabel->SetTextColor(COLOR_SUB_TEXT);
 
-                       pItem->AddControl(*pLabel);
+                       pItem->AddControl(pLabel);
                        relativeLayout.SetMargin(*pLabel, itemSecondLineTextRect.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StMoreSystemForm.cpp b/src/StMoreSystemForm.cpp
index 4aca209..ac3b4ea 100644 (file)
--- a/src/StMoreSystemForm.cpp
+++ b/src/StMoreSystemForm.cpp
@@ -166,7 +166,7 @@ MoreSystemForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -266,7 +266,7 @@ MoreSystemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                if (style == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING)
                {
                        relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
@@ -286,7 +286,7 @@ MoreSystemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
                pLabel->SetBackgroundBitmap(*pBitmap);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
 
                pLabel = new (std::nothrow) Label();
                pLabel->Construct(itemRectLabel, itemText);
@@ -294,7 +294,7 @@ MoreSystemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                if (style == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING)
                {
                        relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);

diff --git a/src/StNetworkForm.cpp b/src/StNetworkForm.cpp
index 02f113a..f53e66a 100644 (file)
--- a/src/StNetworkForm.cpp
+++ b/src/StNetworkForm.cpp
@@ -252,7 +252,7 @@ NetworkForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -383,7 +383,7 @@ NetworkForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        if (style == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING)
        {
                relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);

diff --git a/src/StNfcForm.cpp b/src/StNfcForm.cpp
index b9143c9..338fa78 100644 (file)
--- a/src/StNfcForm.cpp
+++ b/src/StNfcForm.cpp
@@ -260,7 +260,7 @@ NfcForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        pItem->SetEnabled(false);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 0, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -352,7 +352,7 @@ NfcForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -378,7 +378,7 @@ NfcForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pSecondLineLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pSecondLineLabel->SetTextColor(COLOR_SUB_TEXT);
 
-               pItem->AddControl(*pSecondLineLabel);
+               pItem->AddControl(pSecondLineLabel);
                relativeLayout.SetMargin(*pSecondLineLabel, itemSubRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pSecondLineLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pSecondLineLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StNfcPredefinedItemForm.cpp b/src/StNfcPredefinedItemForm.cpp
index 771aca3..612bdce 100644 (file)
--- a/src/StNfcPredefinedItemForm.cpp
+++ b/src/StNfcPredefinedItemForm.cpp
@@ -173,7 +173,7 @@ NfcPredefinedItemForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, style);\r
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);\r
 \r
-       pItem->AddControl(*pLabel);\r
+       pItem->AddControl(pLabel);\r
        pItem->SetEnabled(false);\r
        relativeLayout.SetMargin(*pLabel, itemMainText.x, 0, 0, 0);\r
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);\r
@@ -240,7 +240,7 @@ NfcPredefinedItemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);\r
        pLabel->SetTextColor(COLOR_MAIN_TEXT);\r
 \r
-       pItem->AddControl(*pLabel);\r
+       pItem->AddControl(pLabel);\r
        if (groupIndex == ID_GROUP_NFC_PREDEFINED_ITEM)\r
        {\r
                relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);\r
@@ -273,7 +273,7 @@ NfcPredefinedItemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pSecondLineLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);\r
                pSecondLineLabel->SetTextColor(COLOR_SUB_TEXT);\r
 \r
-               pItem->AddControl(*pSecondLineLabel);\r
+               pItem->AddControl(pSecondLineLabel);\r
                relativeLayout.SetMargin(*pSecondLineLabel, itemSubRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);\r
                relativeLayout.SetRelation(*pSecondLineLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);\r
                relativeLayout.SetRelation(*pSecondLineLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);\r

diff --git a/src/StPrivacyDetailForm.cpp b/src/StPrivacyDetailForm.cpp
index 3a9729c..33ff172 100644 (file)
--- a/src/StPrivacyDetailForm.cpp
+++ b/src/StPrivacyDetailForm.cpp
@@ -198,7 +198,7 @@ PrivacyDetailForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -238,7 +238,7 @@ PrivacyDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_LEFT_MARGIN, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StPrivacyForm.cpp b/src/StPrivacyForm.cpp
index 77a198f..8e2b082 100644 (file)
--- a/src/StPrivacyForm.cpp
+++ b/src/StPrivacyForm.cpp
@@ -287,7 +287,7 @@ PrivacyForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -333,7 +333,7 @@ PrivacyForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
 
@@ -344,7 +344,7 @@ PrivacyForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_SUB_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemSubRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -521,8 +521,8 @@ PrivacyForm::UpdateTableViewAndNoContent(void)
                        pLabelNoContents->SetTextColor(textColor);
                        pLabelNoContents->SetText(labelText);
 
-                       AddControl(*pLabel);
-                       AddControl(*pLabelNoContents);
+                       AddControl(pLabel);
+                       AddControl(pLabelNoContents);
                }
        }
 }

diff --git a/src/StRegionForm.cpp b/src/StRegionForm.cpp
index 15b3b30..3147535 100644 (file)
--- a/src/StRegionForm.cpp
+++ b/src/StRegionForm.cpp
@@ -83,7 +83,7 @@ LocaleRegionForm::CreateTableView(void)
        __pTableView->Construct(tableViewBounds, true, TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT);
        __pTableView->SetItemProvider(this);
 
-       AddControl(*__pTableView);
+       AddControl(__pTableView);
 
        __pTableView->AddGroupedTableViewItemEventListener(*this);
        
@@ -191,7 +191,7 @@ LocaleRegionForm::CreateSearchBar(void)
        __pSearchBar->AddKeypadEventListener(*this);
        __pSearchBar->SetContentAreaSize(Dimension(0, 0));
 
-       AddControl(*__pSearchBar);
+       AddControl(__pSearchBar);
 }
 
 result
@@ -298,7 +298,7 @@ LocaleRegionForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -353,7 +353,7 @@ LocaleRegionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(FontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
 
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StResetForm.cpp b/src/StResetForm.cpp
index 0524c40..c7aee1b 100644 (file)
--- a/src/StResetForm.cpp
+++ b/src/StResetForm.cpp
@@ -186,7 +186,7 @@ ResetterForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -248,7 +248,7 @@ ResetterForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StResetSettingForm.cpp b/src/StResetSettingForm.cpp
index ee60029..a7d945a 100644 (file)
--- a/src/StResetSettingForm.cpp
+++ b/src/StResetSettingForm.cpp
@@ -124,7 +124,7 @@ ResetterSettingForm::CreateTableView(void)
        __pCheckButton->SetActionId(IDA_BUTTON_CHECKED, IDA_BUTTON_UNCHECKED, IDA_BUTTON_SELECTED);
        __pCheckButton->SetText(itemMainText);
 
-       AddControl(*__pCheckButton);
+       AddControl(__pCheckButton);
 
        __pCheckButton->AddActionEventListener(*this);
 
@@ -132,7 +132,7 @@ ResetterSettingForm::CreateTableView(void)
        __pTableView->Construct(bounds, true, TABLE_VIEW_SCROLL_BAR_STYLE_FIXED);
        __pTableView->SetItemProvider(this);
 
-       AddControl(*__pTableView);
+       AddControl(__pTableView);
 
        __pTableView->AddGroupedTableViewItemEventListener(*this);
 
@@ -145,7 +145,7 @@ ResetterSettingForm::CreateTableView(void)
        __pLabelItemCount->SetTextConfig(FONT_SIZE_POPUP_TEXT, LABEL_TEXT_STYLE_BOLD);
        __pLabelItemCount->SetTextColor(COLOR_MAIN_TEXT);
 
-       AddControl(*__pLabelItemCount);
+       AddControl(__pLabelItemCount);
 
        __pLabelItemCount->SetBackgroundColor(COLOR_BG_CHECKBOX);
        __pLabelItemCount->SetShowState(false);
@@ -346,7 +346,7 @@ ResetterSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
 
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);

diff --git a/src/StScreenTypeForm.cpp b/src/StScreenTypeForm.cpp
index e7e99e9..4ef9ec8 100644 (file)
--- a/src/StScreenTypeForm.cpp
+++ b/src/StScreenTypeForm.cpp
@@ -201,7 +201,7 @@ ScreenTypeForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -241,7 +241,7 @@ ScreenTypeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_LEFT_MARGIN, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -603,8 +603,8 @@ ScreenTypeForm::UpdateTableViewAndNoContent(void)
                        pLabelNoContents->SetTextColor(textColor);
                        pLabelNoContents->SetText(labelText);
 
-                       AddControl(*pLabel);
-                       AddControl(*pLabelNoContents);
+                       AddControl(pLabel);
+                       AddControl(pLabelNoContents);
                }
        }
 }

diff --git a/src/StSecurityForm.cpp b/src/StSecurityForm.cpp
index 5ef04e4..183526f 100644 (file)
--- a/src/StSecurityForm.cpp
+++ b/src/StSecurityForm.cpp
@@ -268,7 +268,7 @@ SecurityForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(colorText);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -381,7 +381,7 @@ SecurityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
 
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);

diff --git a/src/StSoundsForm.cpp b/src/StSoundsForm.cpp
index 8e10177..4a6feba 100644 (file)
--- a/src/StSoundsForm.cpp
+++ b/src/StSoundsForm.cpp
@@ -379,7 +379,7 @@ SoundsForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(colorText);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -474,7 +474,7 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
                        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-                       pItem->AddControl(*pLabel);
+                       pItem->AddControl(pLabel);
                        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -505,7 +505,7 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
                        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-                       pItem->AddControl(*pLabel);
+                       pItem->AddControl(pLabel);
                        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -565,7 +565,7 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        delete pBitmapSoundMin;
                        delete pBitmapSoundMax;
 
-                       pItem->AddControl(*pSlider);
+                       pItem->AddControl(pSlider);
                        pItem->SetIndividualSelectionEnabled(pSlider, true);
 
                        relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -609,7 +609,7 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
                        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-                       pItem->AddControl(*pLabel);
+                       pItem->AddControl(pLabel);
                }
        }
 
@@ -671,7 +671,7 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        delete pBitmapSoundMin;
                        delete pBitmapSoundMax;
 
-                       pItem->AddControl(*pSlider);
+                       pItem->AddControl(pSlider);
                        pItem->SetIndividualSelectionEnabled(pSlider, true);
 
                        relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -688,7 +688,7 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
                        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-                       pItem->AddControl(*pLabel);
+                       pItem->AddControl(pLabel);
                }
        }
 

diff --git a/src/StTimeZoneForm.cpp b/src/StTimeZoneForm.cpp
index b8bdaa9..90336b3 100644 (file)
--- a/src/StTimeZoneForm.cpp
+++ b/src/StTimeZoneForm.cpp
@@ -147,7 +147,7 @@ TimeZoneForm::CreateTableView(void)
        __pTableView->Construct(tableViewBounds, true, TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT);
        __pTableView->SetItemProvider(this);
 
-       AddControl(*__pTableView);
+       AddControl(__pTableView);
 
        __pTableView->AddGroupedTableViewItemEventListener(*this);
 
@@ -183,7 +183,7 @@ TimeZoneForm::OnInitializing(void)
        __pSearchBar->AddKeypadEventListener(*this);
        __pSearchBar->SetContentAreaSize(Dimension(0, 0));
 
-       AddControl(*__pSearchBar);
+       AddControl(__pSearchBar);
 
        CreateTableView();
        CreateFooter();
@@ -279,7 +279,7 @@ TimeZoneForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
        pItem->SetEnabled(false);
 
@@ -335,7 +335,7 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
 
                relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
@@ -395,8 +395,8 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pSecLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pSecLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               pItem->AddControl(*pLabel);
-               pItem->AddControl(*pSecLabel);
+               pItem->AddControl(pLabel);
+               pItem->AddControl(pSecLabel);
 
                relativeLayout.SetHorizontalFitPolicy(*pSecLabel, FIT_POLICY_FIXED);
                relativeLayout.SetRelation(*pSecLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -410,7 +410,7 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_SUB_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, itemSubRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StWallpaperAlbumListDetailForm.cpp b/src/StWallpaperAlbumListDetailForm.cpp
index 1ebd8ec..68c7bb1 100644 (file)
--- a/src/StWallpaperAlbumListDetailForm.cpp
+++ b/src/StWallpaperAlbumListDetailForm.cpp
@@ -138,8 +138,8 @@ WallpaperAlbumListDetailForm::UpdateIconListView(void)
                        pLabelNoContents->SetTextColor(textColor);
                        pLabelNoContents->SetText(labelText);
 
-                       AddControl(*pLabel);
-                       AddControl(*pLabelNoContents);
+                       AddControl(pLabel);
+                       AddControl(pLabelNoContents);
                }
        }
 }
@@ -385,7 +385,7 @@ WallpaperAlbumListDetailForm::CreateIconListView(void)
        __pIconListView->SetItemBorderStyle(ICON_LIST_VIEW_ITEM_BORDER_STYLE_NONE);
        __pIconListView->AddIconListViewItemEventListener(*this);
 
-       AddControl(*__pIconListView);
+       AddControl(__pIconListView);
 
        Invalidate(true);
 }

diff --git a/src/StWallpaperAlbumListForm.cpp b/src/StWallpaperAlbumListForm.cpp
index 87f1e69..3a82bce 100644 (file)
--- a/src/StWallpaperAlbumListForm.cpp
+++ b/src/StWallpaperAlbumListForm.cpp
@@ -223,7 +223,7 @@ WallpaperAlbumListForm::CreateIconListView(void)
        __pIconListView->SetItemBorderStyle(ICON_LIST_VIEW_ITEM_BORDER_STYLE_NONE);
        __pIconListView->AddIconListViewItemEventListener(*this);
 
-       AddControl(*__pIconListView);
+       AddControl(__pIconListView);
 
        Invalidate(true);
 }
@@ -332,8 +332,8 @@ WallpaperAlbumListForm::UpdateIconListView(void)
                        pLabelNoContents->SetTextColor(textColor);
                        pLabelNoContents->SetText(labelText);
 
-                       AddControl(*pLabel);
-                       AddControl(*pLabelNoContents);
+                       AddControl(pLabel);
+                       AddControl(pLabelNoContents);
                }
        }
 }

diff --git a/src/StWallpaperForm.cpp b/src/StWallpaperForm.cpp
index 5ec3cf2..c33abf8 100644 (file)
--- a/src/StWallpaperForm.cpp
+++ b/src/StWallpaperForm.cpp
@@ -148,7 +148,7 @@ WallpaperForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -207,7 +207,7 @@ WallpaperForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, 0, 0, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StWallpaperImageSelectForm.cpp b/src/StWallpaperImageSelectForm.cpp
index e53c913..dbeaf16 100644 (file)
--- a/src/StWallpaperImageSelectForm.cpp
+++ b/src/StWallpaperImageSelectForm.cpp
@@ -301,7 +301,7 @@ WallpaperImageSelectForm::CreateImage(void)
        pLabel->SetName(NO_CONTENTS);
        pLabel->SetBackgroundBitmap(*pBitmap);
 
-       AddControl(*pLabel);
+       AddControl(pLabel);
 }
 
 void

diff --git a/src/StWifiApDetailForm.cpp b/src/StWifiApDetailForm.cpp
index 4521850..4e2c962 100644 (file)
--- a/src/StWifiApDetailForm.cpp
+++ b/src/StWifiApDetailForm.cpp
@@ -300,7 +300,7 @@ WifiApDetailForm::CreateGroupItem(int groupIndex, int itemWidth)
                relativeLayout.SetMargin(*pLabel, itemRectLable.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
        }
 
        return pItem;
@@ -571,7 +571,7 @@ WifiApDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -608,7 +608,7 @@ WifiApDetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pSecondLabel->SetTextColor(COLOR_SUB_TEXT);
                pSecondLabel->SetName(itemSetname);
 
-               pItem->AddControl(*pSecondLabel);
+               pItem->AddControl(pSecondLabel);
                relativeLayout.SetMargin(*pSecondLabel, itemRectSecondLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -731,7 +731,7 @@ WifiApDetailForm::CreateForgetApPopup(void)
        pPopupTextLabel->SetTextConfig(FONT_SIZE_POPUP_TEXT, LABEL_TEXT_STYLE_NORMAL);
        pPopupTextLabel->SetTextColor(COLOR_POPUP_TEXT);
 
-       __pForgetAPPoup->AddControl(*pPopupTextLabel);
+       __pForgetAPPoup->AddControl(pPopupTextLabel);
 
        itemRect = Rectangle(X_CONFIRM_POPUP_FORGET_AP_LHS_BUTTON
                                                , Y_CONFIRM_POPUP_FORGET_AP_LHS_BUTTON
@@ -744,7 +744,7 @@ WifiApDetailForm::CreateForgetApPopup(void)
        pLhsButton->Construct(itemRect, itemText);
        pLhsButton->SetActionId(IDA_FORGET_AP_POPUP_LHS_BUTTON);
 
-       __pForgetAPPoup->AddControl(*pLhsButton);
+       __pForgetAPPoup->AddControl(pLhsButton);
 
        itemRect = Rectangle(X_CONFIRM_POPUP_FORGET_AP_RHS_BUTTON
                                                , Y_CONFIRM_POPUP_FORGET_AP_RHS_BUTTON
@@ -757,7 +757,7 @@ WifiApDetailForm::CreateForgetApPopup(void)
        pRhsButton->Construct(itemRect, itemText);
        pRhsButton->SetActionId(IDA_FORGET_AP_POPUP_RHS_BUTTON);
 
-       __pForgetAPPoup->AddControl(*pRhsButton);
+       __pForgetAPPoup->AddControl(pRhsButton);
 
        pLhsButton->AddActionEventListener(*this);
        pRhsButton->AddActionEventListener(*this);

diff --git a/src/StWifiConnectionForm.cpp b/src/StWifiConnectionForm.cpp
index 348130d..ae9215d 100644 (file)
--- a/src/StWifiConnectionForm.cpp
+++ b/src/StWifiConnectionForm.cpp
@@ -185,7 +185,7 @@ WifiConnectionForm::CreateGroupItem(int groupIndex, int itemWidth)
                pLabel->SetTextConfig(itemLableTextSize, style);
                pLabel->SetTextColor(itemLableTextColor);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, itemRectLable.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -344,7 +344,7 @@ WifiConnectionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(itemLableTextSize , LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(itemLableTextColor);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                if (style == TABLE_VIEW_ANNEX_STYLE_DETAILED)
                {
                        relativeLayout.SetMargin(*pLabel, itemRectLable.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON, 0, 0);

diff --git a/src/StWifiDirectAboutForm.cpp b/src/StWifiDirectAboutForm.cpp
index 853c47c..7ddaba3 100644 (file)
--- a/src/StWifiDirectAboutForm.cpp
+++ b/src/StWifiDirectAboutForm.cpp
@@ -96,7 +96,7 @@ WifiDirectAboutForm::CreateHelpText(const Rectangle& bounds)
        pLabel->SetTextConfig(FONT_SIZE_MAIN_TEXT, LABEL_TEXT_STYLE_BOLD);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       AddControl(*pLabel);
+       AddControl(pLabel);
 }
 
 void

diff --git a/src/StWifiDirectConnectionForm.cpp b/src/StWifiDirectConnectionForm.cpp
index 1d91ec0..40bb48e 100644 (file)
--- a/src/StWifiDirectConnectionForm.cpp
+++ b/src/StWifiDirectConnectionForm.cpp
@@ -154,7 +154,7 @@ WifiDirectConnectionForm::CreateGroupText(void)
        pLabel->SetTextConfig(FONT_SIZE_MAIN_TEXT, LABEL_TEXT_STYLE_BOLD);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       AddControl(*pLabel);
+       AddControl(pLabel);
 }
 
 void
@@ -183,7 +183,7 @@ WifiDirectConnectionForm::CreateTableView(void)
        __pCheckButton->SetActionId(IDA_WIFI_DIRECT_CONNECTION_SELECT_ALL_GROUP_ITEM,
                                                                IDA_WIFI_DIRECT_CONNECTION_UNSELECT_ALL_GROUP_ITEM, IDA_WIFI_DIRECT_CONNECTION_SELECTED_GROUP_ITEM);
 
-       AddControl(*__pCheckButton);
+       AddControl(__pCheckButton);
 
        __pCheckButton->AddActionEventListener(*this);
        __pCheckButton->SetColor(CHECK_BUTTON_STATUS_NORMAL, COLOR_BG_CHECKBOX);
@@ -192,7 +192,7 @@ WifiDirectConnectionForm::CreateTableView(void)
        __pTableView->Construct(bounds, true, TABLE_VIEW_SCROLL_BAR_STYLE_FIXED);
        __pTableView->SetItemProvider(this);
 
-       AddControl(*__pTableView);
+       AddControl(__pTableView);
 
        __pTableView->AddGroupedTableViewItemEventListener(*this);
 
@@ -207,7 +207,7 @@ WifiDirectConnectionForm::CreateTableView(void)
        __pLabelItemCount->SetBackgroundColor(COLOR_BG_CHECKBOX);
        __pLabelItemCount->SetShowState(false);
 
-       AddControl(*__pLabelItemCount);
+       AddControl(__pLabelItemCount);
        RelativeLayout* pRelativeLayout = dynamic_cast<RelativeLayout*>(this->GetLayoutN());
        if (pRelativeLayout != null)
        {
@@ -273,7 +273,7 @@ WifiDirectConnectionForm::SetHandlerInProgressAnimation(void)
        __pAnimation->AddAnimationEventListener(*this);
        __pAnimation->SetShowState(false);
 
-       AddControl(*__pAnimation);
+       AddControl(__pAnimation);
 }
 
 void
@@ -447,7 +447,7 @@ WifiDirectConnectionForm::CreateItem(int groupIndex, int itemIndex, int itemWidt
        pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
        pLabel->SetBackgroundBitmap(*pBitmap);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
 
        pLabel = new (std::nothrow) Label();
        pLabel->Construct(itemIconLabelRect, itemText);
@@ -455,7 +455,7 @@ WifiDirectConnectionForm::CreateItem(int groupIndex, int itemIndex, int itemWidt
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_BOLD);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemIconLabelRect.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);

diff --git a/src/StWifiDirectForm.cpp b/src/StWifiDirectForm.cpp
index 5e607b3..b2ababd 100644 (file)
--- a/src/StWifiDirectForm.cpp
+++ b/src/StWifiDirectForm.cpp
@@ -556,7 +556,7 @@ WifiDirectForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
        pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -789,7 +789,7 @@ WifiDirectForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pButton->SetActionId(buttonActionId);
                pButton->AddActionEventListener(*this);
 
-               pItem->AddControl(*pButton);
+               pItem->AddControl(pButton);
        }
        else
        {
@@ -801,7 +801,7 @@ WifiDirectForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
                        pLabel->SetBackgroundBitmap(*pBitmap);
 
-                       pItem->AddControl(*pLabel);
+                       pItem->AddControl(pLabel);
 
                        delete pBitmap;
                }
@@ -812,7 +812,7 @@ WifiDirectForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -825,7 +825,7 @@ WifiDirectForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        pSecondLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                        pSecondLabel->SetTextColor(COLOR_SUB_TEXT);
 
-                       pItem->AddControl(*pSecondLabel);
+                       pItem->AddControl(pSecondLabel);
                        relativeLayout.SetMargin(*pLabel, itemRectSecondLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -838,7 +838,7 @@ WifiDirectForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                                pAnimation->SetRepeatCount(WIFI_DIRECT_DEFAULT_COUNT);
 
-                               pItem->AddControl(*pAnimation);
+                               pItem->AddControl(pAnimation);
 
                                SetHandlerInProgressAnimation(pAnimation);
                                pAnimation = null;

diff --git a/src/StWifiForm.cpp b/src/StWifiForm.cpp
index db33736..18024a2 100644 (file)
--- a/src/StWifiForm.cpp
+++ b/src/StWifiForm.cpp
@@ -372,7 +372,7 @@ WifiForm::CreateGroupItem(int groupIndex, int itemWidth)
        pLabel->SetTextConfig(itemLabelTextSize, style);
        pLabel->SetTextColor(itemLabelTextColor);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -575,7 +575,7 @@ WifiForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
                pLabel->SetBackgroundBitmap(*pBitmap);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
 
                delete pBitmap;
        }
@@ -601,7 +601,7 @@ WifiForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
-               pItem->AddControl(*pLabel);
+               pItem->AddControl(pLabel);
                if (style == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING)
                {
                        relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
@@ -635,7 +635,7 @@ WifiForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pSecondLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
                pSecondLabel->SetTextColor(COLOR_SUB_TEXT);
 
-               pItem->AddControl(*pSecondLabel);
+               pItem->AddControl(pSecondLabel);
                relativeLayout.SetMargin(*pSecondLabel, itemRectSecondLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pSecondLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -653,7 +653,7 @@ WifiForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        return pItem;
                }
 
-               pItem->AddControl(*pButton);
+               pItem->AddControl(pButton);
                relativeLayout.SetMargin(*pButton, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pButton, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pButton, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);