From 5134ef9aba775bc1e8ce0728a08d04575a304020 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Mon, 24 Feb 2014 00:43:20 +0100 Subject: [PATCH] fix some deprecation warnings --- cmake/SIPMacros.cmake | 2 +- .../openstreetmap/qgsosmdownloaddialog.cpp | 2 +- src/app/qgsdiagramproperties.cpp | 4 +-- src/app/qgsfieldcalculator.cpp | 2 +- src/core/CMakeLists.txt | 5 +++- src/core/composer/qgscomposermap.cpp | 14 ++++++++++ src/core/qgsmaprenderer.cpp | 16 +++++++++++ src/core/qgsmaprendererjob.cpp | 3 +- src/core/qgsvectorlayerfeatureiterator.cpp | 28 +++++++++++-------- src/core/qgsvectorlayerrenderer.h | 3 +- src/gui/CMakeLists.txt | 4 +++ src/gui/qgsmapcanvas.cpp | 14 ++++++++++ src/plugins/globe/globe_plugin.cpp | 6 ++-- 13 files changed, 80 insertions(+), 23 deletions(-) diff --git a/cmake/SIPMacros.cmake b/cmake/SIPMacros.cmake index 4acbe7566f2..6eb9fb40b6a 100644 --- a/cmake/SIPMacros.cmake +++ b/cmake/SIPMacros.cmake @@ -94,7 +94,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP) ADD_DEFINITIONS( /wd4996 /wd4701 /wd4702 ) ELSE(MSVC) # disable all warnings - ADD_DEFINITIONS( -w ) + ADD_DEFINITIONS( -w -Wno-deprecated-declarations ) IF(NOT APPLE) ADD_DEFINITIONS( -fpermissive ) ENDIF(NOT APPLE) diff --git a/src/app/openstreetmap/qgsosmdownloaddialog.cpp b/src/app/openstreetmap/qgsosmdownloaddialog.cpp index dddbf5778ea..671883afbce 100644 --- a/src/app/openstreetmap/qgsosmdownloaddialog.cpp +++ b/src/app/openstreetmap/qgsosmdownloaddialog.cpp @@ -104,7 +104,7 @@ void QgsOSMDownloadDialog::onExtentCanvas() { QgsCoordinateReferenceSystem dst( GEOCRS_ID, QgsCoordinateReferenceSystem::InternalCrsId ); - QgsCoordinateTransform ct( QgisApp::instance()->mapCanvas()->mapRenderer()->destinationCrs(), dst ); + QgsCoordinateTransform ct( QgisApp::instance()->mapCanvas()->mapSettings().destinationCrs(), dst ); r = ct.transformBoundingBox( r ); if ( !r.isFinite() ) { diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp index 38a90fda33a..1c1dae8c76c 100644 --- a/src/app/qgsdiagramproperties.cpp +++ b/src/app/qgsdiagramproperties.cpp @@ -704,7 +704,7 @@ void QgsDiagramProperties::showSizeAttributeExpressionDialog() QgsDistanceArea myDa; myDa.setSourceCrs( mLayer->crs().srsid() ); - myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() ); + myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapSettings().hasCrsTransformEnabled() ); myDa.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) ); dlg.setGeomCalculator( myDa ); @@ -734,7 +734,7 @@ void QgsDiagramProperties::showAddAttributeExpressionDialog() QgsDistanceArea myDa; myDa.setSourceCrs( mLayer->crs().srsid() ); - myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() ); + myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapSettings().hasCrsTransformEnabled() ); myDa.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) ); dlg.setGeomCalculator( myDa ); diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp index 3fee4740bc5..2a2a1383420 100644 --- a/src/app/qgsfieldcalculator.cpp +++ b/src/app/qgsfieldcalculator.cpp @@ -45,7 +45,7 @@ QgsFieldCalculator::QgsFieldCalculator( QgsVectorLayer* vl ) QgsDistanceArea myDa; myDa.setSourceCrs( vl->crs().srsid() ); - myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() ); + myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapSettings().hasCrsTransformEnabled() ); myDa.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) ); builder->setGeomCalculator( myDa ); diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f24399f20c5..d2ef4ffce59 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -311,7 +311,6 @@ ADD_BISON_FILES(QGIS_CORE_SRCS qgsexpressionparser.yy) SET(QGIS_CORE_MOC_HDRS qgsmaprenderercache.h - qgsmapsettings.h qgsmaprendererjob.h qgsapplication.h @@ -387,6 +386,10 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND) QT4_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS}) +IF(UNIX) + SET_SOURCE_FILES_PROPERTIES(${QGIS_CORE_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" ) +ENDIF(UNIX) + # install headers # install qgsconfig.h and plugin.h here so they can get into # the OS X framework target diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp index e5e44369f1e..226cd7c104a 100644 --- a/src/core/composer/qgscomposermap.cpp +++ b/src/core/composer/qgscomposermap.cpp @@ -433,7 +433,21 @@ void QgsComposerMap::setCacheUpdated( bool u ) const QgsMapRenderer *QgsComposerMap::mapRenderer() const { +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4996) +#endif return mComposition->mapRenderer(); +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif +#ifdef _MSC_VER +#pragma warning(pop) +#endif } QStringList QgsComposerMap::layersToRender() diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp index 1f8931b5ed9..be3e8df60a9 100644 --- a/src/core/qgsmaprenderer.cpp +++ b/src/core/qgsmaprenderer.cpp @@ -644,7 +644,23 @@ void QgsMapRenderer::setProjectionsEnabled( bool enabled ) mDistArea->setEllipsoidalMode( enabled ); updateFullExtent(); mLastExtent.setMinimal(); + +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4996) +#endif emit hasCrsTransformEnabled( enabled ); // deprecated +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif +#ifdef _MSC_VER +#pragma warning(pop) +#endif + emit hasCrsTransformEnabledChanged( enabled ); } } diff --git a/src/core/qgsmaprendererjob.cpp b/src/core/qgsmaprendererjob.cpp index 68e574bf0bf..8f4bf46b394 100644 --- a/src/core/qgsmaprendererjob.cpp +++ b/src/core/qgsmaprendererjob.cpp @@ -568,14 +568,13 @@ LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter* painter, QgsPalLabelin continue; } - bool split = false; QgsRectangle r1 = mSettings.visibleExtent(), r2; const QgsCoordinateTransform* ct = 0; if ( mSettings.hasCrsTransformEnabled() ) { ct = QgsCoordinateTransformCache::instance()->transform( ml->crs().authid(), mSettings.destinationCrs().authid() ); - split = reprojectToLayerExtent( ct, ml->crs().geographicFlag(), r1, r2 ); + reprojectToLayerExtent( ct, ml->crs().geographicFlag(), r1, r2 ); QgsDebugMsg( " extent 1: " + r1.toString() ); QgsDebugMsg( " extent 2: " + r2.toString() ); if ( !r1.isFinite() || !r2.isFinite() ) diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp index a41077aac5f..776500a4a9b 100644 --- a/src/core/qgsvectorlayerfeatureiterator.cpp +++ b/src/core/qgsvectorlayerfeatureiterator.cpp @@ -23,7 +23,7 @@ #include "qgssimplifymethod.h" -QgsVectorLayerFeatureSource::QgsVectorLayerFeatureSource(QgsVectorLayer *layer) +QgsVectorLayerFeatureSource::QgsVectorLayerFeatureSource( QgsVectorLayer *layer ) { mProviderFeatureSource = layer->dataProvider()->featureSource(); mFields = layer->pendingFields(); @@ -34,10 +34,11 @@ QgsVectorLayerFeatureSource::QgsVectorLayerFeatureSource(QgsVectorLayer *layer) mHasEditBuffer = layer->editBuffer(); if ( mHasEditBuffer ) { - /* TODO[MD]: after merge +#if 0 + // TODO[MD]: after merge if ( request.filterType() == QgsFeatureRequest::FilterFid ) { - + // only copy relevant parts if ( L->editBuffer()->addedFeatures().contains( request.filterFid() ) ) mAddedFeatures.insert( request.filterFid(), L->editBuffer()->addedFeatures()[ request.filterFid()] ); @@ -55,14 +56,17 @@ QgsVectorLayerFeatureSource::QgsVectorLayerFeatureSource(QgsVectorLayer *layer) mChangedFeaturesRequest.setFilterFids( QgsFeatureIds() << request.filterFid() ); } else - {*/ + { +#endif mAddedFeatures = QgsFeatureMap( layer->editBuffer()->addedFeatures() ); mChangedGeometries = QgsGeometryMap( layer->editBuffer()->changedGeometries() ); mDeletedFeatureIds = QgsFeatureIds( layer->editBuffer()->deletedFeatureIds() ); mChangedAttributeValues = QgsChangedAttributesMap( layer->editBuffer()->changedAttributeValues() ); mAddedAttributes = QList( layer->editBuffer()->addedAttributes() ); - mDeletedAttributeIds = QgsAttributeList( layer->editBuffer()->deletedAttributeIds() ); - //} + mDeletedAttributeIds = QgsAttributeList( layer->editBuffer()->deletedAttributeIds() ); +#if 0 + } +#endif } } @@ -79,9 +83,9 @@ QgsFeatureIterator QgsVectorLayerFeatureSource::getFeatures( const QgsFeatureReq } -QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator(QgsVectorLayerFeatureSource* source, bool ownSource, const QgsFeatureRequest& request ) - : QgsAbstractFeatureIteratorFromSource( source, ownSource, request ) - , mEditGeometrySimplifier( 0 ) +QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayerFeatureSource* source, bool ownSource, const QgsFeatureRequest& request ) + : QgsAbstractFeatureIteratorFromSource( source, ownSource, request ) + , mEditGeometrySimplifier( 0 ) { // prepare joins: may add more attributes to fetch (in order to allow join) @@ -516,7 +520,8 @@ bool QgsVectorLayerFeatureIterator::prepareSimplification( const QgsSimplifyMeth bool QgsVectorLayerFeatureIterator::providerCanSimplify( QgsSimplifyMethod::MethodType methodType ) const { - /* TODO[MD]: after merge +#if 0 + // TODO[MD]: after merge QgsVectorDataProvider* provider = L->dataProvider(); if ( provider && methodType != QgsSimplifyMethod::NoSimplification ) @@ -531,7 +536,8 @@ bool QgsVectorLayerFeatureIterator::providerCanSimplify( QgsSimplifyMethod::Meth { return ( capabilities & QgsVectorDataProvider::SimplifyGeometriesWithTopologicalValidation ); } - }*/ + } +#endif return false; } diff --git a/src/core/qgsvectorlayerrenderer.h b/src/core/qgsvectorlayerrenderer.h index c33129512b5..9237a522fa6 100644 --- a/src/core/qgsvectorlayerrenderer.h +++ b/src/core/qgsvectorlayerrenderer.h @@ -42,7 +42,8 @@ class QgsVectorLayerRenderer : public QgsMapLayerRenderer private: /**Registers label and diagram layer - @param attributes attributes needed for labeling and diagrams will be added to the list + @param layer diagram layer + @param attributeNames attributes needed for labeling and diagrams will be added to the list */ void prepareLabeling( QgsVectorLayer* layer, QStringList& attributeNames ); void prepareDiagrams( QgsVectorLayer* layer, QStringList& attributeNames ); diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index a5fad555bd6..39f407a27e6 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -267,6 +267,10 @@ qgssublayersdialog.h QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS}) +IF(UNIX) + SET_SOURCE_FILES_PROPERTIES(${QGIS_GUI_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" ) +ENDIF(UNIX) + # for installing headers SET(QGIS_GUI_HDRS diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp index 4de077a25e0..68a3daaa60c 100644 --- a/src/gui/qgsmapcanvas.cpp +++ b/src/gui/qgsmapcanvas.cpp @@ -1527,7 +1527,21 @@ bool QgsMapCanvas::isFrozen() QPaintDevice &QgsMapCanvas::canvasPaintDevice() { +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4996) +#endif return mMap->paintDevice(); +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif +#ifdef _MSC_VER +#pragma warning(pop) +#endif } double QgsMapCanvas::mapUnitsPerPixel() const diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp index 658e4891f1c..7079e724bd7 100644 --- a/src/plugins/globe/globe_plugin.cpp +++ b/src/plugins/globe/globe_plugin.cpp @@ -526,7 +526,7 @@ double GlobePlugin::getSelectedElevation() void GlobePlugin::syncExtent() { QgsMapCanvas* mapCanvas = mQGisIface->mapCanvas(); - QgsMapRenderer* mapRenderer = mapCanvas->mapRenderer(); + const QgsMapSettings &mapSettings = mapCanvas->mapSettings(); QgsRectangle extent = mapCanvas->extent(); osgEarth::Util::EarthManipulator* manip = dynamic_cast( mOsgViewer->getCameraManipulator() ); @@ -535,8 +535,8 @@ void GlobePlugin::syncExtent() QgsDistanceArea dist; - dist.setSourceCrs( mapRenderer->destinationCrs().srsid() ); - dist.setEllipsoidalMode( mapRenderer->hasCrsTransformEnabled() ); + dist.setSourceCrs( mapSettings.destinationCrs().srsid() ); + dist.setEllipsoidalMode( mapSettings.hasCrsTransformEnabled() ); dist.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) ); QgsPoint ll = QgsPoint( extent.xMinimum(), extent.yMinimum() );