Skip to content

Commit

Permalink
Use unique_ptr
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Mar 16, 2023
1 parent a8ac202 commit 6e551db
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions src/app/pluginmanager/qgspluginmanager.cpp
Expand Up @@ -407,20 +407,18 @@ void QgsPluginManager::getCppPluginsMetadata()
QgsDebugMsgLevel( "Examining: " + lib, 2 );
try
{
QLibrary *myLib = new QLibrary( lib );
std::unique_ptr< QLibrary > myLib = std::make_unique< QLibrary >( lib );
const bool loaded = myLib->load();
if ( !loaded )
{
QgsDebugMsgLevel( QStringLiteral( "Failed to load: %1 (%2)" ).arg( myLib->fileName(), myLib->errorString() ), 2 );
delete myLib;
continue;
}

QgsDebugMsgLevel( "Loaded library: " + myLib->fileName(), 2 );
//Type is only used in non-provider plugins, so data providers are not picked
if ( !myLib->resolve( "type" ) )
{
delete myLib;
continue;
}

Expand Down Expand Up @@ -495,7 +493,6 @@ void QgsPluginManager::getCppPluginsMetadata()
if ( !pName || !pDesc || !pVersion )
{
QgsDebugMsgLevel( "Failed to get name, description, or type for " + myLib->fileName(), 2 );
delete myLib;
continue;
}

Expand All @@ -518,8 +515,6 @@ void QgsPluginManager::getCppPluginsMetadata()
metadata[QStringLiteral( "create_date" )] = ( pCreateDate ? *pCreateDate() : QString() );
metadata[QStringLiteral( "update_date" )] = ( pUpdateDate ? *pUpdateDate() : QString() );
mPlugins.insert( baseName, metadata );

delete myLib;
}
catch ( QgsSettingsException &ex )
{
Expand Down

0 comments on commit 6e551db

Please sign in to comment.