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

Return type-safe nullptr

Browse Source
This commit is contained in:
Uwe L. Korn
2014-10-27 20:12:56 +01:00
parent f9f1f358ec
commit 8e60f16821
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libtomahawk/accounts/ResolverAccount.cpp
View File

@@ -110,13 +110,13 @@ ResolverAccountFactory::createFromPath( const QString& path, const QString& fact
if ( !( dir.exists() && dir.isReadable() ) ) //decompression fubar if ( !( dir.exists() && dir.isReadable() ) ) //decompression fubar
{ {
displayError( tr( "Resolver installation error: cannot open bundle." ) ); displayError( tr( "Resolver installation error: cannot open bundle." ) );
return 0; return nullptr;
} }
if ( !dir.cd( "content" ) ) //more fubar if ( !dir.cd( "content" ) ) //more fubar
{ {
displayError( tr( "Resolver installation error: incomplete bundle." ) ); displayError( tr( "Resolver installation error: incomplete bundle." ) );
return 0; return nullptr;
} }
QString metadataFilePath = dir.absoluteFilePath( "metadata.json" ); QString metadataFilePath = dir.absoluteFilePath( "metadata.json" );
@@ -128,7 +128,7 @@ ResolverAccountFactory::createFromPath( const QString& path, const QString& fact
{ {
dir.cdUp(); dir.cdUp();
if ( !dir.cdUp() ) //we're in MANUALRESOLVERS_DIR if ( !dir.cdUp() ) //we're in MANUALRESOLVERS_DIR
return 0; return nullptr;
QString name = configuration[ "pluginName" ].toString(); QString name = configuration[ "pluginName" ].toString();
@@ -145,7 +145,7 @@ ResolverAccountFactory::createFromPath( const QString& path, const QString& fact
configuration[ "bundleDir" ] = name; configuration[ "bundleDir" ] = name;
if ( !dir.cd( QString( "%1/content" ).arg( name ) ) ) //should work if it worked once if ( !dir.cd( QString( "%1/content" ).arg( name ) ) ) //should work if it worked once
return 0; return nullptr;
} }
expandPaths( dir, configuration ); expandPaths( dir, configuration );
@@ -154,7 +154,7 @@ ResolverAccountFactory::createFromPath( const QString& path, const QString& fact
if ( realPath.isEmpty() ) if ( realPath.isEmpty() )
{ {
displayError( tr( "Resolver installation error: bad metadata in bundle." ) ); displayError( tr( "Resolver installation error: bad metadata in bundle." ) );
return 0; return nullptr;
} }
} }
else //either legacy resolver or uncompressed bundle, so we look for a metadata file else //either legacy resolver or uncompressed bundle, so we look for a metadata file
@@ -190,7 +190,7 @@ ResolverAccountFactory::createFromPath( const QString& path, const QString& fact
if ( !myPlatform.contains( platform ) ) if ( !myPlatform.contains( platform ) )
{ {
displayError( tr( "Resolver installation error: platform mismatch." ) ); displayError( tr( "Resolver installation error: platform mismatch." ) );
return 0; return nullptr;
} }
} }
@@ -203,7 +203,7 @@ ResolverAccountFactory::createFromPath( const QString& path, const QString& fact
{ {
displayError( tr( "Resolver installation error: Tomahawk %1 or newer is required." ) displayError( tr( "Resolver installation error: Tomahawk %1 or newer is required." )
.arg( requiredVer ) ); .arg( requiredVer ) );
return 0; return nullptr;
} }
} }