[QGIS Commit] r10579 - in trunk/qgis: python/core src/core

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-04-16 16:15:45 -0400 (Thu, 16 Apr 2009)
New Revision: 10579

Modified:
   trunk/qgis/python/core/qgsdatasourceuri.sip
   trunk/qgis/src/core/qgsdatasourceuri.cpp
   trunk/qgis/src/core/qgsdatasourceuri.h
Log:
add QgsDataSourceURI::database()

Modified: trunk/qgis/python/core/qgsdatasourceuri.sip
===================================================================
--- trunk/qgis/python/core/qgsdatasourceuri.sip	2009-04-16 19:58:26 UTC (rev 10578)
+++ trunk/qgis/python/core/qgsdatasourceuri.sip	2009-04-16 20:15:45 UTC (rev 10579)
@@ -55,6 +55,7 @@
   QString table() const;
   QString sql() const;
   QString geometryColumn() const;
+  QString database() const; // added in version 1.1
 
   void setSql(QString sql);
 };

Modified: trunk/qgis/src/core/qgsdatasourceuri.cpp
===================================================================
--- trunk/qgis/src/core/qgsdatasourceuri.cpp	2009-04-16 19:58:26 UTC (rev 10578)
+++ trunk/qgis/src/core/qgsdatasourceuri.cpp	2009-04-16 20:15:45 UTC (rev 10579)
@@ -212,6 +212,11 @@
   return mUsername;
 }
 
+QString QgsDataSourceURI::database() const
+{
+  return mDatabase;
+}
+
 QString QgsDataSourceURI::schema() const
 {
   return mSchema;

Modified: trunk/qgis/src/core/qgsdatasourceuri.h
===================================================================
--- trunk/qgis/src/core/qgsdatasourceuri.h	2009-04-16 19:58:26 UTC (rev 10578)
+++ trunk/qgis/src/core/qgsdatasourceuri.h	2009-04-16 20:15:45 UTC (rev 10579)
@@ -71,6 +71,7 @@
     QString table() const;
     QString sql() const;
     QString geometryColumn() const;
+    QString database() const;	// added in version 1.1
     enum SSLmode sslMode() const;
 
     void clearSchema();