From e0e503326e91d0becf95e2615c114a138c1106f6 Mon Sep 17 00:00:00 2001 From: mcoletti Date: Fri, 31 Dec 2004 00:30:32 +0000 Subject: [PATCH] Fixes for const-correctness not propogated properly to sub-classes. git-svn-id: http://svn.osgeo.org/qgis/trunk@2553 c8812cc2-4d05-0410-92ff-de0c093fc19c --- providers/delimitedtext/qgsdelimitedtextprovider.cpp | 2 +- providers/delimitedtext/qgsdelimitedtextprovider.h | 3 ++- providers/gpx/qgsgpxprovider.h | 10 ++++++++-- providers/ogr/qgsshapefileprovider.h | 11 +++++++++-- providers/postgres/qgspostgresprovider.cpp | 2 +- providers/postgres/qgspostgresprovider.h | 8 +++++--- 6 files changed, 26 insertions(+), 10 deletions(-) diff --git a/providers/delimitedtext/qgsdelimitedtextprovider.cpp b/providers/delimitedtext/qgsdelimitedtextprovider.cpp index 1688113652b..06b5679174f 100644 --- a/providers/delimitedtext/qgsdelimitedtextprovider.cpp +++ b/providers/delimitedtext/qgsdelimitedtextprovider.cpp @@ -725,7 +725,7 @@ bool QgsDelimitedTextProvider::boundsCheck(double x, double y) return inBounds; } -bool QgsDelimitedTextProvider::supportsSaveAsShapefile() +bool QgsDelimitedTextProvider::supportsSaveAsShapefile() const { return true; } diff --git a/providers/delimitedtext/qgsdelimitedtextprovider.h b/providers/delimitedtext/qgsdelimitedtextprovider.h index 6792409aacb..9333c5360f4 100644 --- a/providers/delimitedtext/qgsdelimitedtextprovider.h +++ b/providers/delimitedtext/qgsdelimitedtextprovider.h @@ -208,10 +208,11 @@ public: //! We support saving as shapefile - used to add item to the // layers context menu - bool supportsSaveAsShapefile(); + bool supportsSaveAsShapefile() const; //! Save the layer as a shapefile bool saveAsShapefile(); + QgsDataSourceURI *getURI() { return 0; diff --git a/providers/gpx/qgsgpxprovider.h b/providers/gpx/qgsgpxprovider.h index 759e44b8959..f6fa7694a90 100644 --- a/providers/gpx/qgsgpxprovider.h +++ b/providers/gpx/qgsgpxprovider.h @@ -150,9 +150,15 @@ public: */ bool boundsCheck(double x, double y); - bool supportsFeatureAddition(){return true;} + bool supportsFeatureAddition() const + { + return true; + } - QgsDataSourceURI *getURI(){return 0;}; + QgsDataSourceURI *getURI() + { + return 0; + } private: diff --git a/providers/ogr/qgsshapefileprovider.h b/providers/ogr/qgsshapefileprovider.h index 53bf89bbc28..7bba7af49e3 100644 --- a/providers/ogr/qgsshapefileprovider.h +++ b/providers/ogr/qgsshapefileprovider.h @@ -140,8 +140,15 @@ class QgsShapeFileProvider:public QgsVectorDataProvider /**Writes a list of features to the file*/ bool addFeatures(std::list flist); - bool supportsFeatureAddition(){return true;} - QgsDataSourceURI * getURI(){ return 0;}; + bool supportsFeatureAddition() const + { + return true; + } + + QgsDataSourceURI * getURI() + { + return 0; + } private: unsigned char *getGeometryPointer(OGRFeature * fet); diff --git a/providers/postgres/qgspostgresprovider.cpp b/providers/postgres/qgspostgresprovider.cpp index 76aa8accc73..72c1b9cc72d 100644 --- a/providers/postgres/qgspostgresprovider.cpp +++ b/providers/postgres/qgspostgresprovider.cpp @@ -1146,7 +1146,7 @@ bool QgsPostgresProvider::deleteFeatures(std::list id) return returnvalue; } -bool QgsPostgresProvider::supportsSaveAsShapefile() +bool QgsPostgresProvider::supportsSaveAsShapefile() const { return false; } diff --git a/providers/postgres/qgspostgresprovider.h b/providers/postgres/qgspostgresprovider.h index bbc0ee5ad90..037215279c8 100644 --- a/providers/postgres/qgspostgresprovider.h +++ b/providers/postgres/qgspostgresprovider.h @@ -204,12 +204,14 @@ public: @return true in case of success and false in case of failure*/ bool deleteFeatures(std::list id); - bool supportsFeatureAddition(){return true;} + bool supportsFeatureAddition() const + { return true; } - bool supportsFeatureDeletion(){return true;} + bool supportsFeatureDeletion() const + {return true;} //! Flag to indicate if the provider can export to shapefile - bool supportsSaveAsShapefile(); + bool supportsSaveAsShapefile() const; /** Accessor for sql where clause used to limit dataset */ QString subsetString() {return sqlWhereClause;};