From 02bf44eb2c3ac04843d4ab67c6be15985594d1d4 Mon Sep 17 00:00:00 2001 From: jef Date: Thu, 16 Apr 2009 22:09:45 +0000 Subject: [PATCH] complete QgsDataSourceURI() methods git-svn-id: http://svn.osgeo.org/qgis/trunk@10581 c8812cc2-4d05-0410-92ff-de0c093fc19c --- python/core/qgsdatasourceuri.sip | 8 +++++++- src/core/qgsdatasourceuri.cpp | 20 ++++++++++++++++++++ src/core/qgsdatasourceuri.h | 9 +++++++-- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/python/core/qgsdatasourceuri.sip b/python/core/qgsdatasourceuri.sip index 007d45aa8f2..4ba57fc44ce 100644 --- a/python/core/qgsdatasourceuri.sip +++ b/python/core/qgsdatasourceuri.sip @@ -55,7 +55,13 @@ public: 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); }; diff --git a/src/core/qgsdatasourceuri.cpp b/src/core/qgsdatasourceuri.cpp index da0deb8d699..25563947e4e 100644 --- a/src/core/qgsdatasourceuri.cpp +++ b/src/core/qgsdatasourceuri.cpp @@ -212,11 +212,31 @@ QString QgsDataSourceURI::username() const 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; diff --git a/src/core/qgsdatasourceuri.h b/src/core/qgsdatasourceuri.h index d77e3b177cd..4febf1bba41 100644 --- a/src/core/qgsdatasourceuri.h +++ b/src/core/qgsdatasourceuri.h @@ -71,12 +71,17 @@ class CORE_EXPORT QgsDataSourceURI 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 );