From e55751bc95d05baec403e876f7e9eaefe90e98f4 Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Wed, 17 Jun 2020 14:27:37 +0200 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Matthias Kuhn --- src/core/providers/ogr/qgsogrprovider.cpp | 3 +-- src/core/qgssqliteutils.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp index 9ec29a9c3d0..95990636b9d 100644 --- a/src/core/providers/ogr/qgsogrprovider.cpp +++ b/src/core/providers/ogr/qgsogrprovider.cpp @@ -1485,7 +1485,7 @@ QVariant QgsOgrProvider::defaultValue( int fieldId ) const if ( ! ok ) { - QgsMessageLog::logMessage( tr( "Error retrieving next sequence value for %1" ).arg( QString( mOgrOrigLayer->name() ) ), tr( "OGR" ) ); + QgsMessageLog::logMessage( tr( "Error retrieving next sequence value for %1" ).arg( QString::fromUtf8( mOgrOrigLayer->name() ) ), tr( "OGR" ) ); } } else // no sequence! @@ -6923,4 +6923,3 @@ void QgsOgrProviderMetadata::saveConnection( const QgsAbstractProviderConnection } ///@endcond - diff --git a/src/core/qgssqliteutils.cpp b/src/core/qgssqliteutils.cpp index 6f60d346e1c..b6125c77370 100644 --- a/src/core/qgssqliteutils.cpp +++ b/src/core/qgssqliteutils.cpp @@ -233,8 +233,8 @@ long long QgsSqliteUtils::nextSequenceValue( sqlite3 *connection, const QString else // increment { if ( dsPtr.exec( QStringLiteral( "UPDATE sqlite_sequence SET seq = %1 WHERE name = %2" ) - .arg( QString::number( ++result ) ) - .arg( quotedTableName ), errorMessage ) != SQLITE_OK ) + .arg( QString::number( ++result ), + quotedTableName ), errorMessage ) != SQLITE_OK ) { errorMessage = QObject::tr( "Error retrieving default value for %1" ).arg( tableName ); result = -1;