Skip to content

Commit 613a360

Browse files
author
jef
committedSep 12, 2009
fix line endings
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11640 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent a62052e commit 613a360

File tree

2 files changed

+144
-144
lines changed

2 files changed

+144
-144
lines changed
 

‎python/core/qgsdatasourceuri.sip

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
1-
/**
2-
\struct QgsDataSourceURI
3-
\brief Structure for storing the component parts of a PostgreSQL/RDBMS datasource URI.
4-
5-
This structure stores the database connection information, including host, database,
6-
user name, password, schema, password, and sql where clause
7-
*/
8-
class QgsDataSourceURI
9-
{
10-
%TypeHeaderCode
11-
#include <qgsdatasourceuri.h>
12-
%End
13-
14-
public:
15-
//! \note enumeration added in version 1.1
16-
enum SSLmode { SSLprefer, SSLdisable, SSLallow, SSLrequire };
17-
18-
//! default constructor
19-
QgsDataSourceURI();
20-
21-
//! constructor which parses input URI
22-
QgsDataSourceURI(QString uri);
23-
24-
//! connection info
25-
QString connectionInfo() const;
26-
27-
//! complete uri
28-
QString uri() const;
29-
30-
//! quoted table name
31-
QString quotedTablename() const;
32-
33-
//! Set all connection related members at once
34-
//! \note This optional sslmode parameter has been added in version 1.1
35-
void setConnection(const QString& aHost,
36-
const QString& aPort,
37-
const QString& aDatabase,
38-
const QString& aUsername,
39-
const QString& aPassword,
40-
SSLmode sslmode = SSLprefer );
41-
42-
//! Set all data source related members at once
43-
void setDataSource(const QString& aSchema,
44-
const QString& aTable,
45-
const QString& aGeometryColumn,
46-
const QString& aSql = QString(),
47-
const QString& aKeyColumn = QString());
48-
49-
/** Removes password from uris
50-
* @note this method was added in QGIS 1.1
51-
*/
52-
static QString removePassword( const QString& aUri);
53-
54-
QString username() const;
55-
QString schema() const;
56-
QString table() const;
57-
QString sql() const;
58-
QString geometryColumn() const;
59-
60-
// added in 1.1
61-
QString host() const;
62-
QString database() const;
63-
QString password() const;
64-
QString port() const;
65-
SSLmode sslMode() const;
66-
67-
void setSql(QString sql);
68-
69-
// added in 1.2
70-
QString keyColumn() const;
71-
void setKeyColumn(QString column);
72-
};
1+
/**
2+
\struct QgsDataSourceURI
3+
\brief Structure for storing the component parts of a PostgreSQL/RDBMS datasource URI.
4+
5+
This structure stores the database connection information, including host, database,
6+
user name, password, schema, password, and sql where clause
7+
*/
8+
class QgsDataSourceURI
9+
{
10+
%TypeHeaderCode
11+
#include <qgsdatasourceuri.h>
12+
%End
13+
14+
public:
15+
//! \note enumeration added in version 1.1
16+
enum SSLmode { SSLprefer, SSLdisable, SSLallow, SSLrequire };
17+
18+
//! default constructor
19+
QgsDataSourceURI();
20+
21+
//! constructor which parses input URI
22+
QgsDataSourceURI(QString uri);
23+
24+
//! connection info
25+
QString connectionInfo() const;
26+
27+
//! complete uri
28+
QString uri() const;
29+
30+
//! quoted table name
31+
QString quotedTablename() const;
32+
33+
//! Set all connection related members at once
34+
//! \note This optional sslmode parameter has been added in version 1.1
35+
void setConnection(const QString& aHost,
36+
const QString& aPort,
37+
const QString& aDatabase,
38+
const QString& aUsername,
39+
const QString& aPassword,
40+
SSLmode sslmode = SSLprefer );
41+
42+
//! Set all data source related members at once
43+
void setDataSource(const QString& aSchema,
44+
const QString& aTable,
45+
const QString& aGeometryColumn,
46+
const QString& aSql = QString(),
47+
const QString& aKeyColumn = QString());
48+
49+
/** Removes password from uris
50+
* @note this method was added in QGIS 1.1
51+
*/
52+
static QString removePassword( const QString& aUri);
53+
54+
QString username() const;
55+
QString schema() const;
56+
QString table() const;
57+
QString sql() const;
58+
QString geometryColumn() const;
59+
60+
// added in 1.1
61+
QString host() const;
62+
QString database() const;
63+
QString password() const;
64+
QString port() const;
65+
SSLmode sslMode() const;
66+
67+
void setSql(QString sql);
68+
69+
// added in 1.2
70+
QString keyColumn() const;
71+
void setKeyColumn(QString column);
72+
};

‎python/core/qgsproviderregistry.sip

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
1-
2-
/** canonical manager of data providers
3-
4-
This is a Singleton class that manages data provider access.
5-
*/
6-
class QgsProviderRegistry
7-
{
8-
%TypeHeaderCode
9-
#include <qgsproviderregistry.h>
10-
%End
11-
12-
public:
13-
14-
/** means of accessing canonical single instance */
15-
static QgsProviderRegistry* instance(QString pluginPath = QString::null);
16-
17-
/** Virtual dectructor */
18-
virtual ~QgsProviderRegistry();
19-
20-
QString library(const QString & providerKey) const;
21-
22-
QString pluginList(bool asHtml = false) const;
23-
24-
/** return library directory where plugins are found */
25-
const QDir & libraryDirectory() const;
26-
27-
void setLibraryDirectory(const QDir & path);
28-
29-
QgsDataProvider * getProvider( const QString & providerKey,
30-
const QString & dataSource );
31-
32-
/** Return list of available providers by their keys */
33-
QStringList providerList() const;
34-
35-
/** Return metadata of the provider or NULL if not found */
36-
const QgsProviderMetadata* providerMetadata(const QString& providerKey) const;
37-
38-
/** return vector file filter string
39-
40-
Returns a string suitable for a QFileDialog of vector file formats
41-
supported by all data providers.
42-
43-
This walks through all data providers appending calls to their
44-
fileVectorFilters to a string, which is then returned.
45-
46-
@note
47-
48-
It'd be nice to eventually be raster/vector neutral.
49-
*/
50-
virtual QString fileVectorFilters() const;
51-
/** return a string containing the available database drivers
52-
* @note this method was added in QGIS 1.1
53-
*/
54-
virtual QString databaseDrivers() const;
55-
/** return a string containing the available directory drivers
56-
* @note this method was added in QGIS 1.1
57-
*/
58-
virtual QString directoryDrivers() const;
59-
/** return a string containing the available protocol drivers
60-
* @note this method was added in QGIS 1.1
61-
*/
62-
virtual QString protocolDrivers() const;
63-
64-
65-
66-
private:
67-
68-
/** ctor private since instance() creates it */
69-
QgsProviderRegistry(QString pluginPath) /Default/ ;
70-
71-
}; // class QgsProviderRegistry
72-
1+
2+
/** canonical manager of data providers
3+
4+
This is a Singleton class that manages data provider access.
5+
*/
6+
class QgsProviderRegistry
7+
{
8+
%TypeHeaderCode
9+
#include <qgsproviderregistry.h>
10+
%End
11+
12+
public:
13+
14+
/** means of accessing canonical single instance */
15+
static QgsProviderRegistry* instance(QString pluginPath = QString::null);
16+
17+
/** Virtual dectructor */
18+
virtual ~QgsProviderRegistry();
19+
20+
QString library(const QString & providerKey) const;
21+
22+
QString pluginList(bool asHtml = false) const;
23+
24+
/** return library directory where plugins are found */
25+
const QDir & libraryDirectory() const;
26+
27+
void setLibraryDirectory(const QDir & path);
28+
29+
QgsDataProvider * getProvider( const QString & providerKey,
30+
const QString & dataSource );
31+
32+
/** Return list of available providers by their keys */
33+
QStringList providerList() const;
34+
35+
/** Return metadata of the provider or NULL if not found */
36+
const QgsProviderMetadata* providerMetadata(const QString& providerKey) const;
37+
38+
/** return vector file filter string
39+
40+
Returns a string suitable for a QFileDialog of vector file formats
41+
supported by all data providers.
42+
43+
This walks through all data providers appending calls to their
44+
fileVectorFilters to a string, which is then returned.
45+
46+
@note
47+
48+
It'd be nice to eventually be raster/vector neutral.
49+
*/
50+
virtual QString fileVectorFilters() const;
51+
/** return a string containing the available database drivers
52+
* @note this method was added in QGIS 1.1
53+
*/
54+
virtual QString databaseDrivers() const;
55+
/** return a string containing the available directory drivers
56+
* @note this method was added in QGIS 1.1
57+
*/
58+
virtual QString directoryDrivers() const;
59+
/** return a string containing the available protocol drivers
60+
* @note this method was added in QGIS 1.1
61+
*/
62+
virtual QString protocolDrivers() const;
63+
64+
65+
66+
private:
67+
68+
/** ctor private since instance() creates it */
69+
QgsProviderRegistry(QString pluginPath) /Default/ ;
70+
71+
}; // class QgsProviderRegistry
72+

0 commit comments

Comments
 (0)