From 934b69d6518fe515553fa9209f7dc7833b74a364 Mon Sep 17 00:00:00 2001 From: jef Date: Sat, 22 Aug 2009 08:02:22 +0000 Subject: [PATCH] fix #1857 git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11477 c8812cc2-4d05-0410-92ff-de0c093fc19c --- src/app/qgsspatialitesourceselect.cpp | 4 ++-- src/providers/spatialite/qgsspatialiteprovider.cpp | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/app/qgsspatialitesourceselect.cpp b/src/app/qgsspatialitesourceselect.cpp index 76109206d406..7f1113b17e6b 100644 --- a/src/app/qgsspatialitesourceselect.cpp +++ b/src/app/qgsspatialitesourceselect.cpp @@ -179,9 +179,9 @@ sqlite3 *QgsSpatiaLiteSourceSelect::openSpatiaLiteDb( const char *path ) QString errCause; // trying to open the SQLite DB - mSqlitePath = path; + mSqlitePath = QString::fromUtf8( path ); - ret = sqlite3_open_v2( path, &handle, SQLITE_OPEN_READWRITE, NULL ); + ret = sqlite3_open_v2( mSqlitePath.toUtf8().constData(), &handle, SQLITE_OPEN_READWRITE, NULL ); if ( ret ) { // failure diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp index 965a094c0948..e7fc993cc973 100644 --- a/src/providers/spatialite/qgsspatialiteprovider.cpp +++ b/src/providers/spatialite/qgsspatialiteprovider.cpp @@ -1365,7 +1365,6 @@ void QgsSpatiaLiteProvider::closeDb() QgsSpatiaLiteProvider::SqliteHandles * QgsSpatiaLiteProvider::SqliteHandles::openDb( const QString & dbPath ) { - char path[1024]; sqlite3 *sqlite_handle; QMap < QString, QgsSpatiaLiteProvider::SqliteHandles * >&handles = QgsSpatiaLiteProvider::SqliteHandles::handles; @@ -1378,8 +1377,7 @@ QgsSpatiaLiteProvider::SqliteHandles * QgsSpatiaLiteProvider::SqliteHandles::ope } QgsDebugMsg( QString( "New sqlite connection for " ) + dbPath ); - strcpy( path, dbPath.toUtf8().constData() ); - if ( sqlite3_open_v2( path, &sqlite_handle, SQLITE_OPEN_READWRITE, NULL ) ) + if ( sqlite3_open_v2( dbPath.toUtf8().constData(), &sqlite_handle, SQLITE_OPEN_READWRITE, NULL ) ) { // failure