Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix warnings
  • Loading branch information
jef-n committed Dec 17, 2013
1 parent 75df3f4 commit 940991e
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 4 deletions.
4 changes: 4 additions & 0 deletions src/core/qgsgeometrysimplifier.cpp
Expand Up @@ -17,6 +17,10 @@
#include <limits>
#include "qgsgeometrysimplifier.h"

QgsAbstractGeometrySimplifier::~QgsAbstractGeometrySimplifier()
{
}

//! Returns whether the device-envelope can be replaced by its BBOX when is applied the specified tolerance
bool QgsAbstractGeometrySimplifier::canbeGeneralizedByDeviceBoundingBox( const QgsRectangle& envelope, float mapToPixelTol )
{
Expand Down
2 changes: 2 additions & 0 deletions src/core/qgsgeometrysimplifier.h
Expand Up @@ -25,6 +25,8 @@
class CORE_EXPORT QgsAbstractGeometrySimplifier
{
public:
virtual ~QgsAbstractGeometrySimplifier();

//! Returns a simplified version the specified geometry
virtual QgsGeometry* simplify( QgsGeometry* geometry ) = 0;
//! Simplifies the specified geometry
Expand Down
1 change: 1 addition & 0 deletions src/core/qgsmaptopixelgeometrysimplifier.cpp
Expand Up @@ -98,6 +98,7 @@ inline static QgsRectangle calculateBoundingBox( QGis::WkbType wkbType, unsigned
//! Generalize the WKB-geometry using the BBOX of the original geometry
inline static bool generalizeWkbGeometry( QGis::WkbType wkbType, unsigned char* sourceWkb, size_t sourceWkbSize, unsigned char* targetWkb, size_t& targetWkbSize, const QgsRectangle& envelope, bool writeHeader )
{
Q_UNUSED( sourceWkb );
unsigned char* wkb2 = targetWkb;
unsigned int geometryType = QGis::singleType( QGis::flatType( wkbType ) );

Expand Down
5 changes: 2 additions & 3 deletions src/core/qgsvectorlayer.cpp
Expand Up @@ -111,7 +111,6 @@ typedef QString getStyleById_t(
QString& errCause
);


QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath,
QString baseName,
QString providerKey,
Expand All @@ -122,6 +121,8 @@ QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath,
, mProviderKey( providerKey )
, mReadOnly( false )
, mRendererV2( NULL )
, mSimplifyDrawingTol( QGis::DEFAULT_MAPTOPIXEL_THRESHOLD )
, mSimplifyDrawingHints( QGis::DEFAULT_MAPTOPIXEL_THRESHOLD > 1 ? QgsVectorLayer::FullSimplification : QgsVectorLayer::DefaultSimplification )
, mLabel( 0 )
, mLabelOn( false )
, mLabelFontNotFoundNotified( false )
Expand All @@ -137,8 +138,6 @@ QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath,
, mValidExtent( false )
, mSymbolFeatureCounted( false )
, mCurrentRendererContext( 0 )
, mSimplifyDrawingHints( QGis::DEFAULT_MAPTOPIXEL_THRESHOLD > 1 ? QgsVectorLayer::FullSimplification : QgsVectorLayer::DefaultSimplification )
, mSimplifyDrawingTol( QGis::DEFAULT_MAPTOPIXEL_THRESHOLD )

{
mActions = new QgsAttributeAction( this );
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsvectorlayer.h
Expand Up @@ -1736,7 +1736,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
// Feature counts for each renderer symbol
QMap<QgsSymbolV2*, long> mSymbolFeatureCountMap;

QgsRenderContext* mCurrentRendererContext;
QgsRenderContext *mCurrentRendererContext;

friend class QgsVectorLayerFeatureIterator;
};
Expand Down
1 change: 1 addition & 0 deletions src/core/qgsvectorlayerfeatureiterator.cpp
Expand Up @@ -612,6 +612,7 @@ QgsSimplifiedVectorLayerFeatureIterator::QgsSimplifiedVectorLayerFeatureIterator
{
mSupportsPresimplify = layer->dataProvider()->capabilities() & QgsVectorDataProvider::SimplifyGeometries;
}

QgsSimplifiedVectorLayerFeatureIterator::~QgsSimplifiedVectorLayerFeatureIterator()
{
if ( mSimplifier )
Expand Down
2 changes: 2 additions & 0 deletions src/gui/qgsnewhttpconnection.cpp
Expand Up @@ -141,11 +141,13 @@ QgsNewHttpConnection::~QgsNewHttpConnection()

void QgsNewHttpConnection::on_txtName_textChanged( const QString &text )
{
Q_UNUSED( text );
buttonBox->button( QDialogButtonBox::Ok )->setDisabled( txtName->text().isEmpty() || txtUrl->text().isEmpty() );
}

void QgsNewHttpConnection::on_txtUrl_textChanged( const QString &text )
{
Q_UNUSED( text );
buttonBox->button( QDialogButtonBox::Ok )->setDisabled( txtName->text().isEmpty() || txtUrl->text().isEmpty() );
}

Expand Down
2 changes: 2 additions & 0 deletions src/providers/ogr/qgsogrfeatureiterator.cpp
Expand Up @@ -280,6 +280,8 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature& feature )
//! Notified a new OGRFeatureH fecthed from data provider
void QgsOgrFeatureIterator::fetchedFeature( OGRFeatureH feature, OGRGeometryH geometry )
{
Q_UNUSED( feature );
Q_UNUSED( geometry );
}

/***************************************************************************
Expand Down

0 comments on commit 940991e

Please sign in to comment.