1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-14 10:05:32 +02:00

Fixed compiler warnings for QMetaType comparison.

This commit is contained in:
Christian Muehlhaeuser
2016-04-12 14:11:41 +02:00
parent 9c9f5e4dae
commit 0a560f2f27
2 changed files with 3 additions and 4 deletions

View File

@@ -564,7 +564,7 @@ ResolverAccount::onTestConfig( const QVariant& result )
{ {
tLog() << Q_FUNC_INFO << result; tLog() << Q_FUNC_INFO << result;
if ( result.type() == QMetaType::QString ) if ( result.type() == QVariant::String )
{ {
emit configTestResult( Accounts::ConfigTestResultOther, result.toString() ); emit configTestResult( Accounts::ConfigTestResultOther, result.toString() );
} }
@@ -589,6 +589,7 @@ AtticaResolverAccount::AtticaResolverAccount( const QString& accountId )
} }
AtticaResolverAccount::AtticaResolverAccount( const QString& accountId, const QString& path, const QString& atticaId, const QVariantHash& initialConfiguration ) AtticaResolverAccount::AtticaResolverAccount( const QString& accountId, const QString& path, const QString& atticaId, const QVariantHash& initialConfiguration )
: ResolverAccount( accountId, path, initialConfiguration ) : ResolverAccount( accountId, path, initialConfiguration )
, m_atticaId( atticaId ) , m_atticaId( atticaId )
@@ -618,8 +619,6 @@ AtticaResolverAccount::init()
loadIcon(); loadIcon();
else else
connect( AtticaManager::instance(), SIGNAL( resolversLoaded( Attica::Content::List ) ), this, SLOT( loadIcon() ) ); connect( AtticaManager::instance(), SIGNAL( resolversLoaded( Attica::Content::List ) ), this, SLOT( loadIcon() ) );
} }

View File

@@ -157,7 +157,7 @@ ScriptAccount::reportScriptJobResult( const QVariantMap& result )
// got a successful job result // got a successful job result
if ( result[ "error"].isNull() ) if ( result[ "error"].isNull() )
{ {
if (result[ "data" ].type() == QMetaType::QVariantMap) if ( result[ "data" ].type() == QVariant::Map )
{ {
const QVariantMap data = result[ "data" ].toMap(); const QVariantMap data = result[ "data" ].toMap();
job->reportResultsMap( data ); job->reportResultsMap( data );