From 46772ee261dc248f6f543d341d7ad56eda22c487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Lindstr=C3=B6m?= Date: Mon, 24 Sep 2012 14:40:37 +0200 Subject: [PATCH] Use TomahawkSettings set/lastChartIds instead of QSettings --- src/libtomahawk/TomahawkSettings.cpp | 13 +++++++++++++ src/libtomahawk/TomahawkSettings.h | 4 ++++ src/libtomahawk/widgets/WhatsHotWidget.cpp | 5 ++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/TomahawkSettings.cpp b/src/libtomahawk/TomahawkSettings.cpp index 3dbf770c6..5ebdcc014 100644 --- a/src/libtomahawk/TomahawkSettings.cpp +++ b/src/libtomahawk/TomahawkSettings.cpp @@ -1368,6 +1368,19 @@ TomahawkSettings::setPlaylistUpdaters( const SerializedUpdaters& updaters ) } +void +TomahawkSettings::setLastChartIds( const QVariant& ids ){ + + setValue( "chartIds", ids ); +} + + +QVariant TomahawkSettings::lastChartIds(){ + + return value( "chartIds" ).value(); +} + + void TomahawkSettings::registerCustomSettingsHandlers() { diff --git a/src/libtomahawk/TomahawkSettings.h b/src/libtomahawk/TomahawkSettings.h index 6b12e198b..a2ecca1bf 100644 --- a/src/libtomahawk/TomahawkSettings.h +++ b/src/libtomahawk/TomahawkSettings.h @@ -211,6 +211,10 @@ public: static void registerCustomSettingsHandlers(); + // Charts + void setLastChartIds( const QVariant& ids ); + QVariant lastChartIds(); + signals: void changed(); void recentlyPlayedPlaylistAdded( const QString& playlistId, int sourceId ); diff --git a/src/libtomahawk/widgets/WhatsHotWidget.cpp b/src/libtomahawk/widgets/WhatsHotWidget.cpp index b4dcfaeed..169ec7a71 100644 --- a/src/libtomahawk/widgets/WhatsHotWidget.cpp +++ b/src/libtomahawk/widgets/WhatsHotWidget.cpp @@ -104,7 +104,7 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent ) connect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ), SLOT( infoSystemFinished( QString ) ) ); // Read last viewed charts, to be used as defaults - m_currentVIds = QSettings().value( "chartIds" ).toMap(); + m_currentVIds = TomahawkSettings::instance()->lastChartIds().toMap(); } @@ -112,8 +112,7 @@ WhatsHotWidget::~WhatsHotWidget() { qDebug() << "Deleting whatshot"; // Write the settings - QSettings().setValue( "chartIds", m_currentVIds ); - + TomahawkSettings::instance()->setLastChartIds( m_currentVIds ); qDeleteAll( m_workers ); m_workers.clear(); m_workerThread->exit( 0 );