fixup

nyalldawson · Jul 10, 2023 · 949885d · 949885d
1 parent 781879e
commit 949885d
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/src/core/proj/qgscoordinatereferencesystemregistry.cpp b/src/core/proj/qgscoordinatereferencesystemregistry.cpp
@@ -442,26 +442,24 @@ QList<QgsCrsDbRecord> QgsCoordinateReferenceSystemRegistry::crsDbRecords() const
     if ( QFileInfo::exists( srsDatabaseFileName ) )
     {
       // open the database containing the spatial reference data, and do a one-time read
-      sqlite3 *database = nullptr;
-      int rc = sqlite3_open_v2( srsDatabaseFileName.toUtf8().constData(), &database, SQLITE_OPEN_READONLY, nullptr );
-      if ( rc )
+      sqlite3_database_unique_ptr database;
+      int result = database.open_v2( srsDatabaseFileName, SQLITE_OPEN_READONLY, nullptr );
+      if ( result == SQLITE_OK )
       {
-        const char *tail = nullptr;
-        sqlite3_stmt *stmt = nullptr;
         const QString sql = QStringLiteral( "select description, srs_id, auth_name, auth_id, name, deprecated, srs_type from vw_srs" );
-        rc = sqlite3_prepare( database, sql.toUtf8(), sql.toUtf8().length(), &stmt, &tail );
-        if ( rc == SQLITE_OK )
+        sqlite3_statement_unique_ptr preparedStatement = database.prepare( sql, result );
+        if ( result == SQLITE_OK )
         {
-          while ( sqlite3_step( stmt ) == SQLITE_ROW )
+          while ( preparedStatement.step() == SQLITE_ROW )
           {
             QgsCrsDbRecord record;
-            record.description = QString::fromUtf8( ( char * )sqlite3_column_text( stmt, 0 ) );
-            record.srsId = QString::fromUtf8( ( char * )sqlite3_column_text( stmt, 1 ) );
-            record.authName = QString::fromUtf8( ( char * )sqlite3_column_text( stmt, 2 ) );
-            record.authId = QString::fromUtf8( ( char * )sqlite3_column_text( stmt, 3 ) );
-            record.name = QString::fromUtf8( ( char * )sqlite3_column_text( stmt, 4 ) );
-            record.deprecated = QString::fromUtf8( ( char * )sqlite3_column_text( stmt, 5 ) ).toInt();
-            record.type = qgsEnumKeyToValue( QString::fromUtf8( ( char * )sqlite3_column_text( stmt, 6 ) ), Qgis::CrsType::Unknown );
+            record.description = preparedStatement.columnAsText( 0 );
+            record.srsId = preparedStatement.columnAsText( 1 );
+            record.authName = preparedStatement.columnAsText( 2 );
+            record.authId = preparedStatement.columnAsText( 3 );
+            record.name = preparedStatement.columnAsText( 4 );
+            record.deprecated = preparedStatement.columnAsText( 5 ).toInt();
+            record.type = qgsEnumKeyToValue( preparedStatement.columnAsText( 6 ), Qgis::CrsType::Unknown );
             mCrsDbRecords.append( record );
           }
         }