Fix nabi issue(N_SE-34165) and code clean up

Change-Id: I3b4078cb105ba5e89c513227f981a6edb06e40dd
Signed-off-by: TaeHo Choi <thanks.choi@samsung.com>

diff --git a/src/StAboutPhoneForm.cpp b/src/StAboutPhoneForm.cpp
index 738bcd0..978aa16 100644 (file)
--- a/src/StAboutPhoneForm.cpp
+++ b/src/StAboutPhoneForm.cpp
@@ -177,7 +177,7 @@ PhoneInfoForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
                        wchar_t element;
                        __pEditField->GetText().GetCharAt(i, element);
 
-                       if (element != ISSPACE )
+                       if (element != ISSPACE)
                        {
                                showEmptyMessageBox = false;
                                break;
@@ -882,7 +882,7 @@ PhoneInfoForm::RefreshTableViewItem(int groupIndex)
                wchar_t element;
                __pEditField->GetText().GetCharAt(i, element);
 
-               if (element != ISSPACE )
+               if (element != ISSPACE)
                {
                        showEmptyMessageBox = false;
                        break;

diff --git a/src/StAppSettingForm.cpp b/src/StAppSettingForm.cpp
index a9d6789..3e7cb67 100644 (file)
--- a/src/StAppSettingForm.cpp
+++ b/src/StAppSettingForm.cpp
@@ -34,8 +34,6 @@ using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
 static const int APPSETTING_DEFAULT_COUNT = 1;
-static const int LIMIT_EDITFIELD = 30;
-static const int STRING_SIZE_LIMIT = 10;
 static const int ID_APPSETTTING_ARGUMENT_DEFAULT = 0;
 static const int ID_APPSETTTING_ARGUMENT_APP_ID = 1;
 static const int ID_APPSETTTING_ARGUMENT_COUNT = 2;
@@ -56,6 +54,8 @@ static const wchar_t* ID_APPSETTING_ATTRIBUTE_TYPE_TITLE = L"title";
 static const wchar_t* ID_APPSETTING_ATTRIBUTE_TYPE_MIN = L"min";
 static const wchar_t* ID_APPSETTING_ATTRIBUTE_TYPE_MAX = L"max";
 static const wchar_t* ID_APPSETTING_ATTRIBUTE_TYPE_VALUE = L"value";
+static const wchar_t* ID_APPSETTING_ATTRIBUTE_TYPE_MIN_LENGTH = L"minlength";
+static const wchar_t* ID_APPSETTING_ATTRIBUTE_TYPE_MAX_LENGTH = L"maxlength";
 
 static const int ITEM_WIDTH_GAP = 100;
 static const int H_RESIZE_LANDSCAPE_CLIPBOARD = 292;
@@ -1034,15 +1034,67 @@ AppSettingForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentScen
 void
 AppSettingForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 {
-       SceneManager* pSceneManager = SceneManager::GetInstance();
-       AppAssert(pSceneManager);
+       bool errorStatus = false;
+       int currentLength = 0;
+       int stringLengthMax = 0;
+       int stringLengthMin = 0;
 
        if (__pIOAppSetting != null)
        {
-               __pIOAppSetting->UpdateChangedValue();
-       }
+               Node* pRootNode = null;
+               Enumerator* pEnum = null;
+               pRootNode = __pAppSettingManager->GetAppSettingRootNode(__appId);
+               pEnum = pRootNode->CreateEnumerator();
+               while (pEnum->MoveNext() == E_SUCCESS)
+               {
+                       Node* pCurrent = static_cast<Node*>(pEnum->GetCurrentObject());
+                       if (pCurrent->GetType().Equals(ID_APPSETTING_ITEM_TYPE_STRING, false))
+                       {
+                               String* itemText = pCurrent->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_VALUE);
+                               String* pMinLength = pCurrent->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_MIN_LENGTH);
+                               String* pMaxLength = pCurrent->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_MAX_LENGTH);
+
+                               currentLength = itemText->GetLength();
+                               Integer::Parse(*pMinLength, stringLengthMin);
+                               Integer::Parse(*pMaxLength, stringLengthMax);
+
+                               delete itemText;
+                               delete pMinLength;
+                               delete pMaxLength;
+
+                               if ((currentLength > stringLengthMax) || (currentLength < stringLengthMin))
+                               {
+                                       if (currentLength > stringLengthMax)
+                                       {
+                                               AppLogDebug("value length(%d) greater than maximum range(%d), show popup", currentLength, stringLengthMax);
+                                       }
+                                       else
+                                       {
+                                               AppLogDebug("value length(%d) smaller than minimum range(%d), show popup", currentLength, stringLengthMin);
+                                       }
+
+                                       MessageBox messageBox;
+                                       int result = E_SUCCESS;
+
+                                       messageBox.Construct(ResourceManager::GetString(L"IDS_EMAIL_POP_ALERT"), ResourceManager::GetString(L"IDS_COM_POP_FAILED"), MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_2_SEC);
+                                       messageBox.ShowAndWait(result);
+
+                                       errorStatus = true;
+                                       break;
+                               }
+                       }
+               }
+               delete pEnum;
+
+               if (errorStatus == false)
+               {
+                       __pIOAppSetting->UpdateChangedValue();
+                       SceneManager* pSceneManager = SceneManager::GetInstance();
+                       AppAssert(pSceneManager);
 
-       pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), null);
+                       pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), null);
+               }
+       }
 }
 
 int
@@ -1297,6 +1349,24 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        else if ((pItemNode->GetType()).Equals(ID_APPSETTING_ITEM_TYPE_STRING, false))
        {
                itemRectangle.x = 0;
+               int stringLengthMin = 0;
+               int stringLengthMax = 0;
+
+               String minLength = *static_cast<String*>(pItemNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_MIN_LENGTH));
+               if (minLength != null)
+               {
+                       Integer::Parse(minLength, stringLengthMin);
+
+                       AppLogDebug("max String size [%d]", stringLengthMin);
+               }
+
+               String maxLength = *static_cast<String*>(pItemNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_MAX_LENGTH));
+               if (maxLength != null)
+               {
+                       Integer::Parse(maxLength, stringLengthMax);
+
+                       AppLogDebug("max String size [%d]", stringLengthMax);
+               }
 
                RelativeLayout relativeLayout;
                relativeLayout.Construct();
@@ -1316,7 +1386,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                String* secondLine = pItemNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_VALUE);
 
                itemRectangle.x = X_GROUP_DEFAULT;
-               pEditField->Construct(itemRectangle, EDIT_FIELD_STYLE_NORMAL, INPUT_STYLE_OVERLAY, EDIT_FIELD_TITLE_STYLE_TOP, true, LIMIT_EDITFIELD, GROUP_STYLE_NONE);
+               pEditField->Construct(itemRectangle, EDIT_FIELD_STYLE_NORMAL, INPUT_STYLE_OVERLAY, EDIT_FIELD_TITLE_STYLE_TOP, true, stringLengthMax, GROUP_STYLE_NONE);
                pEditField->SetGuideText((*itemText).GetPointer());
                pEditField->SetTitleText((*itemText).GetPointer());
                pEditField->SetText((*secondLine).GetPointer());
@@ -1334,7 +1404,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pEditField->AddKeypadEventListener(*this);
 
                pItem->AddControl(*pEditField);
-               pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT ,TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED);
+               pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED);
                pItem->SetIndividualSelectionEnabled(pEditField, true);
 
                relativeLayout.SetMargin(*pEditField, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
@@ -1364,7 +1434,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                if (!((pCurrentIEnumerator != null)
                        && (pCurrentIEnumerator->MoveNext() == E_SUCCESS)))
                {
-                       AppLogDebug("Expandlist & remove");
+                       AppLogDebug("Expandlist has no expandItems & remove");
                        delete pCurrentIEnumerator;
                        return null;
                }

diff --git a/src/StBluetoothForm.cpp b/src/StBluetoothForm.cpp
index 3863f89..c62d8ea 100644 (file)
--- a/src/StBluetoothForm.cpp
+++ b/src/StBluetoothForm.cpp
@@ -871,16 +871,20 @@ BluetoothForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTa
                                        ModifyTableViewItem(groupIndex, itemIndex);
                                        break;
                                }
+                               result r = __pBluetoothPresentationModelInstance->PairToFoundBluetoothDeviceAt(itemIndex);
+                               if (IsFailed(r))
+                               {
+                                       AppLogDebug("BluetoothPairToFoundDeviceList fail [%s]", GetErrorMessage(r));
+                                       break;
+                               }
+
+                               SetStateChangedTableviewItemTag(groupIndex, itemIndex);
+                               ModifyTableViewItem(groupIndex, itemIndex);
                        }
-                       result r = __pBluetoothPresentationModelInstance->PairToFoundBluetoothDeviceAt(itemIndex);
-                       if (IsFailed(r))
+                       else
                        {
-                               AppLogDebug("BluetoothPairToFoundDeviceList fail [%s]", GetErrorMessage(r));
-                               break;
+                               AppLogDebug("__pBluetoothPresentationModelInstance is null.");
                        }
-
-                       SetStateChangedTableviewItemTag(groupIndex, itemIndex);
-                       ModifyTableViewItem(groupIndex, itemIndex);
                }
                break;
 

diff --git a/src/StBluetoothPresentationModel.cpp b/src/StBluetoothPresentationModel.cpp
index dfab37f..9b8f8fb 100644 (file)
--- a/src/StBluetoothPresentationModel.cpp
+++ b/src/StBluetoothPresentationModel.cpp
@@ -390,7 +390,6 @@ BluetoothPresentationModel::PairToFoundBluetoothDeviceAt(int index)
 result
 BluetoothPresentationModel::UnpairToPairedBluetoothDeviceAt(int index)
 {
-
        if (__pPairedRemoteDeviceList == null)
        {
                AppLogDebug("__pPairedRemoteDeviceList is null");

diff --git a/src/StCertificatePresentationModel.cpp b/src/StCertificatePresentationModel.cpp
index 6f0bda6..ed612b2 100644 (file)
--- a/src/StCertificatePresentationModel.cpp
+++ b/src/StCertificatePresentationModel.cpp
@@ -229,7 +229,7 @@ CertificatePresentationModel::GetCertificateFromCertificateStoreN(int i)
 
        if (IsFailed(r) || pICertificate == null)
        {
-               AppLogDebug("__pCertificateList->GetAt(%d) failed(%s) or pICertificate is null",i , GetErrorMessage(r));
+               AppLogDebug("__pCertificateList->GetAt(%d) failed(%s) or pICertificate is null", i, GetErrorMessage(r));
                return null;
        }
 

diff --git a/src/StCertificateTrustedRootForm.cpp b/src/StCertificateTrustedRootForm.cpp
index 6c213ce..2e8c7d9 100644 (file)
--- a/src/StCertificateTrustedRootForm.cpp
+++ b/src/StCertificateTrustedRootForm.cpp
@@ -133,7 +133,7 @@ int
 CertificateTrustedRootForm::GetItemCount(int groupIndex)
 {
        int itemCount = 0;
-       if (groupIndex == 0 )
+       if (groupIndex == 0)
        {
                itemCount = GetTrustedRootCertificateStoreCount();
        }

diff --git a/src/StCertificateUserForm.cpp b/src/StCertificateUserForm.cpp
index e7c859d..f739b40 100644 (file)
--- a/src/StCertificateUserForm.cpp
+++ b/src/StCertificateUserForm.cpp
@@ -134,7 +134,7 @@ CertificateUserForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previou
                RemoveControl(GetControl(0));
        }
 //     RemoveAllControls();
-       if ( GetUserCertificateStoreCount() != 0)
+       if (GetUserCertificateStoreCount() != 0)
        {
                AppLogDebug("GetUserCertificateStoreCount %d", GetUserCertificateStoreCount());
                CreateTableView();

diff --git a/src/StCertificateUserInstallForm.cpp b/src/StCertificateUserInstallForm.cpp
index 4706420..f33985e 100644 (file)
--- a/src/StCertificateUserInstallForm.cpp
+++ b/src/StCertificateUserInstallForm.cpp
@@ -270,7 +270,7 @@ CertificateUserInstallForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Contro
                return;
        }
        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_CERTIFICATE_USER_INSTALL_PASSWORD, SCENE_TRANSITION_ANIMATION_TYPE_LEFT,
-                                                                                                                                       SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY), null);
+                                                                                                                       SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY), null);
 }
 
 int

diff --git a/src/StCertificateUserUnInstallForm.cpp b/src/StCertificateUserUnInstallForm.cpp
index f798f20..eed3fc9 100644 (file)
--- a/src/StCertificateUserUnInstallForm.cpp
+++ b/src/StCertificateUserUnInstallForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -271,7 +271,7 @@ CertificateUserUnInstallForm::OnActionPerformed(const Tizen::Ui::Control& source
                {
                        for (int i = 0; i < GetUserCertificateStoreCount(); i++)
                        {
-                               if (__pTableView->IsItemChecked(0,i) == true)
+                               if (__pTableView->IsItemChecked(0, i) == true)
                                {
                                        ICertificate* pICertificate =__pCertificatePresentationModelInstance->GetCertificateFromCertificateStoreN(0);
                                        if (pICertificate == null)

diff --git a/src/StKeyboardSelectionForm.cpp b/src/StKeyboardSelectionForm.cpp
index f56f707..0658f43 100644 (file)
--- a/src/StKeyboardSelectionForm.cpp
+++ b/src/StKeyboardSelectionForm.cpp
@@ -129,7 +129,7 @@ KeyboardSelectionForm::GetItemCount(int groupIndex)
        {
        case ID_GROUP_KEYBOARD_SOFTWARE:
                {
-                       if ( __pInputMethodInfoList != null)
+                       if (__pInputMethodInfoList != null)
                        {
                                itemCount = __pInputMethodInfoList->GetCount();
                        }

diff --git a/src/StLanguageAndRegionForm.cpp b/src/StLanguageAndRegionForm.cpp
index 59c23c1..c8b09e5 100644 (file)
--- a/src/StLanguageAndRegionForm.cpp
+++ b/src/StLanguageAndRegionForm.cpp
@@ -715,7 +715,7 @@ LocaleForm::CreateGroupItem(int groupIndex, int itemWidth)
                                tmpText.Remove(0, tmpText.GetLength());
                                if (lineCount > 1)
                                {
-                                       tmpHeight = (lineCount+1)*lineHeight;
+                                       tmpHeight = (lineCount + 1) * lineHeight;
                                }
                                else
                                {
@@ -1083,7 +1083,7 @@ LocaleForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupI
                                tempHeight = GetLineheight(tmpText, labelWidth, fontSize, lineCount, lineHeight);
                                if (lineCount > 1)
                                {
-                                       tempHeight = (lineCount+1)*lineHeight;
+                                       tempHeight = (lineCount + 1) * lineHeight;
                                }
                                else
                                {

diff --git a/src/StMainMenuForm.cpp b/src/StMainMenuForm.cpp
index 455bcb7..d99c051 100644 (file)
--- a/src/StMainMenuForm.cpp
+++ b/src/StMainMenuForm.cpp
@@ -340,7 +340,6 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        int fontSize = GetFontSize();
 
        unsigned int itemHeight = 0;
-       bool isTwoLineItemText = false;
        bool isDrawBitmapIcon = true;
        Rectangle itemRectIcon;
        Rectangle itemRectLabel;
@@ -590,20 +589,6 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                relativeLayout.SetMargin(*pLabel, itemRectLabel.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);
-
-               if (isTwoLineItemText)
-               {
-                       pLabel = new (std::nothrow) Label();
-                       pLabel->Construct(itemRectSecondLabel, itemTextTwoLine);
-                       pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-                       pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
-                       pLabel->SetTextColor(COLOR_SUB_TEXT);
-
-                       pItem->AddControl(*pLabel);
-                       relativeLayout.SetMargin(*pLabel, itemRectSecondLabel.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);
-               }
        }
 
        return pItem;

diff --git a/src/StNfcForm.cpp b/src/StNfcForm.cpp
index d0cc900..55c4f32 100644 (file)
--- a/src/StNfcForm.cpp
+++ b/src/StNfcForm.cpp
@@ -52,6 +52,7 @@ static const int NFC_NOT_SUPPORT_PREDEFINED_ITEM_GROUP_COUNT = 2;
 static const int NFC_SUPPORT_PREDEFINED_ITEM_GROUP_COUNT = 4;
 static const int DIVIDE_BY_TWO = 2;
 static const int W_TEXT_GAP = 30;
+static const int H_TEXT_GAP = 20;
 
 NfcForm::NfcForm(void)
        : __pNfcPresentationModelInstance(null)
@@ -204,9 +205,9 @@ NfcForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        case ID_GROUP_NFC_HELP:
                {
-                       yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP / DIVIDE_BY_TWO ;
+                       yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP / DIVIDE_BY_TWO;
                        groupText = ResourceManager::GetString(L"IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS");
-                       itemHeight = GetHeightForStringArea(groupText, itemWidth - W_TEXT_GAP, fontSize);
+                       itemHeight = GetHeightForStringArea(groupText, itemWidth - W_TEXT_GAP, fontSize) + H_TEXT_GAP;
                }
                break;
 
@@ -219,9 +220,9 @@ NfcForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        case ID_GROUP_NFC_PREDEFINED_ITEM_HELP:
                {
-                       yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP / DIVIDE_BY_TWO ;
+                       yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP / DIVIDE_BY_TWO;
                        groupText = ResourceManager::GetString(L"IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG");
-                       itemHeight = GetHeightForStringArea(groupText, itemWidth - W_TEXT_GAP, fontSize);
+                       itemHeight = GetHeightForStringArea(groupText, itemWidth - W_TEXT_GAP, fontSize) + H_TEXT_GAP;
                }
                break;
 
@@ -514,7 +515,7 @@ NfcForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem
        Rectangle itemRect = pItem->GetBounds();
        String groupText = pLabel->GetText();
        int fontSize = GetFontSize();
-       int itemHeight = GetHeightForStringArea(groupText, clientRect.width - W_TEXT_GAP, fontSize);
+       int itemHeight = GetHeightForStringArea(groupText, clientRect.width - W_TEXT_GAP, fontSize) + H_TEXT_GAP;
 
        itemRect.height = itemHeight + H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
 

diff --git a/src/StPrivacyForm.cpp b/src/StPrivacyForm.cpp
index b1989fb..d22c416 100644 (file)
--- a/src/StPrivacyForm.cpp
+++ b/src/StPrivacyForm.cpp
@@ -182,14 +182,14 @@ PrivacyForm::GetUsedPrivacyService(int itemIndex)
                String key = pPrivacyService->GetDisplayName();
 
                StringTokenizer stringTokenizer(key, L"/");
-               while(stringTokenizer.HasMoreTokens() == true)
+               while (stringTokenizer.HasMoreTokens() == true)
                {
                        stringTokenizer.GetNextToken(tokenData);
                }
 
                result.Append(tokenData);
 
-               if (index != (serviceCount-1))
+               if (index != (serviceCount - 1))
                {
                        result.Append(L", ");
                }

diff --git a/src/StTimeZoneForm.cpp b/src/StTimeZoneForm.cpp
index 47c5903..221af6d 100644 (file)
--- a/src/StTimeZoneForm.cpp
+++ b/src/StTimeZoneForm.cpp
@@ -147,7 +147,7 @@ TimeZoneForm::GetTimeZoneList(void)
                        gmtHour = timeZone.GetRawOffset();
 
                        SetTimeZoneLocaleList(new (std::nothrow) TimeZoneData(region, country, gmtHour));
-                       SetTimeZoneLocaleSearchList( new (std::nothrow) TimeZoneData(region, country, gmtHour));
+                       SetTimeZoneLocaleSearchList(new (std::nothrow) TimeZoneData(region, country, gmtHour));
 
                        delete pKey;
                }

diff --git a/src/StWallpaperAlbumListPresentationModel.cpp b/src/StWallpaperAlbumListPresentationModel.cpp
index ddb5be7..54dd200 100644 (file)
--- a/src/StWallpaperAlbumListPresentationModel.cpp
+++ b/src/StWallpaperAlbumListPresentationModel.cpp
@@ -130,7 +130,7 @@ void
 WallpaperAlbumListPresentationModel::CreateInstance(void)
 {
        AppLogDebug("ENTER");
-       __pPresentationModelInstance = new (std::nothrow) WallpaperAlbumListPresentationModel;
+       __pPresentationModelInstance = new (std::nothrow) WallpaperAlbumListPresentationModel();
        result r = __pPresentationModelInstance->Construct();
 
        if (IsFailed(r) == true)

diff --git a/src/StWifiApDetailForm.cpp b/src/StWifiApDetailForm.cpp
index da0e034..1894aa7 100644 (file)
--- a/src/StWifiApDetailForm.cpp
+++ b/src/StWifiApDetailForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -162,7 +162,7 @@ WifiApDetailForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSc
        }
 
        r = InitWifiPresentationModelInstance();
-       if(IsFailed(r))
+       if (IsFailed(r))
        {
                AppLogDebug("InitWifiPresentationModelInstance fail [%s]", GetErrorMessage(r));
                return;
@@ -817,12 +817,12 @@ WifiApDetailForm::GetMajorAuthenticationTypeInWifiRssiValueAtBitmapN(int itemInd
                                pBitmap = ResourceManager::GetBitmapN(IDB_WIFI_RSSI_UNLOCK_03);
                        }
                        else if ((wifiBssInfoRssi <= WIFI_RSSI_DETAIL_MAX)
-                               && (wifiBssInfoRssi > WIFI_RSSI_DETAIL_MID))
+                                       && (wifiBssInfoRssi > WIFI_RSSI_DETAIL_MID))
                        {
                                pBitmap = ResourceManager::GetBitmapN(IDB_WIFI_RSSI_UNLOCK_02);
                        }
                        else if ((wifiBssInfoRssi <= WIFI_RSSI_DETAIL_MID)
-                               && (wifiBssInfoRssi > WIFI_RSSI_DETAIL_MIN))
+                                       && (wifiBssInfoRssi > WIFI_RSSI_DETAIL_MIN))
                        {
                                pBitmap = ResourceManager::GetBitmapN(IDB_WIFI_RSSI_UNLOCK_01);
                        }
@@ -852,12 +852,12 @@ WifiApDetailForm::GetMajorAuthenticationTypeInWifiRssiValueAtBitmapN(int itemInd
                                pBitmap = ResourceManager::GetBitmapN(IDB_WIFI_RSSI_LOCK_03);
                        }
                        else if ((wifiBssInfoRssi <= WIFI_RSSI_DETAIL_MAX)
-                               && (wifiBssInfoRssi > WIFI_RSSI_DETAIL_MID))
+                                       && (wifiBssInfoRssi > WIFI_RSSI_DETAIL_MID))
                        {
                                pBitmap = ResourceManager::GetBitmapN(IDB_WIFI_RSSI_LOCK_02);
                        }
                        else if ((wifiBssInfoRssi <= WIFI_RSSI_DETAIL_MID)
-                               && (wifiBssInfoRssi > WIFI_RSSI_DETAIL_MIN))
+                                       && (wifiBssInfoRssi > WIFI_RSSI_DETAIL_MIN))
                        {
                                pBitmap = ResourceManager::GetBitmapN(IDB_WIFI_RSSI_LOCK_01);
                        }

diff --git a/src/StWifiConnectionForm.cpp b/src/StWifiConnectionForm.cpp
index 90f7814..fde5b5f 100644 (file)
--- a/src/StWifiConnectionForm.cpp
+++ b/src/StWifiConnectionForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -213,7 +213,7 @@ WifiConnectionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        {
        case ID_GROUP_WIFI_EAP_CONNECT_MAIN:
                {
-                       switch(itemIndex)
+                       switch (itemIndex)
                        {
                        case ID_ITEM_WIFI_EAP_CONNECT_EAP_METHOD:
                                {
@@ -303,7 +303,7 @@ WifiConnectionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        default:
                {
-                       switch(itemIndex)
+                       switch (itemIndex)
                        {
                        case ID_ITEM_WIFI_EAP_CONNECT_MAC_ADDRESS:
                                {

diff --git a/src/StWifiDirectConnectionForm.cpp b/src/StWifiDirectConnectionForm.cpp
index afc589f..41454b0 100644 (file)
--- a/src/StWifiDirectConnectionForm.cpp
+++ b/src/StWifiDirectConnectionForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -232,7 +232,7 @@ WifiDirectConnectionForm::CreateInPorgressAnimationFrame(void)
        for (count = 0; count < FRAME_COUNT; count++)
        {
                String searchIconFilePath;
-               searchIconFilePath.Format(searchIconFilePath.GetLength(),IDB_SEARCH_ICON_SIZE_LAGER_IMAGE_PATH_FORMAT, count);
+               searchIconFilePath.Format(searchIconFilePath.GetLength(), IDB_SEARCH_ICON_SIZE_LAGER_IMAGE_PATH_FORMAT, count);
                pBitmap = ResourceManager::GetBitmapN(searchIconFilePath);
                if (pBitmap == null)
                {

diff --git a/src/StWifiForm.cpp b/src/StWifiForm.cpp
index d65a080..4324727 100644 (file)
--- a/src/StWifiForm.cpp
+++ b/src/StWifiForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -827,12 +827,12 @@ WifiForm::GetMajorAuthenticationTypeInWifiRssiValueAtBitmapN(int itemIndex)
                                pBitmap = ResourceManager::GetBitmapN(IDB_WIFI_RSSI_UNLOCK_03);
                        }
                        else if ((wifiBssInfoRssi <= WIFI_RSSI_DETAIL_MAX)
-                               && (wifiBssInfoRssi > WIFI_RSSI_DETAIL_MID))
+                                       && (wifiBssInfoRssi > WIFI_RSSI_DETAIL_MID))
                        {
                                pBitmap = ResourceManager::GetBitmapN(IDB_WIFI_RSSI_UNLOCK_02);
                        }
                        else if ((wifiBssInfoRssi <= WIFI_RSSI_DETAIL_MID)
-                               && (wifiBssInfoRssi > WIFI_RSSI_DETAIL_MIN))
+                                       && (wifiBssInfoRssi > WIFI_RSSI_DETAIL_MIN))
                        {
                                pBitmap = ResourceManager::GetBitmapN(IDB_WIFI_RSSI_UNLOCK_01);
                        }
@@ -1014,7 +1014,7 @@ WifiForm::ChangeNetworkGroupItemCount(unsigned int itemCount, bool isAdd)
        else
        {
                __networkGroupItemTotalCount = GetGroupItemTotalCount(GROUP_INDEX_2_WIFI_NETWORK) - itemCount;
-               if ( __networkGroupItemTotalCount <= 0)
+               if (__networkGroupItemTotalCount <= 0)
                {
                        __networkGroupItemTotalCount = WIFI_NETWORK_GROUP_ITEM_BASE;
                }