[virtual] Fix encoding issue

Hugo Mercier · Hugo Mercier · commit 164a85acdb42 · 2016-11-09T16:40:43.000+01:00
diff --git a/src/providers/virtual/qgsvirtuallayersqlitehelper.cpp b/src/providers/virtual/qgsvirtuallayersqlitehelper.cpp
@@ -30,7 +30,7 @@ QgsScopedSqlite::QgsScopedSqlite( const QString& path, bool withExtension )
     sqlite3_auto_extension( reinterpret_cast < void( * )() > ( qgsvlayerModuleInit ) );
   }
   int r;
-  r = sqlite3_open( path.toLocal8Bit().constData(), &db_ );
+  r = sqlite3_open( path.toUtf8().constData(), &db_ );
   if ( withExtension )
   {
     // reset the automatic extensions
@@ -41,7 +41,7 @@ QgsScopedSqlite::QgsScopedSqlite( const QString& path, bool withExtension )
   {
     QString err = QStringLiteral( "%1 [%2]" ).arg( sqlite3_errmsg( db_ ), path );
     QgsDebugMsg( err );
-    throw std::runtime_error( err.toLocal8Bit().constData() );
+    throw std::runtime_error( err.toUtf8().constData() );
   }
   // enable extended result codes
   sqlite3_extended_result_codes( db_, 1 );
@@ -92,12 +92,12 @@ namespace Sqlite
       , stmt_( nullptr )
       , nBind_( 1 )
   {
-    QByteArray ba( q.toLocal8Bit() );
+    QByteArray ba( q.toUtf8() );
     int r = sqlite3_prepare_v2( db, ba.constData(), ba.size(), &stmt_, nullptr );
     if ( r )
     {
       QString err = QStringLiteral( "Query preparation error on %1: %2" ).arg( q ).arg( sqlite3_errmsg( db ) );
-      throw std::runtime_error( err.toLocal8Bit().constData() );
+      throw std::runtime_error( err.toUtf8().constData() );
     }
   }
 
@@ -110,7 +110,7 @@ namespace Sqlite
 
   Query& Query::bind( const QString& str, int idx )
   {
-    QByteArray ba( str.toLocal8Bit() );
+    QByteArray ba( str.toUtf8() );
     int r = sqlite3_bind_text( stmt_, idx, ba.constData(), ba.size(), SQLITE_TRANSIENT );
     if ( r )
     {
@@ -127,11 +127,11 @@ namespace Sqlite
   void Query::exec( sqlite3* db, const QString& sql )
   {
     char *errMsg = nullptr;
-    int r = sqlite3_exec( db, sql.toLocal8Bit().constData(), nullptr, nullptr, &errMsg );
+    int r = sqlite3_exec( db, sql.toUtf8().constData(), nullptr, nullptr, &errMsg );
     if ( r )
     {
       QString err = QStringLiteral( "Query execution error on %1: %2 - %3" ).arg( sql ).arg( r ).arg( errMsg );
-      throw std::runtime_error( err.toLocal8Bit().constData() );
+      throw std::runtime_error( err.toUtf8().constData() );
     }
   }
 
diff --git a/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp b/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp
@@ -57,7 +57,7 @@ void initVirtualLayerMetadata( sqlite3* db )
   char *errMsg;
   if ( create_meta )
   {
-    r = sqlite3_exec( db, QStringLiteral( "CREATE TABLE _meta (version INT, url TEXT); INSERT INTO _meta (version) VALUES(%1);" ).arg( VIRTUAL_LAYER_VERSION ).toLocal8Bit().constData(), nullptr, nullptr, &errMsg );
+    r = sqlite3_exec( db, QStringLiteral( "CREATE TABLE _meta (version INT, url TEXT); INSERT INTO _meta (version) VALUES(%1);" ).arg( VIRTUAL_LAYER_VERSION ).toUtf8().constData(), nullptr, nullptr, &errMsg );
     if ( r )
     {
       throw std::runtime_error( errMsg );

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ QgsScopedSqlite::QgsScopedSqlite( const QString& path, bool withExtension )`
`30`	`30`	`sqlite3_auto_extension( reinterpret_cast < void( * )() > ( qgsvlayerModuleInit ) );`
`31`	`31`	`}`
`32`	`32`	`int r;`
`33`		`- r = sqlite3_open( path.toLocal8Bit().constData(), &db_ );`
	`33`	`+ r = sqlite3_open( path.toUtf8().constData(), &db_ );`
`34`	`34`	`if ( withExtension )`
`35`	`35`	`{`
`36`	`36`	`// reset the automatic extensions`
`@@ -41,7 +41,7 @@ QgsScopedSqlite::QgsScopedSqlite( const QString& path, bool withExtension )`
`41`	`41`	`{`
`42`	`42`	`QString err = QStringLiteral( "%1 [%2]" ).arg( sqlite3_errmsg( db_ ), path );`
`43`	`43`	`QgsDebugMsg( err );`
`44`		`- throw std::runtime_error( err.toLocal8Bit().constData() );`
	`44`	`+ throw std::runtime_error( err.toUtf8().constData() );`
`45`	`45`	`}`
`46`	`46`	`// enable extended result codes`
`47`	`47`	`sqlite3_extended_result_codes( db_, 1 );`
`@@ -92,12 +92,12 @@ namespace Sqlite`
`92`	`92`	`, stmt_( nullptr )`
`93`	`93`	`, nBind_( 1 )`
`94`	`94`	`{`
`95`		`- QByteArray ba( q.toLocal8Bit() );`
	`95`	`+ QByteArray ba( q.toUtf8() );`
`96`	`96`	`int r = sqlite3_prepare_v2( db, ba.constData(), ba.size(), &stmt_, nullptr );`
`97`	`97`	`if ( r )`
`98`	`98`	`{`
`99`	`99`	`QString err = QStringLiteral( "Query preparation error on %1: %2" ).arg( q ).arg( sqlite3_errmsg( db ) );`
`100`		`- throw std::runtime_error( err.toLocal8Bit().constData() );`
	`100`	`+ throw std::runtime_error( err.toUtf8().constData() );`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`@@ -110,7 +110,7 @@ namespace Sqlite`
`110`	`110`
`111`	`111`	`Query& Query::bind( const QString& str, int idx )`
`112`	`112`	`{`
`113`		`- QByteArray ba( str.toLocal8Bit() );`
	`113`	`+ QByteArray ba( str.toUtf8() );`
`114`	`114`	`int r = sqlite3_bind_text( stmt_, idx, ba.constData(), ba.size(), SQLITE_TRANSIENT );`
`115`	`115`	`if ( r )`
`116`	`116`	`{`
`@@ -127,11 +127,11 @@ namespace Sqlite`
`127`	`127`	`void Query::exec( sqlite3* db, const QString& sql )`
`128`	`128`	`{`
`129`	`129`	`char *errMsg = nullptr;`
`130`		`- int r = sqlite3_exec( db, sql.toLocal8Bit().constData(), nullptr, nullptr, &errMsg );`
	`130`	`+ int r = sqlite3_exec( db, sql.toUtf8().constData(), nullptr, nullptr, &errMsg );`
`131`	`131`	`if ( r )`
`132`	`132`	`{`
`133`	`133`	`QString err = QStringLiteral( "Query execution error on %1: %2 - %3" ).arg( sql ).arg( r ).arg( errMsg );`
`134`		`- throw std::runtime_error( err.toLocal8Bit().constData() );`
	`134`	`+ throw std::runtime_error( err.toUtf8().constData() );`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ void initVirtualLayerMetadata( sqlite3* db )`
`57`	`57`	`char *errMsg;`
`58`	`58`	`if ( create_meta )`
`59`	`59`	`{`
`60`		`- r = sqlite3_exec( db, QStringLiteral( "CREATE TABLE _meta (version INT, url TEXT); INSERT INTO _meta (version) VALUES(%1);" ).arg( VIRTUAL_LAYER_VERSION ).toLocal8Bit().constData(), nullptr, nullptr, &errMsg );`
	`60`	`+ r = sqlite3_exec( db, QStringLiteral( "CREATE TABLE _meta (version INT, url TEXT); INSERT INTO _meta (version) VALUES(%1);" ).arg( VIRTUAL_LAYER_VERSION ).toUtf8().constData(), nullptr, nullptr, &errMsg );`
`61`	`61`	`if ( r )`
`62`	`62`	`{`
`63`	`63`	`throw std::runtime_error( errMsg );`