FCL/sf/app/radio: comparison radioapp/radiouiengine/src/radiostationmodel.cpp

equal deleted inserted replaced

-:6df133bd92e1
+:075425b8d9a4
 */
 // System includes
 #include <QStringList>
+// User includes
 #include "radiostationmodel.h"
 #include "radiostationmodel_p.h"
 #include "radiopresetstorage.h"
 #include "radioenginewrapper.h"
 #include "radiouiengine.h"
 return list;
 }
 return firstLine;
-} else if ( role == RadioStationModel::RadioStationRole ) {
+} else if ( role == RadioRole::RadioStationRole ) {
 QVariant variant;
 variant.setValue( stationAt( index.row() ) );
 return variant;
 } else if ( role == Qt::DecorationRole &&
 d->mDetailLevel.testFlag( RadioStationModel::ShowIcons ) ) {
 }
 if ( currentStation().frequency() == station.frequency() && !d->mNowPlayingIcon.isNull() ) {
 list.append( d->mNowPlayingIcon );
 }
 return list;
+} else if ( role == RadioRole::IsFavoriteRole ) {
+QVariant variant;
+variant.setValue( stationAt( index.row() ).isFavorite() );
+return variant;
 }
 return QVariant();
 }
 */
 bool RadioStationModel::setData( const QModelIndex& index, const QVariant& value, int role )
 {
 Q_UNUSED( index );
-if ( role == RadioStationModel::ToggleFavoriteRole ) {
+if ( role == RadioRole::ToggleFavoriteRole ) {
 const uint frequency = value.toUInt();
 RadioStation station;
 if ( findFrequency( frequency, station ) ) {
 setFavoriteByPreset( station.presetIndex(), !station.isFavorite() );
 } else {
 void RadioStationModel::initialize( RadioPresetStorage* storage, RadioEngineWrapper* wrapper )
 {
 Q_D( RadioStationModel );
 d->mPresetStorage = storage;
 d->mWrapper = wrapper;
-const int presetCount = d->mPresetStorage->presetCount();
 int index = d->mPresetStorage->firstPreset();
-LOG_FORMAT( "RadioStationModelPrivate::initialize: presetCount: %d, firstIndex: %d", presetCount, index );
+LOG_FORMAT( "RadioStationModelPrivate::initialize: presetCount: %d, firstIndex: %d",
+d->mPresetStorage->presetCount(), index );
-#ifdef COMPILE_WITH_NEW_PRESET_UTILITY
 while ( index >= 0 ) {
-#else
-index = 0;
-while ( index < presetCount ) {
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
 RadioStation station;
 station.detach();
 RadioStationIf* preset = static_cast<RadioStationIf*>( station.data_ptr() );
 if ( d->mPresetStorage->readPreset( index, *preset ) ) {
 } else {
 LOG( "RadioStationModelPrivate::initialize: Invalid station!" );
 }
 }
-#ifdef COMPILE_WITH_NEW_PRESET_UTILITY
 index = d->mPresetStorage->nextPreset( index );
-#endif
 }
 d->setCurrentStation( d->mWrapper->currentFrequency() );
 wrapper->addObserver( d );
 RadioStation RadioStationModel::stationAt( int index ) const
 {
 // Get the value from the keys list instead of directly accessing the values list
 // because QMap may have added a default-constructed value to the values list
 Q_D( const RadioStationModel );
-if ( index < d->mStations.keys().count() ) {
+if ( index >= 0 && index < d->mStations.keys().count() ) {
 uint frequency = d->mStations.keys().at( index );
 return d->mStations.value( frequency );
 }
 return RadioStation();
 }
 /*!
 * Finds a station by frequency
 */
-bool RadioStationModel::findFrequency( uint frequency, RadioStation& station )
+bool RadioStationModel::findFrequency( uint frequency, RadioStation& station ) const
 {
-Q_D( RadioStationModel );
+Q_D( const RadioStationModel );
 if ( d->mStations.contains( frequency ) ) {
 station = d->mStations.value( frequency );
 return true;
 }
 return false;
 {
 Q_D( RadioStationModel );
 const bool findFavorite = mode == StationSkip::PreviousFavorite || mode == StationSkip::NextFavorite;
 const bool findNext = mode == StationSkip::Next || mode == StationSkip::NextFavorite;
 QList<RadioStation> list = findFavorite ? d->favorites() : d->mStations.values();
+if ( list.isEmpty() ) {
+return RadioStation();
+}
 // Find the previous and next station from current frequency
 RadioStation previous;
 RadioStation next;
 foreach( const RadioStation& station, list ) {
 return findNext ? next : previous;
 }
 /*!
+* Checks if the model contains the given frequency
+*/
+bool RadioStationModel::contains( const uint frequency ) const
+{
+RadioStation unused;
+return findFrequency( frequency, unused );
+}
+/*!
 * Removes a station by frequency
 */
 void RadioStationModel::removeByFrequency( uint frequency )
 {
 RadioStation station;
 }
 // Copy the station to a temporary variable that can be used as signal parameter
 RadioStation tempStation = station;
-const int row = modelIndexFromFrequency( tempStation.frequency() ).row();
+const int row = indexFromFrequency( tempStation.frequency() );
 beginRemoveRows( QModelIndex(), row, row );
 d->mPresetStorage->deletePreset( tempStation.presetIndex() );
 d->mStations.remove( frequency );
 saveStation( newStation );
 }
 }
 }
 }
-reset(); // TODO: Remove. this is a workaround to HbGridView update problem
 }
 /*!
 * Adds a new station to the list
 */
 }
 /*!
 * Returns the model index corresponding to the given frequency
 */
-QModelIndex RadioStationModel::modelIndexFromFrequency( uint frequency )
+int RadioStationModel::indexFromFrequency( uint frequency )
 {
 RadioStation station;
 if ( findFrequency( frequency, station ) ) {
-return index( findPresetIndex( station.presetIndex() ), 0 );
+return findPresetIndex( station.presetIndex() );
 }
-return QModelIndex();
+return -1;
 }
 /*!
 * Private slot
 * Timer timeout slot to indicate that the dynamic PS check has ended

changeset 28	075425b8d9a4
parent 24	6df133bd92e1
child 32	189d20c34778
child 34	bc10a61bd7d3