From 8457136e4fbebf6828779b75911dfbe60dee02ec Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 10 Jan 2013 23:58:29 +0000 Subject: Apply some const love. --- geography/qgis/distinfo | 9 ++- .../qgis/patches/patch-src_core_qgsmaplayer.cpp | 86 ++++++++++++++++++++++ .../qgis/patches/patch-src_core_qgsmaplayer.h | 70 ++++++++++++++++++ .../qgis/patches/patch-src_core_qgsvectorlayer.cpp | 13 ++++ .../patches/patch-src_core_qgsvectorlayer.h.diff | 16 ++++ .../patch-src_core_raster_qgsrasterlayer.cpp | 13 ++++ .../patches/patch-src_core_raster_qgsrasterlayer.h | 13 ++++ .../patch-src_core_symbology-ng_qgssymbolv2.h | 13 ++++ 8 files changed, 232 insertions(+), 1 deletion(-) create mode 100644 geography/qgis/patches/patch-src_core_qgsmaplayer.cpp create mode 100644 geography/qgis/patches/patch-src_core_qgsmaplayer.h create mode 100644 geography/qgis/patches/patch-src_core_qgsvectorlayer.cpp create mode 100644 geography/qgis/patches/patch-src_core_qgsvectorlayer.h.diff create mode 100644 geography/qgis/patches/patch-src_core_raster_qgsrasterlayer.cpp create mode 100644 geography/qgis/patches/patch-src_core_raster_qgsrasterlayer.h create mode 100644 geography/qgis/patches/patch-src_core_symbology-ng_qgssymbolv2.h diff --git a/geography/qgis/distinfo b/geography/qgis/distinfo index ee3746973c6..11265300baa 100644 --- a/geography/qgis/distinfo +++ b/geography/qgis/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2012/02/26 23:19:02 adam Exp $ +$NetBSD: distinfo,v 1.5 2013/01/10 23:58:29 joerg Exp $ SHA1 (qgis-1.7.4.tar.bz2) = 0dae5cb933d1ce621e5fe30c1937887d813a2098 RMD160 (qgis-1.7.4.tar.bz2) = dae51556b09a57ce9537ca4ed75830f15e3be5a4 @@ -10,6 +10,13 @@ SHA1 (patch-am) = 69864d921b4438b9a90f0bfb8f727d96a41d00d9 SHA1 (patch-cmake_FindGEOS.cmake) = f3d2cfc454a3da938cdfa9b1c25aead96674d796 SHA1 (patch-src_app_CMakeLists.txt) = 9862723ae1cc432aabb53eca5b3eb29bc6906b1a SHA1 (patch-src_core_qgsapplication.cpp) = 336de19802fdfb0cbe8e83f62f230404324af3e7 +SHA1 (patch-src_core_qgsmaplayer.cpp) = 581435f5a50484a76db7c63ec81388a2c7447fc7 +SHA1 (patch-src_core_qgsmaplayer.h) = ba05cddca7c5c7d1ac6a1cd8bb9190ffb7371a7e +SHA1 (patch-src_core_qgsvectorlayer.cpp) = d4fc76490d8d710add8fb2632f8bbc79dcbaa4d1 +SHA1 (patch-src_core_qgsvectorlayer.h) = 091f6bd54a2a8d3d504f95dc4a6cec3fc6735d83 +SHA1 (patch-src_core_raster_qgsrasterlayer.cpp) = 9501fb0c31096613cd9da3f928704532d1c0aa23 +SHA1 (patch-src_core_raster_qgsrasterlayer.h) = 50ad211252064b51d875b217c8f91315cedb9ea5 SHA1 (patch-src_core_spatialindex_include_Tools.h) = ccee3200f1a4d6807d0da2fb3f2307bfc345f83d SHA1 (patch-src_core_spatialite_spatialite.c) = a6b8ad377311a4a3e122a1336ccc32a2b1638cd7 +SHA1 (patch-src_core_symbology-ng_qgssymbolv2.h) = 4ffe326210e77a37d3f984798ec2c9cc51865716 SHA1 (patch-src_helpviewer_CMakeLists.txt) = 209347863b9b3719d0eb04b142c831a2bfdb77ea diff --git a/geography/qgis/patches/patch-src_core_qgsmaplayer.cpp b/geography/qgis/patches/patch-src_core_qgsmaplayer.cpp new file mode 100644 index 00000000000..8756dd38a69 --- /dev/null +++ b/geography/qgis/patches/patch-src_core_qgsmaplayer.cpp @@ -0,0 +1,86 @@ +$NetBSD: patch-src_core_qgsmaplayer.cpp,v 1.1 2013/01/10 23:58:30 joerg Exp $ + +--- src/core/qgsmaplayer.cpp.orig 2012-12-25 15:19:10.000000000 +0000 ++++ src/core/qgsmaplayer.cpp +@@ -279,7 +279,7 @@ bool QgsMapLayer::readXml( QDomNode & la + + + +-bool QgsMapLayer::writeXML( QDomNode & layer_node, QDomDocument & document ) ++bool QgsMapLayer::writeXML( QDomNode & layer_node, QDomDocument & document ) const + { + // general layer metadata + QDomElement maplayer = document.createElement( "maplayer" ); +@@ -301,7 +301,7 @@ bool QgsMapLayer::writeXML( QDomNode & l + + QString src = source(); + +- QgsVectorLayer *vlayer = qobject_cast( this ); ++ const QgsVectorLayer *vlayer = qobject_cast( this ); + if ( vlayer && vlayer->providerType() == "spatialite" ) + { + QgsDataSourceURI uri( src ); +@@ -377,7 +377,7 @@ bool QgsMapLayer::writeXML( QDomNode & l + + + +-bool QgsMapLayer::writeXml( QDomNode & layer_node, QDomDocument & document ) ++bool QgsMapLayer::writeXml( QDomNode & layer_node, QDomDocument & document ) const + { + // NOP by default; children will over-ride with behavior specific to them + +@@ -422,7 +422,7 @@ void QgsMapLayer::toggleScaleBasedVisibi + mScaleBasedVisibility = theVisibilityFlag; + } + +-bool QgsMapLayer::hasScaleBasedVisibility() ++bool QgsMapLayer::hasScaleBasedVisibility() const + { + return mScaleBasedVisibility; + } +@@ -432,7 +432,7 @@ void QgsMapLayer::setMinimumScale( float + mMinScale = theMinScale; + } + +-float QgsMapLayer::minimumScale() ++float QgsMapLayer::minimumScale() const + { + return mMinScale; + } +@@ -443,23 +443,23 @@ void QgsMapLayer::setMaximumScale( float + mMaxScale = theMaxScale; + } + +-float QgsMapLayer::maximumScale() ++float QgsMapLayer::maximumScale() const + { + return mMaxScale; + } + + +-QStringList QgsMapLayer::subLayers() ++QStringList QgsMapLayer::subLayers() const + { + return QStringList(); // Empty + } + +-void QgsMapLayer::setLayerOrder( QStringList layers ) ++void QgsMapLayer::setLayerOrder( const QStringList &layers ) + { + // NOOP + } + +-void QgsMapLayer::setSubLayerVisibility( QString name, bool vis ) ++void QgsMapLayer::setSubLayerVisibility( const QString &name, bool vis ) + { + // NOOP + } +@@ -483,7 +483,7 @@ void QgsMapLayer::setCrs( const QgsCoord + emit layerCrsChanged(); + } + +-unsigned int QgsMapLayer::getTransparency() ++unsigned int QgsMapLayer::getTransparency() const + { + return mTransparencyLevel; + } diff --git a/geography/qgis/patches/patch-src_core_qgsmaplayer.h b/geography/qgis/patches/patch-src_core_qgsmaplayer.h new file mode 100644 index 00000000000..dc6cde4bed0 --- /dev/null +++ b/geography/qgis/patches/patch-src_core_qgsmaplayer.h @@ -0,0 +1,70 @@ +$NetBSD: patch-src_core_qgsmaplayer.h,v 1.1 2013/01/10 23:58:30 joerg Exp $ + +--- src/core/qgsmaplayer.h.orig 2012-12-25 15:15:57.000000000 +0000 ++++ src/core/qgsmaplayer.h +@@ -127,16 +127,16 @@ class CORE_EXPORT QgsMapLayer : public Q + * Returns the sublayers of this layer + * (Useful for providers that manage their own layers, such as WMS) + */ +- virtual QStringList subLayers(); ++ virtual QStringList subLayers() const; + + /** + * Reorders the *previously selected* sublayers of this layer from bottom to top + * (Useful for providers that manage their own layers, such as WMS) + */ +- virtual void setLayerOrder( QStringList layers ); ++ virtual void setLayerOrder( const QStringList &layers ); + + /** Set the visibility of the given sublayer name */ +- virtual void setSubLayerVisibility( QString name, bool vis ); ++ virtual void setSubLayerVisibility( const QString &name, bool vis ); + + + /** True if the layer can be edited */ +@@ -174,7 +174,7 @@ class CORE_EXPORT QgsMapLayer : public Q + + @returns true if successful + */ +- bool writeXML( QDomNode & layer_node, QDomDocument & document ); ++ bool writeXML( QDomNode & layer_node, QDomDocument & document ) const; + + /** Set a custom property for layer. Properties are stored in a map and saved in project file. + * @note Added in v1.4 */ +@@ -193,7 +193,7 @@ class CORE_EXPORT QgsMapLayer : public Q + virtual bool hasCompatibleSymbology( const QgsMapLayer& other ) const = 0; + + /** Accessor for transparency level. */ +- unsigned int getTransparency(); ++ unsigned int getTransparency() const; + + /** Mutator for transparency level. Should be between 0 and 255 */ + void setTransparency( unsigned int ); +@@ -318,15 +318,15 @@ class CORE_EXPORT QgsMapLayer : public Q + + /** Accessor and mutator for the minimum scale member */ + void setMinimumScale( float theMinScale ); +- float minimumScale(); ++ float minimumScale() const; + + /** Accessor and mutator for the maximum scale member */ + void setMaximumScale( float theMaxScale ); +- float maximumScale(); ++ float maximumScale() const; + + /** Accessor and mutator for the scale based visilibility flag */ + void toggleScaleBasedVisibility( bool theVisibilityFlag ); +- bool hasScaleBasedVisibility(); ++ bool hasScaleBasedVisibility() const; + + /** Clear cached image + * added in 1.5 */ +@@ -381,7 +381,7 @@ class CORE_EXPORT QgsMapLayer : public Q + /** called by writeXML(), used by children to write state specific to them to + project files. + */ +- virtual bool writeXml( QDomNode & layer_node, QDomDocument & document ); ++ virtual bool writeXml( QDomNode & layer_node, QDomDocument & document ) const; + + + /** Read custom properties from project file. Added in v1.4 diff --git a/geography/qgis/patches/patch-src_core_qgsvectorlayer.cpp b/geography/qgis/patches/patch-src_core_qgsvectorlayer.cpp new file mode 100644 index 00000000000..88774be9e62 --- /dev/null +++ b/geography/qgis/patches/patch-src_core_qgsvectorlayer.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-src_core_qgsvectorlayer.cpp,v 1.1 2013/01/10 23:58:30 joerg Exp $ + +--- src/core/qgsvectorlayer.cpp.orig 2012-12-25 15:28:50.000000000 +0000 ++++ src/core/qgsvectorlayer.cpp +@@ -2811,7 +2811,7 @@ bool QgsVectorLayer::setDataProvider( QS + + /* virtual */ + bool QgsVectorLayer::writeXml( QDomNode & layer_node, +- QDomDocument & document ) ++ QDomDocument & document ) const + { + // first get the layer element so that we can append the type attribute + diff --git a/geography/qgis/patches/patch-src_core_qgsvectorlayer.h.diff b/geography/qgis/patches/patch-src_core_qgsvectorlayer.h.diff new file mode 100644 index 00000000000..310cfb3695e --- /dev/null +++ b/geography/qgis/patches/patch-src_core_qgsvectorlayer.h.diff @@ -0,0 +1,16 @@ +--- geography/qgis/patches/patch-src_core_qgsvectorlayer.h ++++ geography/qgis/patches/patch-src_core_qgsvectorlayer.h +@@ -0,0 +1,13 @@ ++$NetBSD: patch-src_core_qgsvectorlayer.h.diff,v 1.1 2013/01/10 23:58:30 joerg Exp $ ++ ++--- src/core/qgsvectorlayer.h.orig 2012-12-25 15:25:41.000000000 +0000 +++++ src/core/qgsvectorlayer.h ++@@ -262,7 +262,7 @@ class CORE_EXPORT QgsVectorLayer : publi ++ /** write vector layer specific state to project file Dom node. ++ * @note Called by QgsMapLayer::writeXML(). ++ */ ++- virtual bool writeXml( QDomNode & layer_node, QDomDocument & doc ); +++ virtual bool writeXml( QDomNode & layer_node, QDomDocument & doc ) const; ++ ++ /** Read the symbology for the current layer from the Dom node supplied. ++ * @param node node that will contain the symbology definition for this layer. diff --git a/geography/qgis/patches/patch-src_core_raster_qgsrasterlayer.cpp b/geography/qgis/patches/patch-src_core_raster_qgsrasterlayer.cpp new file mode 100644 index 00000000000..1b9148435a0 --- /dev/null +++ b/geography/qgis/patches/patch-src_core_raster_qgsrasterlayer.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-src_core_raster_qgsrasterlayer.cpp,v 1.1 2013/01/10 23:58:30 joerg Exp $ + +--- src/core/raster/qgsrasterlayer.cpp.orig 2012-12-25 15:27:13.000000000 +0000 ++++ src/core/raster/qgsrasterlayer.cpp +@@ -3504,7 +3504,7 @@ bool QgsRasterLayer::writeSymbology( QDo + * @note Called by QgsMapLayer::writeXML(). + */ + bool QgsRasterLayer::writeXml( QDomNode & layer_node, +- QDomDocument & document ) ++ QDomDocument & document ) const + { + // first get the layer element so that we can append the type attribute + diff --git a/geography/qgis/patches/patch-src_core_raster_qgsrasterlayer.h b/geography/qgis/patches/patch-src_core_raster_qgsrasterlayer.h new file mode 100644 index 00000000000..cb5aae3d0e5 --- /dev/null +++ b/geography/qgis/patches/patch-src_core_raster_qgsrasterlayer.h @@ -0,0 +1,13 @@ +$NetBSD: patch-src_core_raster_qgsrasterlayer.h,v 1.1 2013/01/10 23:58:30 joerg Exp $ + +--- src/core/raster/qgsrasterlayer.h.orig 2012-12-25 15:27:06.000000000 +0000 ++++ src/core/raster/qgsrasterlayer.h +@@ -693,7 +693,7 @@ class CORE_EXPORT QgsRasterLayer : publi + bool writeSymbology( QDomNode&, QDomDocument& doc, QString& errorMessage ) const; + + /** \brief Write layer specific state to project file Dom node */ +- bool writeXml( QDomNode & layer_node, QDomDocument & doc ); ++ bool writeXml( QDomNode & layer_node, QDomDocument & doc ) const; + + private: + // diff --git a/geography/qgis/patches/patch-src_core_symbology-ng_qgssymbolv2.h b/geography/qgis/patches/patch-src_core_symbology-ng_qgssymbolv2.h new file mode 100644 index 00000000000..fd42d46b5fa --- /dev/null +++ b/geography/qgis/patches/patch-src_core_symbology-ng_qgssymbolv2.h @@ -0,0 +1,13 @@ +$NetBSD: patch-src_core_symbology-ng_qgssymbolv2.h,v 1.1 2013/01/10 23:58:30 joerg Exp $ + +--- src/core/symbology-ng/qgssymbolv2.h.orig 2012-12-25 15:11:12.000000000 +0000 ++++ src/core/symbology-ng/qgssymbolv2.h +@@ -96,7 +96,7 @@ class CORE_EXPORT QgsSymbolV2 + //! @note added in 1.5 + void setRenderHints( int hints ) { mRenderHints = hints; } + //! @note added in 1.5 +- int renderHints() { return mRenderHints; } ++ int renderHints() const { return mRenderHints; } + + protected: + QgsSymbolV2( SymbolType type, QgsSymbolLayerV2List layers ); // can't be instantiated -- cgit v1.2.3