use of smartpointer mTranslator

signedav · signedav · commit 283b1b46b956 · 2018-08-07T14:31:17.000+02:00
for better handling if loaded (or in our case existent) or not...
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;
 

Original file line number	Diff line number	Diff line change
`@@ -851,7 +851,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas mapCanvas, QWidget pa`
`851`	`851`	`cbtsLocale->addItem( QIcon( QString( ":/images/flags/%1.svg" ).arg( QStringLiteral( "en_US" ) ) ), QLocale( QStringLiteral( "en_US" ) ).nativeLanguageName(), QStringLiteral( "en_US" ) );`
`852`	`852`	`cbtsLocale->setCurrentIndex( cbtsLocale->findData( settings.value( QStringLiteral( "locale/userLocale" ), QString() ).toString() ) );`
`853`	`853`
`854`		`- connect( generateTsFileButton, &QPushButton::clicked, this, &QgsProjectProperties::generateTsFileButton_clicked );`
	`854`	`+ connect( generateTsFileButton, &QPushButton::clicked, this, &QgsProjectProperties::onGenerateTsFileButton );`
`855`	`855`
`856`	`856`	`projectionSelectorInitialized();`
`857`	`857`	`populateRequiredLayers();`
`@@ -2214,7 +2214,7 @@ void QgsProjectProperties::setCurrentPage( const QString &pageWidgetName )`
`2214`	`2214`	`}`
`2215`	`2215`	`}`
`2216`	`2216`
`2217`		`-void QgsProjectProperties::generateTsFileButton_clicked()`
	`2217`	`+void QgsProjectProperties::onGenerateTsFileButton()`
`2218`	`2218`	`{`
`2219`	`2219`	`QString l = cbtsLocale->currentData().toString();`
`2220`	`2220`	`QgsProject::instance()->generateTsFile( l );`
Original file line number	Diff line number	Diff line change
`@@ -993,7 +993,7 @@ bool QgsProject::read()`
`993`	`993`	`else`
`994`	`994`	`{`
`995`	`995`	`//but delete the translator`
`996`		`- delete mTranslator;`
	`996`	`+ mTranslator.reset( nullptr );`
`997`	`997`	`}`
`998`	`998`
`999`	`999`	`return rc;`
`@@ -1010,7 +1010,7 @@ bool QgsProject::readProjectFile( const QString &filename )`
`1010`	`1010`
`1011`	`1011`	`if ( QFile( QStringLiteral( "%1/%2.qm" ).arg( QFileInfo( projectFile.fileName() ).absolutePath(), localeFileName ) ).exists() )`
`1012`	`1012`	`{`
`1013`		`- mTranslator = new QTranslator();`
	`1013`	`+ mTranslator.reset( new QTranslator() );`
`1014`	`1014`	`if ( mTranslator->load( localeFileName, QFileInfo( projectFile.fileName() ).absolutePath() ) )`
`1015`	`1015`	`{`
`1016`	`1016`	`QgsDebugMsg( "Translation loaded" );`