mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 22:26:32 +02:00
Code Issues Releases Wiki Activity

Style fix and timeout fix

Browse Source
This commit is contained in:
Hugo Lindström
2011-10-12 22:31:25 +02:00
parent 3b1268bbfd
commit e2c71e7a18
3 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp
View File

@@ -110,13 +110,19 @@ ChartsPlugin::getInfo( uint requestId, Tomahawk::InfoSystem::InfoRequestData req
{ {
dataError( requestId, requestData ); dataError( requestId, requestData );
break; break;
}else }
else
{ {
foreach( QVariant resource, m_chartResources ) foreach( QVariant resource, m_chartResources )
{
if( resource.toString() == hash["chart_source"] ) if( resource.toString() == hash["chart_source"] )
{
foundSource = true; foundSource = true;
}
}
if(!foundSource){ if( !foundSource )
{
dataError( requestId, requestData ); dataError( requestId, requestData );
break; break;
} }

8
src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp
View File

@@ -398,7 +398,7 @@ LastFmPlugin::notInCacheSlot( uint requestId, QHash<QString, QString> criteria,
emit info( requestId, requestData, QVariant() ); emit info( requestId, requestData, QVariant() );
return; return;
} }
bool foundSource;
InfoCriteriaHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoCriteriaHash >(); InfoCriteriaHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoCriteriaHash >();
switch ( requestData.type ) switch ( requestData.type )
{ {
@@ -409,9 +409,11 @@ LastFmPlugin::notInCacheSlot( uint requestId, QHash<QString, QString> criteria,
{ {
dataError( requestId, requestData ); dataError( requestId, requestData );
break; break;
}else }
else
{
if( "last.fm" != hash["chart_source"] )
{ {
if("last.fm" != hash["chart_source"]){
dataError( requestId, requestData ); dataError( requestId, requestData );
break; break;
} }

13
src/libtomahawk/widgets/whatshotwidget.cpp
View File

@@ -121,7 +121,7 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent )
connect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ), SLOT( infoSystemFinished( QString ) ) ); connect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ), SLOT( infoSystemFinished( QString ) ) );
QTimer::singleShot( 2000, this, SLOT( fetchData() ) ); QTimer::singleShot( 0, this, SLOT( fetchData() ) );
} }
@@ -142,7 +142,7 @@ WhatsHotWidget::fetchData()
requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( artistInfo ); requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( artistInfo );
requestData.type = Tomahawk::InfoSystem::InfoChartCapabilities; requestData.type = Tomahawk::InfoSystem::InfoChartCapabilities;
Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData, 2000, true ); Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData, 20000, true );
tDebug( LOGVERBOSE ) << "WhatsHot: requested InfoChartCapabilities"; tDebug( LOGVERBOSE ) << "WhatsHot: requested InfoChartCapabilities";
} }
@@ -299,7 +299,7 @@ WhatsHotWidget::leftCrumbIndexChanged( QModelIndex index )
requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( criteria ); requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( criteria );
requestData.type = Tomahawk::InfoSystem::InfoChart; requestData.type = Tomahawk::InfoSystem::InfoChart;
Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData, 2000, true ); Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData, 20000, true );
} }
@@ -326,6 +326,7 @@ WhatsHotWidget::parseNode(QStandardItem* parentItem, const QString &label, const
tDebug( LOGVERBOSE ) << "WhatsHot:: parsing " << label; tDebug( LOGVERBOSE ) << "WhatsHot:: parsing " << label;
QStandardItem *sourceItem = new QStandardItem(label); QStandardItem *sourceItem = new QStandardItem(label);
if( data.canConvert<QList<Tomahawk::InfoSystem::Chart> >() ) if( data.canConvert<QList<Tomahawk::InfoSystem::Chart> >() )
{ {
QList<Tomahawk::InfoSystem::Chart> charts = data.value<QList<Tomahawk::InfoSystem::Chart> >(); QList<Tomahawk::InfoSystem::Chart> charts = data.value<QList<Tomahawk::InfoSystem::Chart> >();
@@ -335,7 +336,8 @@ WhatsHotWidget::parseNode(QStandardItem* parentItem, const QString &label, const
childItem->setData( chart.id ); childItem->setData( chart.id );
sourceItem->appendRow( childItem ); sourceItem->appendRow( childItem );
} }
} else if( data.canConvert<QVariantMap>() ) }
else if( data.canConvert<QVariantMap>() )
{ {
QVariantMap dataMap = data.toMap(); QVariantMap dataMap = data.toMap();
foreach( const QString childLabel,dataMap.keys() ) foreach( const QString childLabel,dataMap.keys() )
@@ -343,7 +345,8 @@ WhatsHotWidget::parseNode(QStandardItem* parentItem, const QString &label, const
QStandardItem *childItem = parseNode( sourceItem, childLabel, dataMap[childLabel] ); QStandardItem *childItem = parseNode( sourceItem, childLabel, dataMap[childLabel] );
sourceItem->appendRow( childItem ); sourceItem->appendRow( childItem );
} }
} else if ( data.canConvert<QVariantList>() ) }
else if ( data.canConvert<QVariantList>() )
{ {
QVariantList dataList = data.toList(); QVariantList dataList = data.toList();