Skip to content

Commit c09e954

Browse files
author
homann
committedMar 23, 2007
sqlite3_open() MUST have db name in Utf-8. Fixes #676.
git-svn-id: http://svn.osgeo.org/qgis/trunk@6828 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 74edc8c commit c09e954

File tree

8 files changed

+30
-30
lines changed

8 files changed

+30
-30
lines changed
 

‎src/app/qgsbookmarkitem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ QgsBookmarkItem::~QgsBookmarkItem()
4545
#ifdef QGISDEBUG
4646
std::cout << "Opening user database: " << mUserDbPath.toLocal8Bit().data() << std::endl;
4747
#endif
48-
rc = sqlite3_open(mUserDbPath.toLocal8Bit().data(), &db);
48+
rc = sqlite3_open(mUserDbPath.toUtf8().data(), &db);
4949
if(rc)
5050
{
5151
std::cout << "Can't open database: " << sqlite3_errmsg(db) << std::endl;

‎src/app/qgsbookmarks.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ int QgsBookmarks::connectDb()
216216
{
217217

218218
int rc;
219-
rc = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &db);
219+
rc = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &db);
220220
if(rc)
221221
{
222222
std::cout << "Can't open database: " << sqlite3_errmsg(db) << std::endl;

‎src/app/qgscustomprojectiondialog.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void QgsCustomProjectionDialog::getProjList ()
8989
sqlite3_stmt *myPreparedStatement;
9090
int myResult;
9191
//check the db is available
92-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
92+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
9393
if(myResult)
9494
{
9595
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -124,7 +124,7 @@ void QgsCustomProjectionDialog::getEllipsoidList()
124124
sqlite3_stmt *myPreparedStatement;
125125
int myResult;
126126
//check the db is available
127-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
127+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
128128
if(myResult)
129129
{
130130
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -168,7 +168,7 @@ void QgsCustomProjectionDialog::on_pbnDelete_clicked()
168168
int myResult;
169169
QString myName;
170170
//check the db is available
171-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
171+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
172172
if(myResult)
173173
{
174174
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -228,7 +228,7 @@ long QgsCustomProjectionDialog::getRecordCount()
228228
int myResult;
229229
long myRecordCount=0;
230230
//check the db is available
231-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
231+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
232232
if(myResult)
233233
{
234234
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -263,7 +263,7 @@ QString QgsCustomProjectionDialog::getProjectionFamilyName(QString theProjection
263263
int myResult;
264264
QString myName;
265265
//check the db is available
266-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
266+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
267267
if(myResult)
268268
{
269269
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -294,7 +294,7 @@ QString QgsCustomProjectionDialog::getEllipsoidName(QString theEllipsoidAcronym)
294294
int myResult;
295295
QString myName;
296296
//check the db is available
297-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
297+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
298298
if(myResult)
299299
{
300300
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -325,7 +325,7 @@ QString QgsCustomProjectionDialog::getProjectionFamilyAcronym(QString theProject
325325
int myResult;
326326
QString myName;
327327
//check the db is available
328-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
328+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
329329
if(myResult)
330330
{
331331
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -356,7 +356,7 @@ QString QgsCustomProjectionDialog::getEllipsoidAcronym(QString theEllipsoidName)
356356
int myResult;
357357
QString myName;
358358
//check the db is available
359-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
359+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
360360
if(myResult)
361361
{
362362
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -390,7 +390,7 @@ void QgsCustomProjectionDialog::on_pbnFirst_clicked()
390390
sqlite3_stmt *myPreparedStatement;
391391
int myResult;
392392
//check the db is available
393-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
393+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
394394
if(myResult)
395395
{
396396
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -468,7 +468,7 @@ void QgsCustomProjectionDialog::on_pbnPrevious_clicked()
468468
sqlite3_stmt *myPreparedStatement;
469469
int myResult;
470470
//check the db is available
471-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
471+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
472472
if(myResult)
473473
{
474474
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -547,7 +547,7 @@ void QgsCustomProjectionDialog::on_pbnNext_clicked()
547547
sqlite3_stmt *myPreparedStatement;
548548
int myResult;
549549
//check the db is available
550-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
550+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
551551
if(myResult)
552552
{
553553
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -623,7 +623,7 @@ void QgsCustomProjectionDialog::on_pbnLast_clicked()
623623
sqlite3_stmt *myPreparedStatement;
624624
int myResult;
625625
//check the db is available
626-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
626+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
627627
if(myResult)
628628
{
629629
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -842,7 +842,7 @@ void QgsCustomProjectionDialog::on_pbnSave_clicked()
842842
sqlite3_stmt *myPreparedStatement;
843843
int myResult;
844844
//check the db is available
845-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
845+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
846846
if(myResult!=SQLITE_OK)
847847
{
848848
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) <<
@@ -970,7 +970,7 @@ void QgsCustomProjectionDialog::cboProjectionFamily_highlighted( const QString &
970970
sqlite3_stmt *myPreparedStatement;
971971
int myResult;
972972
//check the db is available
973-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
973+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
974974
if(myResult!=SQLITE_OK)
975975
{
976976
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;

‎src/app/qgsoptions.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ void QgsOptions::getEllipsoidList()
337337

338338
cmbEllipsoid->insertItem(ELLIPS_FLAT_DESC);
339339
//check the db is available
340-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
340+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
341341
if(myResult)
342342
{
343343
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -370,7 +370,7 @@ QString QgsOptions::getEllipsoidAcronym(QString theEllipsoidName)
370370
int myResult;
371371
QString myName(ELLIPS_FLAT);
372372
//check the db is available
373-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
373+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
374374
if(myResult)
375375
{
376376
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -402,7 +402,7 @@ QString QgsOptions::getEllipsoidName(QString theEllipsoidAcronym)
402402
int myResult;
403403
QString myName(ELLIPS_FLAT_DESC);
404404
//check the db is available
405-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
405+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
406406
if(myResult)
407407
{
408408
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;

‎src/core/qgsdistancearea.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ bool QgsDistanceArea::setEllipsoid(const QString& ellipsoid)
8787
}
8888

8989
//check the db is available
90-
myResult = sqlite3_open(QString(QgsApplication::qgisUserDbFilePath()).latin1(), &myDatabase);
90+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
9191
if(myResult)
9292
{
9393
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;

‎src/core/qgsspatialrefsys.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@ QString::number(USER_PROJECTION_START_ID));
12611261
int QgsSpatialRefSys::openDb(QString path, sqlite3 **db)
12621262
{
12631263
QgsDebugMsg("QgsSpatialRefSys::openDb path = " + path);
1264-
int myResult = sqlite3_open(path.toLocal8Bit().data(), db);
1264+
int myResult = sqlite3_open(path.toUtf8().data(), db);
12651265

12661266
if(myResult)
12671267
{

‎src/gui/qgsprojectionselector.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ QString QgsProjectionSelector::getCurrentProj4String()
302302

303303
sqlite3 *db;
304304
int rc;
305-
rc = sqlite3_open(myDatabaseFileName.toLocal8Bit().data(), &db);
305+
rc = sqlite3_open(myDatabaseFileName.toUtf8().data(), &db);
306306
if(rc)
307307
{
308308
QgsLogger::warning("Can't open database: " + QString(sqlite3_errmsg(db)));
@@ -394,7 +394,7 @@ long QgsProjectionSelector::getCurrentLongAttribute(QString attributeName)
394394
// opening it each time seems to be a reasonable approach at this time.
395395
sqlite3 *db;
396396
int rc;
397-
rc = sqlite3_open(myDatabaseFileName.toLocal8Bit().data(), &db);
397+
rc = sqlite3_open(myDatabaseFileName.toUtf8().data(), &db);
398398
if(rc)
399399
{
400400
std::cout << "Can't open database: " << sqlite3_errmsg(db) << std::endl;
@@ -515,7 +515,7 @@ void QgsProjectionSelector::applyUserProjList(QSet<QString> * crsFilter)
515515
sqlite3_stmt *myPreparedStatement;
516516
int myResult;
517517
//check the db is available
518-
myResult = sqlite3_open(QString(myDatabaseFileName).toLocal8Bit().data(), &myDatabase);
518+
myResult = sqlite3_open(QString(myDatabaseFileName).toUtf8().data(), &myDatabase);
519519
if(myResult)
520520
{
521521
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -591,7 +591,7 @@ void QgsProjectionSelector::applyProjList(QSet<QString> * crsFilter)
591591
// open the database containing the spatial reference data
592592
sqlite3 *db;
593593
int rc;
594-
rc = sqlite3_open(mSrsDatabaseFileName.toLocal8Bit().data(), &db);
594+
rc = sqlite3_open(mSrsDatabaseFileName.toUtf8().data(), &db);
595595
if(rc)
596596
{
597597
std::cout << "Can't open database: " << sqlite3_errmsg(db) << std::endl;
@@ -861,7 +861,7 @@ void QgsProjectionSelector::on_pbnFind_clicked()
861861
sqlite3_stmt *myPreparedStatement;
862862
int myResult;
863863
//check the db is available
864-
myResult = sqlite3_open(mSrsDatabaseFileName.toLocal8Bit().data(), &myDatabase);
864+
myResult = sqlite3_open(mSrsDatabaseFileName.toUtf8().data(), &myDatabase);
865865
if(myResult)
866866
{
867867
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -897,7 +897,7 @@ void QgsProjectionSelector::on_pbnFind_clicked()
897897
qDebug("User db does not exist");
898898
return ;
899899
}
900-
myResult = sqlite3_open(myDatabaseFileName.toLocal8Bit().data(), &myDatabase);
900+
myResult = sqlite3_open(myDatabaseFileName.toUtf8().data(), &myDatabase);
901901
if(myResult)
902902
{
903903
std::cout << "Can't open * user * database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -941,7 +941,7 @@ long QgsProjectionSelector::getLargestSRSIDMatch(QString theSql)
941941
myFileInfo.setFile(myDatabaseFileName);
942942
if ( myFileInfo.exists( ) ) //only bother trying to open if the file exists
943943
{
944-
myResult = sqlite3_open(myDatabaseFileName.toLocal8Bit().data(), &myDatabase);
944+
myResult = sqlite3_open(myDatabaseFileName.toUtf8().data(), &myDatabase);
945945
if(myResult)
946946
{
947947
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -973,7 +973,7 @@ long QgsProjectionSelector::getLargestSRSIDMatch(QString theSql)
973973

974974
//only bother looking in srs.db if it wasnt found above
975975

976-
myResult = sqlite3_open(mSrsDatabaseFileName.toLocal8Bit().data(), &myDatabase);
976+
myResult = sqlite3_open(mSrsDatabaseFileName.toUtf8().data(), &myDatabase);
977977
if(myResult)
978978
{
979979
std::cout << "Can't open * user * database: " << sqlite3_errmsg(myDatabase) << std::endl;

‎src/helpviewer/qgshelpviewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ int QgsHelpViewer::connectDb(const QString &helpDbPath)
188188
int result;
189189
if(QFileInfo(helpDbPath).exists()){
190190
int rc;
191-
rc = sqlite3_open(helpDbPath, &db);
191+
rc = sqlite3_open(helpDbPath.toUtf8().data(), &db);
192192
result = rc;
193193
}
194194
else

0 commit comments

Comments
 (0)
Please sign in to comment.