use of smartpointer mTranslator

for better handling if loaded (or in our case existent) or not...
qgis · Aug 7, 2018 · 283b1b4 · 283b1b4
1 parent 090db0d
commit 283b1b4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -851,7 +851,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
   cbtsLocale->addItem( QIcon( QString( ":/images/flags/%1.svg" ).arg( QStringLiteral( "en_US" ) ) ), QLocale( QStringLiteral( "en_US" ) ).nativeLanguageName(), QStringLiteral( "en_US" ) );
   cbtsLocale->setCurrentIndex( cbtsLocale->findData( settings.value( QStringLiteral( "locale/userLocale" ), QString() ).toString() ) );
 
-  connect( generateTsFileButton, &QPushButton::clicked, this, &QgsProjectProperties::generateTsFileButton_clicked );
+  connect( generateTsFileButton, &QPushButton::clicked, this, &QgsProjectProperties::onGenerateTsFileButton );
 
   projectionSelectorInitialized();
   populateRequiredLayers();
@@ -2214,7 +2214,7 @@ void QgsProjectProperties::setCurrentPage( const QString &pageWidgetName )
   }
 }
 
-void QgsProjectProperties::generateTsFileButton_clicked()
+void QgsProjectProperties::onGenerateTsFileButton()
 {
   QString l = cbtsLocale->currentData().toString();
   QgsProject::instance()->generateTsFile( l );

diff --git a/src/app/qgsprojectproperties.h b/src/app/qgsprojectproperties.h
@@ -93,7 +93,7 @@ class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui:
     void scaleItemChanged( QListWidgetItem *changedScaleItem );
 
     //! generate the ts file with the locale selected in the checkbox
-    void generateTsFileButton_clicked();
+    void onGenerateTsFileButton();
 
     /**
      * Set WMS default extent to current canvas extent

diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -993,7 +993,7 @@ bool QgsProject::read()
   else
   {
     //but delete the translator
-    delete mTranslator;
+    mTranslator.reset( nullptr );
   }
 
   return rc;
@@ -1010,7 +1010,7 @@ bool QgsProject::readProjectFile( const QString &filename )
 
   if ( QFile( QStringLiteral( "%1/%2.qm" ).arg( QFileInfo( projectFile.fileName() ).absolutePath(), localeFileName ) ).exists() )
   {
-    mTranslator = new QTranslator();
+    mTranslator.reset( new QTranslator() );
     if ( mTranslator->load( localeFileName, QFileInfo( projectFile.fileName() ).absolutePath() ) )
     {
       QgsDebugMsg( "Translation loaded" );

diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -1439,7 +1439,7 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
 
     QgsProjectMetadata mMetadata;
 
-    QTranslator *mTranslator = nullptr;
+    std::unique_ptr< QTranslator > mTranslator;
 
     friend class QgsProjectDirtyBlocker;