Add QgsApplication::qgisUserDbFilePath() accessor. Use it to resume accessing the user db and avoid a crash caused by a switch to the srs db.

telwertowski · telwertowski · commit 0cd50ae780e9 · 2006-01-16T03:31:39.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4699 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -16,6 +16,8 @@
 
 #include "qgsapplication.h"
 
+#include <QDir>
+
 QString QgsApplication::mPrefixPath;
 QString QgsApplication::mPluginPath;
 QString QgsApplication::mPkgDataPath;
@@ -105,6 +107,14 @@ const QString QgsApplication::qgisMasterDbFilePath()
   return mPkgDataPath + QString("/resources/qgis.db");
 }
 
+/*!
+  Returns the path to the user qgis.db file.
+*/
+const QString QgsApplication::qgisUserDbFilePath()
+{
+  return QDir::homeDirPath() + QString("/.qgis/qgis.db");
+}
+
 /*!
   Returns the path to the splash screen image directory.
 */
diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h
@@ -42,6 +42,9 @@ class QgsApplication: public QApplication
     //! Returns the path to the master qgis.db file.
     static const QString qgisMasterDbFilePath();
 
+    //! Returns the path to the user qgis.db file.
+    static const QString qgisUserDbFilePath();
+
     //! Returns the path to the splash screen image directory.
     static const QString splashPath();
 
diff --git a/src/gui/qgsoptions.cpp b/src/gui/qgsoptions.cpp
@@ -264,7 +264,7 @@ void QgsOptions::getEllipsoidList()
   sqlite3_stmt *myPreparedStatement;
   int           myResult;
   //check the db is available
-  myResult = sqlite3_open(QString(QgsApplication::srsDbFilePath()+"qgis.db").latin1(), &myDatabase);
+  myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
   if(myResult) 
   {
     std::cout <<  "Can't open database: " <<  sqlite3_errmsg(myDatabase) << std::endl; 
@@ -297,7 +297,7 @@ QString QgsOptions::getEllipsoidAcronym(QString theEllipsoidName)
   int           myResult;
   QString       myName;
   //check the db is available
-  myResult = sqlite3_open(QString(QgsApplication::srsDbFilePath()+"qgis.db").latin1(), &myDatabase);
+  myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
   if(myResult) 
   {
     std::cout <<  "Can't open database: " <<  sqlite3_errmsg(myDatabase) << std::endl; 
@@ -329,7 +329,7 @@ QString QgsOptions::getEllipsoidName(QString theEllipsoidAcronym)
   int           myResult;
   QString       myName;
   //check the db is available
-  myResult = sqlite3_open((QgsApplication::srsDbFilePath()+"qgis.db").latin1(), &myDatabase);
+  myResult = sqlite3_open(QgsApplication::qgisUserDbFilePath(), &myDatabase);
   if(myResult) 
   {
     std::cout <<  "Can't open database: " <<  sqlite3_errmsg(myDatabase) << std::endl; 
