diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuisettingradiobuttonlistmodel.cpp --- a/camerauis/cameraxui/cxui/src/cxuisettingradiobuttonlistmodel.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuisettingradiobuttonlistmodel.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -19,6 +19,7 @@ #include "cxutils.h" // debug #include "cxuienums.h" +#include "cxuisettingsinfo.h" #include "cxuisettingradiobuttonlist.h" #include "cxuisettingradiobuttonlistmodel.h" @@ -79,10 +80,12 @@ CX_DEBUG(("CxuiSettingRadioButtonListModel: Listbox type is TwoLineListBox")); // two line list box // get the two strings - QStringList lines = setting.split(","); - QString first = lines[0]; - QString second = lines[1]; - list << first << second ; + QStringList lines = setting.split(CxUiSettings::NEW_LINE_CHAR); + // Split returns always atleast a single element list. + list << lines[0]; + if (lines.size() > 1) { + list << lines[1]; + } } else { CX_DEBUG(("CxuiSettingRadioButtonListModel: Listbox type is SingleLine")); list << setting; @@ -90,7 +93,7 @@ data = QVariant(list); } else { - CX_DEBUG(("[WARNING] CxuiSettingRadioButtonListModel: role is not DisplayRole!")); + // No action } CX_DEBUG_EXIT_FUNCTION();