Skip to content

Commit 283b1b4

Browse files
committedAug 7, 2018
use of smartpointer mTranslator
for better handling if loaded (or in our case existent) or not...
1 parent 090db0d commit 283b1b4

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed
 

‎src/app/qgsprojectproperties.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
851851
cbtsLocale->addItem( QIcon( QString( ":/images/flags/%1.svg" ).arg( QStringLiteral( "en_US" ) ) ), QLocale( QStringLiteral( "en_US" ) ).nativeLanguageName(), QStringLiteral( "en_US" ) );
852852
cbtsLocale->setCurrentIndex( cbtsLocale->findData( settings.value( QStringLiteral( "locale/userLocale" ), QString() ).toString() ) );
853853

854-
connect( generateTsFileButton, &QPushButton::clicked, this, &QgsProjectProperties::generateTsFileButton_clicked );
854+
connect( generateTsFileButton, &QPushButton::clicked, this, &QgsProjectProperties::onGenerateTsFileButton );
855855

856856
projectionSelectorInitialized();
857857
populateRequiredLayers();
@@ -2214,7 +2214,7 @@ void QgsProjectProperties::setCurrentPage( const QString &pageWidgetName )
22142214
}
22152215
}
22162216

2217-
void QgsProjectProperties::generateTsFileButton_clicked()
2217+
void QgsProjectProperties::onGenerateTsFileButton()
22182218
{
22192219
QString l = cbtsLocale->currentData().toString();
22202220
QgsProject::instance()->generateTsFile( l );

‎src/app/qgsprojectproperties.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui:
9393
void scaleItemChanged( QListWidgetItem *changedScaleItem );
9494

9595
//! generate the ts file with the locale selected in the checkbox
96-
void generateTsFileButton_clicked();
96+
void onGenerateTsFileButton();
9797

9898
/**
9999
* Set WMS default extent to current canvas extent

‎src/core/qgsproject.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ bool QgsProject::read()
993993
else
994994
{
995995
//but delete the translator
996-
delete mTranslator;
996+
mTranslator.reset( nullptr );
997997
}
998998

999999
return rc;
@@ -1010,7 +1010,7 @@ bool QgsProject::readProjectFile( const QString &filename )
10101010

10111011
if ( QFile( QStringLiteral( "%1/%2.qm" ).arg( QFileInfo( projectFile.fileName() ).absolutePath(), localeFileName ) ).exists() )
10121012
{
1013-
mTranslator = new QTranslator();
1013+
mTranslator.reset( new QTranslator() );
10141014
if ( mTranslator->load( localeFileName, QFileInfo( projectFile.fileName() ).absolutePath() ) )
10151015
{
10161016
QgsDebugMsg( "Translation loaded" );

‎src/core/qgsproject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1439,7 +1439,7 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
14391439

14401440
QgsProjectMetadata mMetadata;
14411441

1442-
QTranslator *mTranslator = nullptr;
1442+
std::unique_ptr< QTranslator > mTranslator;
14431443

14441444
friend class QgsProjectDirtyBlocker;
14451445

0 commit comments

Comments
 (0)
Please sign in to comment.