Add missing SIP_FACTORY

qgis · Aug 31, 2017 · 7ba1b17 · 7ba1b17
1 parent 42b3e0b
commit 7ba1b17
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/python/core/qgsuserprofilemanager.sip b/python/core/qgsuserprofilemanager.sip
@@ -118,7 +118,7 @@ class QgsUserProfileManager : QObject
  Set the default profile name from the current active profile.
 %End
 
-    QgsUserProfile *profileForName( const QString name ) const;
+    QgsUserProfile *profileForName( const QString &name ) const /Factory/;
 %Docstring
  Return the profile found for a given name.
  \param name The name of the profile to return.

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2283,13 +2283,12 @@ void QgisApp::refreshProfileMenu()
 
   Q_FOREACH ( const QString &name, userProfileManager()->allProfiles() )
   {
-    profile = userProfileManager()->profileForName( name );
-    QAction *action = new QAction( profile->icon(), profile->alias(), mConfigMenu );
-    action->setToolTip( profile->folder() );
+    std::unique_ptr< QgsUserProfile > namedProfile( userProfileManager()->profileForName( name ) );
+    QAction *action = new QAction( namedProfile->icon(), namedProfile->alias(), mConfigMenu );
+    action->setToolTip( namedProfile->folder() );
     action->setCheckable( true );
     profileGroup->addAction( action );
     mConfigMenu->addAction( action );
-    delete profile;
 
     if ( name == activeName )
     {

diff --git a/src/core/qgsuserprofilemanager.h b/src/core/qgsuserprofilemanager.h
@@ -126,7 +126,7 @@ class CORE_EXPORT QgsUserProfileManager : public QObject
      * \param name The name of the profile to return.
      * \return A QgsUserprofile pointing to the location of the user profile.
      */
-    QgsUserProfile *profileForName( const QString name ) const;
+    QgsUserProfile *profileForName( const QString &name ) const SIP_FACTORY;
 
     /**
      * Create a user profile given by the name