Skip to content
Permalink
Browse files

fix windows build and some warnings

  • Loading branch information
jef-n committed Jul 19, 2016
1 parent c9d6269 commit 3142c846e50262d69138d87ec3cd6165d8fbb399
@@ -286,7 +286,7 @@ void QgsVectorLayerSaveAsDialog::on_mFormatComboBox_currentIndexChanged( int idx

if ( foundFieldThatCanBeExportedAsDisplayedValue )
{
QgsEditorWidgetFactory *factory;
QgsEditorWidgetFactory *factory = nullptr;
if ( flags == Qt::ItemIsEnabled &&
mLayer->editFormConfig()->widgetType( i ) != "TextEdit" &&
( factory = QgsEditorWidgetRegistry::instance()->factory( mLayer->editFormConfig()->widgetType( i ) ) ) )
@@ -1066,11 +1066,9 @@ GEOSGeometry* QgsGeos::asGeos( const QgsAbstractGeometryV2* geom, double precisi

if ( QgsWKBTypes::isMultiType( geom->wkbType() ) || QgsWKBTypes::flatType( geom->wkbType() ) == QgsWKBTypes::GeometryCollection )
{
int geosType;
int geosType = GEOS_GEOMETRYCOLLECTION;

if ( QgsWKBTypes::flatType( geom->wkbType() ) == QgsWKBTypes::GeometryCollection )
geosType = GEOS_GEOMETRYCOLLECTION;
else
if ( QgsWKBTypes::flatType( geom->wkbType() ) != QgsWKBTypes::GeometryCollection )
{
switch ( QgsWKBTypes::geometryType( geom->wkbType() ) )
{
@@ -231,7 +231,9 @@ QVariant QgsAggregateCalculator::calculate( QgsAggregateCalculator::Aggregate ag
}
}

#ifndef _MSC_VER
return QVariant();
#endif
}

QgsStatisticalSummary::Statistic QgsAggregateCalculator::numericStatFromAggregate( QgsAggregateCalculator::Aggregate aggregate, bool* ok )
@@ -31,8 +31,8 @@
#include "qgsobjectcustomproperties.h"
#include "qgsrectangle.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsrendercontext.h"

class QgsRenderContext;
class QgsMapLayerLegend;
class QgsMapLayerRenderer;
class QgsMapLayerStyleManager;
@@ -617,7 +617,7 @@ QgsRectangle GlobePlugin::getQGISLayerExtent() const
void GlobePlugin::showCurrentCoordinates( const osgEarth::GeoPoint& geoPoint )
{
osg::Vec3d pos = geoPoint.vec3d();
emit xyCoordinates( QgsCoordinateTransformCache::instance()->transform( GEO_EPSG_CRS_AUTHID, mQGisIface->mapCanvas()->mapSettings().destinationCrs().authid() )->transform( QgsPoint( pos.x(), pos.y() ) ) );
emit xyCoordinates( QgsCoordinateTransformCache::instance()->transform( GEO_EPSG_CRS_AUTHID, mQGisIface->mapCanvas()->mapSettings().destinationCrs().authid() ).transform( QgsPoint( pos.x(), pos.y() ) ) );
}

void GlobePlugin::setSelectedCoordinates( const osg::Vec3d &coords )
@@ -932,7 +932,7 @@ void GlobePlugin::updateLayers()
else
{
drapedLayers.append( mapLayer->id() );
QgsRectangle extent = QgsCoordinateTransformCache::instance()->transform( mapLayer->crs().authid(), GEO_EPSG_CRS_AUTHID )->transform( mapLayer->extent() );
QgsRectangle extent = QgsCoordinateTransformCache::instance()->transform( mapLayer->crs().authid(), GEO_EPSG_CRS_AUTHID ).transform( mapLayer->extent() );
mLayerExtents.insert( mapLayer->id(), extent );
}
}
@@ -994,12 +994,12 @@ void GlobePlugin::layerChanged( QgsMapLayer* mapLayer )
}
}
mTileSource->setLayerSet( layerSet );
QgsRectangle extent = QgsCoordinateTransformCache::instance()->transform( mapLayer->crs().authid(), GEO_EPSG_CRS_AUTHID )->transform( mapLayer->extent() );
QgsRectangle extent = QgsCoordinateTransformCache::instance()->transform( mapLayer->crs().authid(), GEO_EPSG_CRS_AUTHID ).transform( mapLayer->extent() );
mLayerExtents.insert( mapLayer->id(), extent );
}
// Remove any model layer of that layer, in case one existed
mMapNode->getMap()->removeModelLayer( mMapNode->getMap()->getModelLayerByName( mapLayer->id().toStdString() ) );
QgsRectangle layerExtent = QgsCoordinateTransformCache::instance()->transform( mapLayer->crs().authid(), GEO_EPSG_CRS_AUTHID )->transform( mapLayer->extent() );
QgsRectangle layerExtent = QgsCoordinateTransformCache::instance()->transform( mapLayer->crs().authid(), GEO_EPSG_CRS_AUTHID ).transform( mapLayer->extent() );
QgsRectangle dirtyExtent = layerExtent;
if ( mLayerExtents.contains( mapLayer->id() ) )
{
@@ -50,11 +50,11 @@ class PYTHON_EXPORT QgsPythonUtils
virtual bool isEnabled() = 0;

//! initialize python and import bindings
virtual void initPython( QgisInterface* interface ) = 0;
virtual void initPython( QgisInterface *iface ) = 0;

#ifdef HAVE_SERVER_PYTHON_PLUGINS
//! initialize python and import server bindings
virtual void initServerPython( QgsServerInterface* interface ) = 0;
virtual void initServerPython( QgsServerInterface *iface ) = 0;

//! start server plugin: call plugin's classServerFactory(serverInterface) add to active plugins
virtual bool startServerPlugin( QString packageName ) = 0;
@@ -18,6 +18,8 @@
#include "qgspainteffectregistry.h"
#include "qgspainteffect.h"
#include "qgseffectstack.h"
#include "qgsrendercontext.h"

#include <QObject>
#include <QtTest/QtTest>

0 comments on commit 3142c84

Please sign in to comment.
You can’t perform that action at this time.