Skip to content

Commit cb3584a

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/branches/Release-0_8_0@6827 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-0_8_1Release-0_8_1
1 parent b50cead commit cb3584a

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed
 

‎src/core/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/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/gui/qgsbookmarks.cpp

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

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

‎src/gui/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;
@@ -261,7 +261,7 @@ QString QgsCustomProjectionDialog::getProjectionFamilyName(QString theProjection
261261
int myResult;
262262
QString myName;
263263
//check the db is available
264-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
264+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
265265
if(myResult)
266266
{
267267
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -292,7 +292,7 @@ QString QgsCustomProjectionDialog::getEllipsoidName(QString theEllipsoidAcronym)
292292
int myResult;
293293
QString myName;
294294
//check the db is available
295-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
295+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
296296
if(myResult)
297297
{
298298
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -323,7 +323,7 @@ QString QgsCustomProjectionDialog::getProjectionFamilyAcronym(QString theProject
323323
int myResult;
324324
QString myName;
325325
//check the db is available
326-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
326+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
327327
if(myResult)
328328
{
329329
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -354,7 +354,7 @@ QString QgsCustomProjectionDialog::getEllipsoidAcronym(QString theEllipsoidName)
354354
int myResult;
355355
QString myName;
356356
//check the db is available
357-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
357+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
358358
if(myResult)
359359
{
360360
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -388,7 +388,7 @@ void QgsCustomProjectionDialog::on_pbnFirst_clicked()
388388
sqlite3_stmt *myPreparedStatement;
389389
int myResult;
390390
//check the db is available
391-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
391+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
392392
if(myResult)
393393
{
394394
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -464,7 +464,7 @@ void QgsCustomProjectionDialog::on_pbnPrevious_clicked()
464464
sqlite3_stmt *myPreparedStatement;
465465
int myResult;
466466
//check the db is available
467-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
467+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
468468
if(myResult)
469469
{
470470
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -541,7 +541,7 @@ void QgsCustomProjectionDialog::on_pbnNext_clicked()
541541
sqlite3_stmt *myPreparedStatement;
542542
int myResult;
543543
//check the db is available
544-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
544+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
545545
if(myResult)
546546
{
547547
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -615,7 +615,7 @@ void QgsCustomProjectionDialog::on_pbnLast_clicked()
615615
sqlite3_stmt *myPreparedStatement;
616616
int myResult;
617617
//check the db is available
618-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
618+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
619619
if(myResult)
620620
{
621621
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -832,7 +832,7 @@ void QgsCustomProjectionDialog::on_pbnSave_clicked()
832832
sqlite3_stmt *myPreparedStatement;
833833
int myResult;
834834
//check the db is available
835-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
835+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
836836
if(myResult!=SQLITE_OK)
837837
{
838838
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) <<
@@ -960,7 +960,7 @@ void QgsCustomProjectionDialog::cboProjectionFamily_highlighted( const QString &
960960
sqlite3_stmt *myPreparedStatement;
961961
int myResult;
962962
//check the db is available
963-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
963+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
964964
if(myResult!=SQLITE_OK)
965965
{
966966
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;

‎src/gui/qgsoptions.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ void QgsOptions::getEllipsoidList()
315315
sqlite3_stmt *myPreparedStatement;
316316
int myResult;
317317
//check the db is available
318-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
318+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
319319
if(myResult)
320320
{
321321
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -348,7 +348,7 @@ QString QgsOptions::getEllipsoidAcronym(QString theEllipsoidName)
348348
int myResult;
349349
QString myName;
350350
//check the db is available
351-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
351+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
352352
if(myResult)
353353
{
354354
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -380,7 +380,7 @@ QString QgsOptions::getEllipsoidName(QString theEllipsoidAcronym)
380380
int myResult;
381381
QString myName;
382382
//check the db is available
383-
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
383+
myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase);
384384
if(myResult)
385385
{
386386
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;

‎src/helpviewer/qgshelpviewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ int QgsHelpViewer::connectDb(const QString &helpDbPath)
189189
if(QFileInfo(helpDbPath).exists()){
190190
char *zErrMsg = 0;
191191
int rc;
192-
rc = sqlite3_open(helpDbPath, &db);
192+
rc = sqlite3_open(helpDbPath.toUtf8().data(), &db);
193193
result = rc;
194194
}
195195
else

‎src/widgets/projectionselector/qgsprojectionselector.cpp

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

308308
sqlite3 *db;
309309
int rc;
310-
rc = sqlite3_open(myDatabaseFileName.toLocal8Bit().data(), &db);
310+
rc = sqlite3_open(myDatabaseFileName.toUtf8().data(), &db);
311311
if(rc)
312312
{
313313
std::cout << "Can't open database: " << sqlite3_errmsg(db) << std::endl;
@@ -400,7 +400,7 @@ long QgsProjectionSelector::getCurrentLongAttribute(QString attributeName)
400400
// opening it each time seems to be a reasonable approach at this time.
401401
sqlite3 *db;
402402
int rc;
403-
rc = sqlite3_open(myDatabaseFileName.toLocal8Bit().data(), &db);
403+
rc = sqlite3_open(myDatabaseFileName.toUtf8().data(), &db);
404404
if(rc)
405405
{
406406
std::cout << "Can't open database: " << sqlite3_errmsg(db) << std::endl;
@@ -521,7 +521,7 @@ void QgsProjectionSelector::applyUserProjList(QSet<QString> * crsFilter)
521521
sqlite3_stmt *myPreparedStatement;
522522
int myResult;
523523
//check the db is available
524-
myResult = sqlite3_open(QString(myDatabaseFileName).toLocal8Bit().data(), &myDatabase);
524+
myResult = sqlite3_open(QString(myDatabaseFileName).toUtf8().data(), &myDatabase);
525525
if(myResult)
526526
{
527527
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -597,7 +597,7 @@ void QgsProjectionSelector::applyProjList(QSet<QString> * crsFilter)
597597
// open the database containing the spatial reference data
598598
sqlite3 *db;
599599
int rc;
600-
rc = sqlite3_open(mSrsDatabaseFileName.toLocal8Bit().data(), &db);
600+
rc = sqlite3_open(mSrsDatabaseFileName.toUtf8().data(), &db);
601601
if(rc)
602602
{
603603
std::cout << "Can't open database: " << sqlite3_errmsg(db) << std::endl;
@@ -867,7 +867,7 @@ void QgsProjectionSelector::on_pbnFind_clicked()
867867
sqlite3_stmt *myPreparedStatement;
868868
int myResult;
869869
//check the db is available
870-
myResult = sqlite3_open(mSrsDatabaseFileName.toLocal8Bit().data(), &myDatabase);
870+
myResult = sqlite3_open(mSrsDatabaseFileName.toUtf8().data(), &myDatabase);
871871
if(myResult)
872872
{
873873
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -903,7 +903,7 @@ void QgsProjectionSelector::on_pbnFind_clicked()
903903
qDebug("User db does not exist");
904904
return ;
905905
}
906-
myResult = sqlite3_open(myDatabaseFileName.toLocal8Bit().data(), &myDatabase);
906+
myResult = sqlite3_open(myDatabaseFileName.toUtf8().data(), &myDatabase);
907907
if(myResult)
908908
{
909909
std::cout << "Can't open * user * database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -947,7 +947,7 @@ long QgsProjectionSelector::getLargestSRSIDMatch(QString theSql)
947947
myFileInfo.setFile(myDatabaseFileName);
948948
if ( myFileInfo.exists( ) ) //only bother trying to open if the file exists
949949
{
950-
myResult = sqlite3_open(myDatabaseFileName.toLocal8Bit().data(), &myDatabase);
950+
myResult = sqlite3_open(myDatabaseFileName.toUtf8().data(), &myDatabase);
951951
if(myResult)
952952
{
953953
std::cout << "Can't open database: " << sqlite3_errmsg(myDatabase) << std::endl;
@@ -983,7 +983,7 @@ long QgsProjectionSelector::getLargestSRSIDMatch(QString theSql)
983983
}
984984
//only bother looking in srs.db if it wasnt found above
985985

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

0 commit comments

Comments
 (0)
Please sign in to comment.