[QGIS Commit] r10581 - in trunk/qgis: python/core src/core
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Thu Apr 16 18:09:45 EDT 2009
Author: jef
Date: 2009-04-16 18:09:45 -0400 (Thu, 16 Apr 2009)
New Revision: 10581
Modified:
trunk/qgis/python/core/qgsdatasourceuri.sip
trunk/qgis/src/core/qgsdatasourceuri.cpp
trunk/qgis/src/core/qgsdatasourceuri.h
Log:
complete QgsDataSourceURI() methods
Modified: trunk/qgis/python/core/qgsdatasourceuri.sip
===================================================================
--- trunk/qgis/python/core/qgsdatasourceuri.sip 2009-04-16 22:06:29 UTC (rev 10580)
+++ trunk/qgis/python/core/qgsdatasourceuri.sip 2009-04-16 22:09:45 UTC (rev 10581)
@@ -55,7 +55,13 @@
QString table() const;
QString sql() const;
QString geometryColumn() const;
- QString database() const; // added in version 1.1
+ // added in 1.1
+ QString host() const;
+ QString database() const;
+ QString password() const;
+ QString port() const;
+ SSLmode sslMode() const;
+
void setSql(QString sql);
};
Modified: trunk/qgis/src/core/qgsdatasourceuri.cpp
===================================================================
--- trunk/qgis/src/core/qgsdatasourceuri.cpp 2009-04-16 22:06:29 UTC (rev 10580)
+++ trunk/qgis/src/core/qgsdatasourceuri.cpp 2009-04-16 22:09:45 UTC (rev 10581)
@@ -212,11 +212,31 @@
return mUsername;
}
+QString QgsDataSourceURI::host() const
+{
+ return mHost;
+}
+
QString QgsDataSourceURI::database() const
{
return mDatabase;
}
+QString QgsDataSourceURI::password() const
+{
+ return mPassword;
+}
+
+QString QgsDataSourceURI::port() const
+{
+ return mPort;
+}
+
+QgsDataSourceURI::SSLmode QgsDataSourceURI::sslMode() const
+{
+ return mSSLmode;
+}
+
QString QgsDataSourceURI::schema() const
{
return mSchema;
Modified: trunk/qgis/src/core/qgsdatasourceuri.h
===================================================================
--- trunk/qgis/src/core/qgsdatasourceuri.h 2009-04-16 22:06:29 UTC (rev 10580)
+++ trunk/qgis/src/core/qgsdatasourceuri.h 2009-04-16 22:09:45 UTC (rev 10581)
@@ -71,12 +71,17 @@
QString table() const;
QString sql() const;
QString geometryColumn() const;
- QString database() const; // added in version 1.1
- enum SSLmode sslMode() const;
void clearSchema();
void setSql( QString sql );
+ // added in version 1.1
+ QString host() const;
+ QString database() const;
+ QString port() const;
+ QString password() const;
+ enum SSLmode sslMode() const;
+
private:
void skipBlanks( const QString &uri, int &i );
QString getValue( const QString &uri, int &i );
More information about the QGIS-commit
mailing list