From 0a560f2f271b7cdcfd65e3dfe4f212016d75378d Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 12 Apr 2016 14:11:41 +0200 Subject: [PATCH] Fixed compiler warnings for QMetaType comparison. --- src/libtomahawk/accounts/ResolverAccount.cpp | 5 ++--- src/libtomahawk/resolvers/ScriptAccount.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk/accounts/ResolverAccount.cpp b/src/libtomahawk/accounts/ResolverAccount.cpp index e808e4137..238fb188d 100644 --- a/src/libtomahawk/accounts/ResolverAccount.cpp +++ b/src/libtomahawk/accounts/ResolverAccount.cpp @@ -564,7 +564,7 @@ ResolverAccount::onTestConfig( const QVariant& result ) { tLog() << Q_FUNC_INFO << result; - if ( result.type() == QMetaType::QString ) + if ( result.type() == QVariant::String ) { 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 ) : ResolverAccount( accountId, path, initialConfiguration ) , m_atticaId( atticaId ) @@ -618,8 +619,6 @@ AtticaResolverAccount::init() loadIcon(); else connect( AtticaManager::instance(), SIGNAL( resolversLoaded( Attica::Content::List ) ), this, SLOT( loadIcon() ) ); - - } diff --git a/src/libtomahawk/resolvers/ScriptAccount.cpp b/src/libtomahawk/resolvers/ScriptAccount.cpp index cf718ea5b..d732a8bda 100644 --- a/src/libtomahawk/resolvers/ScriptAccount.cpp +++ b/src/libtomahawk/resolvers/ScriptAccount.cpp @@ -157,7 +157,7 @@ ScriptAccount::reportScriptJobResult( const QVariantMap& result ) // got a successful job result if ( result[ "error"].isNull() ) { - if (result[ "data" ].type() == QMetaType::QVariantMap) + if ( result[ "data" ].type() == QVariant::Map ) { const QVariantMap data = result[ "data" ].toMap(); job->reportResultsMap( data );