Skip to content

Commit 940991e

Browse files
committed
fix warnings
1 parent 75df3f4 commit 940991e

8 files changed

+15
-4
lines changed

src/core/qgsgeometrysimplifier.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
#include <limits>
1818
#include "qgsgeometrysimplifier.h"
1919

20+
QgsAbstractGeometrySimplifier::~QgsAbstractGeometrySimplifier()
21+
{
22+
}
23+
2024
//! Returns whether the device-envelope can be replaced by its BBOX when is applied the specified tolerance
2125
bool QgsAbstractGeometrySimplifier::canbeGeneralizedByDeviceBoundingBox( const QgsRectangle& envelope, float mapToPixelTol )
2226
{

src/core/qgsgeometrysimplifier.h

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
class CORE_EXPORT QgsAbstractGeometrySimplifier
2626
{
2727
public:
28+
virtual ~QgsAbstractGeometrySimplifier();
29+
2830
//! Returns a simplified version the specified geometry
2931
virtual QgsGeometry* simplify( QgsGeometry* geometry ) = 0;
3032
//! Simplifies the specified geometry

src/core/qgsmaptopixelgeometrysimplifier.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ inline static QgsRectangle calculateBoundingBox( QGis::WkbType wkbType, unsigned
9898
//! Generalize the WKB-geometry using the BBOX of the original geometry
9999
inline static bool generalizeWkbGeometry( QGis::WkbType wkbType, unsigned char* sourceWkb, size_t sourceWkbSize, unsigned char* targetWkb, size_t& targetWkbSize, const QgsRectangle& envelope, bool writeHeader )
100100
{
101+
Q_UNUSED( sourceWkb );
101102
unsigned char* wkb2 = targetWkb;
102103
unsigned int geometryType = QGis::singleType( QGis::flatType( wkbType ) );
103104

src/core/qgsvectorlayer.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ typedef QString getStyleById_t(
111111
QString& errCause
112112
);
113113

114-
115114
QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath,
116115
QString baseName,
117116
QString providerKey,
@@ -122,6 +121,8 @@ QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath,
122121
, mProviderKey( providerKey )
123122
, mReadOnly( false )
124123
, mRendererV2( NULL )
124+
, mSimplifyDrawingTol( QGis::DEFAULT_MAPTOPIXEL_THRESHOLD )
125+
, mSimplifyDrawingHints( QGis::DEFAULT_MAPTOPIXEL_THRESHOLD > 1 ? QgsVectorLayer::FullSimplification : QgsVectorLayer::DefaultSimplification )
125126
, mLabel( 0 )
126127
, mLabelOn( false )
127128
, mLabelFontNotFoundNotified( false )
@@ -137,8 +138,6 @@ QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath,
137138
, mValidExtent( false )
138139
, mSymbolFeatureCounted( false )
139140
, mCurrentRendererContext( 0 )
140-
, mSimplifyDrawingHints( QGis::DEFAULT_MAPTOPIXEL_THRESHOLD > 1 ? QgsVectorLayer::FullSimplification : QgsVectorLayer::DefaultSimplification )
141-
, mSimplifyDrawingTol( QGis::DEFAULT_MAPTOPIXEL_THRESHOLD )
142141

143142
{
144143
mActions = new QgsAttributeAction( this );

src/core/qgsvectorlayer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1736,7 +1736,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
17361736
// Feature counts for each renderer symbol
17371737
QMap<QgsSymbolV2*, long> mSymbolFeatureCountMap;
17381738

1739-
QgsRenderContext* mCurrentRendererContext;
1739+
QgsRenderContext *mCurrentRendererContext;
17401740

17411741
friend class QgsVectorLayerFeatureIterator;
17421742
};

src/core/qgsvectorlayerfeatureiterator.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,7 @@ QgsSimplifiedVectorLayerFeatureIterator::QgsSimplifiedVectorLayerFeatureIterator
612612
{
613613
mSupportsPresimplify = layer->dataProvider()->capabilities() & QgsVectorDataProvider::SimplifyGeometries;
614614
}
615+
615616
QgsSimplifiedVectorLayerFeatureIterator::~QgsSimplifiedVectorLayerFeatureIterator()
616617
{
617618
if ( mSimplifier )

src/gui/qgsnewhttpconnection.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,13 @@ QgsNewHttpConnection::~QgsNewHttpConnection()
141141

142142
void QgsNewHttpConnection::on_txtName_textChanged( const QString &text )
143143
{
144+
Q_UNUSED( text );
144145
buttonBox->button( QDialogButtonBox::Ok )->setDisabled( txtName->text().isEmpty() || txtUrl->text().isEmpty() );
145146
}
146147

147148
void QgsNewHttpConnection::on_txtUrl_textChanged( const QString &text )
148149
{
150+
Q_UNUSED( text );
149151
buttonBox->button( QDialogButtonBox::Ok )->setDisabled( txtName->text().isEmpty() || txtUrl->text().isEmpty() );
150152
}
151153

src/providers/ogr/qgsogrfeatureiterator.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,8 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature& feature )
280280
//! Notified a new OGRFeatureH fecthed from data provider
281281
void QgsOgrFeatureIterator::fetchedFeature( OGRFeatureH feature, OGRGeometryH geometry )
282282
{
283+
Q_UNUSED( feature );
284+
Q_UNUSED( geometry );
283285
}
284286

285287
/***************************************************************************

0 commit comments

Comments
 (0)