Skip to content

Commit 5134ef9

Browse files
jef-njef-n
committed
fix some deprecation warnings
1 parent 5d7179f commit 5134ef9

13 files changed

+80
-23
lines changed

‎cmake/SIPMacros.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
9494
ADD_DEFINITIONS( /wd4996 /wd4701 /wd4702 )
9595
ELSE(MSVC)
9696
# disable all warnings
97-
ADD_DEFINITIONS( -w )
97+
ADD_DEFINITIONS( -w -Wno-deprecated-declarations )
9898
IF(NOT APPLE)
9999
ADD_DEFINITIONS( -fpermissive )
100100
ENDIF(NOT APPLE)

‎src/app/openstreetmap/qgsosmdownloaddialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void QgsOSMDownloadDialog::onExtentCanvas()
104104
{
105105
QgsCoordinateReferenceSystem dst( GEOCRS_ID, QgsCoordinateReferenceSystem::InternalCrsId );
106106

107-
QgsCoordinateTransform ct( QgisApp::instance()->mapCanvas()->mapRenderer()->destinationCrs(), dst );
107+
QgsCoordinateTransform ct( QgisApp::instance()->mapCanvas()->mapSettings().destinationCrs(), dst );
108108
r = ct.transformBoundingBox( r );
109109
if ( !r.isFinite() )
110110
{

‎src/app/qgsdiagramproperties.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ void QgsDiagramProperties::showSizeAttributeExpressionDialog()
704704

705705
QgsDistanceArea myDa;
706706
myDa.setSourceCrs( mLayer->crs().srsid() );
707-
myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() );
707+
myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapSettings().hasCrsTransformEnabled() );
708708
myDa.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) );
709709
dlg.setGeomCalculator( myDa );
710710

@@ -734,7 +734,7 @@ void QgsDiagramProperties::showAddAttributeExpressionDialog()
734734

735735
QgsDistanceArea myDa;
736736
myDa.setSourceCrs( mLayer->crs().srsid() );
737-
myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() );
737+
myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapSettings().hasCrsTransformEnabled() );
738738
myDa.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) );
739739
dlg.setGeomCalculator( myDa );
740740

‎src/app/qgsfieldcalculator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ QgsFieldCalculator::QgsFieldCalculator( QgsVectorLayer* vl )
4545

4646
QgsDistanceArea myDa;
4747
myDa.setSourceCrs( vl->crs().srsid() );
48-
myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() );
48+
myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapSettings().hasCrsTransformEnabled() );
4949
myDa.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) );
5050
builder->setGeomCalculator( myDa );
5151

‎src/core/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ ADD_BISON_FILES(QGIS_CORE_SRCS qgsexpressionparser.yy)
311311
SET(QGIS_CORE_MOC_HDRS
312312

313313
qgsmaprenderercache.h
314-
qgsmapsettings.h
315314
qgsmaprendererjob.h
316315

317316
qgsapplication.h
@@ -387,6 +386,10 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND)
387386

388387
QT4_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS})
389388

389+
IF(UNIX)
390+
SET_SOURCE_FILES_PROPERTIES(${QGIS_CORE_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" )
391+
ENDIF(UNIX)
392+
390393
# install headers
391394
# install qgsconfig.h and plugin.h here so they can get into
392395
# the OS X framework target

‎src/core/composer/qgscomposermap.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,21 @@ void QgsComposerMap::setCacheUpdated( bool u )
433433

434434
const QgsMapRenderer *QgsComposerMap::mapRenderer() const
435435
{
436+
#ifdef __GNUC__
437+
#pragma GCC diagnostic push
438+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
439+
#endif
440+
#ifdef _MSC_VER
441+
#pragma warning(push)
442+
#pragma warning(disable:4996)
443+
#endif
436444
return mComposition->mapRenderer();
445+
#ifdef __GNUC__
446+
#pragma GCC diagnostic pop
447+
#endif
448+
#ifdef _MSC_VER
449+
#pragma warning(pop)
450+
#endif
437451
}
438452

439453
QStringList QgsComposerMap::layersToRender()

‎src/core/qgsmaprenderer.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,23 @@ void QgsMapRenderer::setProjectionsEnabled( bool enabled )
644644
mDistArea->setEllipsoidalMode( enabled );
645645
updateFullExtent();
646646
mLastExtent.setMinimal();
647+
648+
#ifdef __GNUC__
649+
#pragma GCC diagnostic push
650+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
651+
#endif
652+
#ifdef _MSC_VER
653+
#pragma warning(push)
654+
#pragma warning(disable:4996)
655+
#endif
647656
emit hasCrsTransformEnabled( enabled ); // deprecated
657+
#ifdef __GNUC__
658+
#pragma GCC diagnostic pop
659+
#endif
660+
#ifdef _MSC_VER
661+
#pragma warning(pop)
662+
#endif
663+
648664
emit hasCrsTransformEnabledChanged( enabled );
649665
}
650666
}

‎src/core/qgsmaprendererjob.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,14 +568,13 @@ LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter* painter, QgsPalLabelin
568568
continue;
569569
}
570570

571-
bool split = false;
572571
QgsRectangle r1 = mSettings.visibleExtent(), r2;
573572
const QgsCoordinateTransform* ct = 0;
574573

575574
if ( mSettings.hasCrsTransformEnabled() )
576575
{
577576
ct = QgsCoordinateTransformCache::instance()->transform( ml->crs().authid(), mSettings.destinationCrs().authid() );
578-
split = reprojectToLayerExtent( ct, ml->crs().geographicFlag(), r1, r2 );
577+
reprojectToLayerExtent( ct, ml->crs().geographicFlag(), r1, r2 );
579578
QgsDebugMsg( " extent 1: " + r1.toString() );
580579
QgsDebugMsg( " extent 2: " + r2.toString() );
581580
if ( !r1.isFinite() || !r2.isFinite() )

‎src/core/qgsvectorlayerfeatureiterator.cpp

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "qgssimplifymethod.h"
2424

2525

26-
QgsVectorLayerFeatureSource::QgsVectorLayerFeatureSource(QgsVectorLayer *layer)
26+
QgsVectorLayerFeatureSource::QgsVectorLayerFeatureSource( QgsVectorLayer *layer )
2727
{
2828
mProviderFeatureSource = layer->dataProvider()->featureSource();
2929
mFields = layer->pendingFields();
@@ -34,10 +34,11 @@ QgsVectorLayerFeatureSource::QgsVectorLayerFeatureSource(QgsVectorLayer *layer)
3434
mHasEditBuffer = layer->editBuffer();
3535
if ( mHasEditBuffer )
3636
{
37-
/* TODO[MD]: after merge
37+
#if 0
38+
// TODO[MD]: after merge
3839
if ( request.filterType() == QgsFeatureRequest::FilterFid )
3940
{
40-
41+
4142
// only copy relevant parts
4243
if ( L->editBuffer()->addedFeatures().contains( request.filterFid() ) )
4344
mAddedFeatures.insert( request.filterFid(), L->editBuffer()->addedFeatures()[ request.filterFid()] );
@@ -55,14 +56,17 @@ QgsVectorLayerFeatureSource::QgsVectorLayerFeatureSource(QgsVectorLayer *layer)
5556
mChangedFeaturesRequest.setFilterFids( QgsFeatureIds() << request.filterFid() );
5657
}
5758
else
58-
{*/
59+
{
60+
#endif
5961
mAddedFeatures = QgsFeatureMap( layer->editBuffer()->addedFeatures() );
6062
mChangedGeometries = QgsGeometryMap( layer->editBuffer()->changedGeometries() );
6163
mDeletedFeatureIds = QgsFeatureIds( layer->editBuffer()->deletedFeatureIds() );
6264
mChangedAttributeValues = QgsChangedAttributesMap( layer->editBuffer()->changedAttributeValues() );
6365
mAddedAttributes = QList<QgsField>( layer->editBuffer()->addedAttributes() );
64-
mDeletedAttributeIds = QgsAttributeList( layer->editBuffer()->deletedAttributeIds() );
65-
//}
66+
mDeletedAttributeIds = QgsAttributeList( layer->editBuffer()->deletedAttributeIds() );
67+
#if 0
68+
}
69+
#endif
6670
}
6771
}
6872

@@ -79,9 +83,9 @@ QgsFeatureIterator QgsVectorLayerFeatureSource::getFeatures( const QgsFeatureReq
7983
}
8084

8185

82-
QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator(QgsVectorLayerFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )
83-
: QgsAbstractFeatureIteratorFromSource( source, ownSource, request )
84-
, mEditGeometrySimplifier( 0 )
86+
QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayerFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )
87+
: QgsAbstractFeatureIteratorFromSource( source, ownSource, request )
88+
, mEditGeometrySimplifier( 0 )
8589
{
8690

8791
// prepare joins: may add more attributes to fetch (in order to allow join)
@@ -516,7 +520,8 @@ bool QgsVectorLayerFeatureIterator::prepareSimplification( const QgsSimplifyMeth
516520

517521
bool QgsVectorLayerFeatureIterator::providerCanSimplify( QgsSimplifyMethod::MethodType methodType ) const
518522
{
519-
/* TODO[MD]: after merge
523+
#if 0
524+
// TODO[MD]: after merge
520525
QgsVectorDataProvider* provider = L->dataProvider();
521526

522527
if ( provider && methodType != QgsSimplifyMethod::NoSimplification )
@@ -531,7 +536,8 @@ bool QgsVectorLayerFeatureIterator::providerCanSimplify( QgsSimplifyMethod::Meth
531536
{
532537
return ( capabilities & QgsVectorDataProvider::SimplifyGeometriesWithTopologicalValidation );
533538
}
534-
}*/
539+
}
540+
#endif
535541
return false;
536542
}
537543

‎src/core/qgsvectorlayerrenderer.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ class QgsVectorLayerRenderer : public QgsMapLayerRenderer
4242
private:
4343

4444
/**Registers label and diagram layer
45-
@param attributes attributes needed for labeling and diagrams will be added to the list
45+
@param layer diagram layer
46+
@param attributeNames attributes needed for labeling and diagrams will be added to the list
4647
*/
4748
void prepareLabeling( QgsVectorLayer* layer, QStringList& attributeNames );
4849
void prepareDiagrams( QgsVectorLayer* layer, QStringList& attributeNames );

‎src/gui/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,10 @@ qgssublayersdialog.h
267267

268268
QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS})
269269

270+
IF(UNIX)
271+
SET_SOURCE_FILES_PROPERTIES(${QGIS_GUI_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" )
272+
ENDIF(UNIX)
273+
270274
# for installing headers
271275

272276
SET(QGIS_GUI_HDRS

‎src/gui/qgsmapcanvas.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,7 +1527,21 @@ bool QgsMapCanvas::isFrozen()
15271527

15281528
QPaintDevice &QgsMapCanvas::canvasPaintDevice()
15291529
{
1530+
#ifdef __GNUC__
1531+
#pragma GCC diagnostic push
1532+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
1533+
#endif
1534+
#ifdef _MSC_VER
1535+
#pragma warning(push)
1536+
#pragma warning(disable:4996)
1537+
#endif
15301538
return mMap->paintDevice();
1539+
#ifdef __GNUC__
1540+
#pragma GCC diagnostic pop
1541+
#endif
1542+
#ifdef _MSC_VER
1543+
#pragma warning(pop)
1544+
#endif
15311545
}
15321546

15331547
double QgsMapCanvas::mapUnitsPerPixel() const

‎src/plugins/globe/globe_plugin.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ double GlobePlugin::getSelectedElevation()
526526
void GlobePlugin::syncExtent()
527527
{
528528
QgsMapCanvas* mapCanvas = mQGisIface->mapCanvas();
529-
QgsMapRenderer* mapRenderer = mapCanvas->mapRenderer();
529+
const QgsMapSettings &mapSettings = mapCanvas->mapSettings();
530530
QgsRectangle extent = mapCanvas->extent();
531531

532532
osgEarth::Util::EarthManipulator* manip = dynamic_cast<osgEarth::Util::EarthManipulator*>( mOsgViewer->getCameraManipulator() );
@@ -535,8 +535,8 @@ void GlobePlugin::syncExtent()
535535

536536
QgsDistanceArea dist;
537537

538-
dist.setSourceCrs( mapRenderer->destinationCrs().srsid() );
539-
dist.setEllipsoidalMode( mapRenderer->hasCrsTransformEnabled() );
538+
dist.setSourceCrs( mapSettings.destinationCrs().srsid() );
539+
dist.setEllipsoidalMode( mapSettings.hasCrsTransformEnabled() );
540540
dist.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) );
541541

542542
QgsPoint ll = QgsPoint( extent.xMinimum(), extent.yMinimum() );

0 commit comments

Comments
 (0)