Skip to content

Commit 7fdade1

Browse files
committed
remove some deprecated methods, rename QgsAnnotation::mapPositionFixed() to hasFixedMapPosition()
1 parent eb308a6 commit 7fdade1

20 files changed

+27
-102
lines changed

doc/api_break.dox

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ This page tries to maintain a list with incompatible changes that happened in pr
151151
<table>
152152
<caption id="renamed_methods">Renamed method names</caption>
153153
<tr><th>class</th><th>API 2.x<th>API 3.X
154+
<tr><td>QgsAnnotation<td>mapPositionFixed<td>hasFixedMapPosition
154155
<tr><td>QgsApplication<td>defaultStyleV2Path<td>defaultStylePath
155156
<tr><td>QgsApplication<td>userStyleV2Path<td>userStylePath
156157
<tr><td>QgsComposerShape<td>setUseSymbolV2<td>setUseSymbol
@@ -167,6 +168,7 @@ This page tries to maintain a list with incompatible changes that happened in pr
167168
\subsection qgis_api_break_3_0_removed_classes Removed Classes
168169

169170
<ul>
171+
<li>QgsAttributeAction was removed, and replaced by QgsActionManager.</li>
170172
<li>QgsColorbutton was removed. QgsColorButtonV2 has now been renamed to QgsColorButton. Hence, QgsColorButtonV2 does not exist anymore.</li>
171173
<li>QgsColorDialog was removed, and QgsColorDialogV2 was renamed to QgsColorDialog. Hence, QgsColorButtonV2 does not exist anymore.
172174
All the functionality from the old QgsColorDialog has been moved to the new class.</li>
@@ -258,6 +260,13 @@ corresponding counterparts in QgsUnitTypes should be used instead.</li>
258260
<li>fileMenu() has been removed, use projectMenu() instead.
259261
</ul>
260262

263+
\subsection qgis_api_break_3_0_QgsAnnotation QgsAnnotation
264+
265+
<ul>
266+
<li> mapPositionFixed() has been renamed to hasFixedMapPosition()
267+
</ul>
268+
269+
261270
\subsection qgis_api_break_3_0_QgsActionManager QgsActionManager
262271

263272
<ul>
@@ -452,6 +461,10 @@ be returned in place of a null pointer.</li>
452461
<ul>
453462
<li>The deprecated getExpression( const QString& expression, const QgsFields* fields ) method has been removed.
454463
Use the variant which accepts an expression context instead.</li>
464+
<li>The deprecated renderDiagram( const QgsAttributes& att, QgsRenderContext& c, const QgsDiagramSettings& s, QPointF position ) method has been removed.
465+
Use renderDiagram( const QgsFeature& feature, QgsRenderContext& c, const QgsDiagramSettings& s, const QPointF& position ) instead.
466+
<li>The deprecated diagramSize( const QgsAttributes& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s, const QgsDiagramInterpolationSettings& is ) method has been removed.
467+
Use diagramSize( const QgsFeature& feature, const QgsRenderContext& c, const QgsDiagramSettings& s, const QgsDiagramInterpolationSettings& is ) instead.
455468
</ul>
456469

457470
\subsection qgis_api_break_3_0_QgsDiagramLayerSettings QgsDiagramLayerSettings
@@ -719,6 +732,12 @@ plugins calling this method will need to be updated.</li>
719732
<li>visibilityPresetCollection() has been renamed to mapThemeCollection()</li>
720733
</ul>
721734

735+
\subsection qgis_api_break_3_0_QgsRasterCalcNode QgsRasterCalcNode
736+
737+
<ul>
738+
<li>QgsRasterCalcNode::calculate has been removed, use method with QgsRasterBlocks instead.</li>
739+
</ul>
740+
722741
\subsection qgis_api_break_3_0_QgsRasterDataProvider QgsRasterDataProvider
723742

724743
<ul>

python/analysis/raster/qgsrastercalcnode.sip

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ class QgsRasterCalcNode
6666
*/
6767
//bool calculate( QMap<QString, QgsRasterBlock* >& rasterData, QgsRasterMatrix& result, int row = -1 ) const;
6868

69-
/** @deprecated use method which accepts QgsRasterBlocks instead
70-
*/
71-
// bool calculate( QMap<QString, QgsRasterMatrix*>& rasterData, QgsRasterMatrix& result ) const /Deprecated/;
72-
7369
static QgsRasterCalcNode* parseRasterCalcString( const QString& str, QString& parserErrorMsg ) /Factory/;
7470

7571
private:

python/core/diagram/qgsdiagram.sip

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,11 @@ class QgsDiagram
1818
*/
1919
QgsExpression* getExpression( const QString& expression, const QgsExpressionContext& context );
2020

21-
/** @deprecated `void renderDiagram( const QgsFeature& feature, QgsRenderContext& c, const QgsDiagramSettings& s, const QPointF& position )` should be used instead */
22-
virtual void renderDiagram( const QgsAttributes& att, QgsRenderContext& c, const QgsDiagramSettings& s, QPointF position ) /Deprecated/;
2321
/** Draws the diagram at the given position (in pixel coordinates)*/
2422
virtual void renderDiagram( const QgsFeature& feature, QgsRenderContext& c, const QgsDiagramSettings& s, QPointF position ) = 0;
2523
virtual QString diagramName() const = 0;
2624
/** Returns the size in map units the diagram will use to render.*/
2725
virtual QSizeF diagramSize( const QgsAttributes& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s ) = 0;
28-
/** @deprecated `QSizeF diagramSize( const QgsFeature& feature, const QgsRenderContext& c, const QgsDiagramSettings& s, const QgsDiagramInterpolationSettings& is )` should be used instead */
29-
virtual QSizeF diagramSize( const QgsAttributes& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s, const QgsDiagramInterpolationSettings& is ) /Deprecated/;
3026
/** Returns the size in map units the diagram will use to render. Interpolate size*/
3127
virtual QSizeF diagramSize( const QgsFeature& feature, const QgsRenderContext& c, const QgsDiagramSettings& s, const QgsDiagramInterpolationSettings& is ) = 0;
3228

python/core/qgsannotation.sip

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ class QgsAnnotation
2727
* @see mapPosition()
2828
* @see relativePositon()
2929
*/
30-
//TODO QGIS 3 - rename to hasFixedMapPosition()
31-
virtual bool mapPositionFixed() const = 0;
30+
virtual bool hasFixedMapPosition() const = 0;
3231

3332
/** Returns the map position of the annotation, if it is attached to a fixed map
3433
* position.

python/gui/qgsannotationitem.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class QgsAnnotationItem: QgsMapCanvasItem, QgsAnnotation
6161

6262
//setters and getters
6363
void setMapPositionFixed( bool fixed );
64-
bool mapPositionFixed() const;
64+
bool hasFixedMapPosition() const;
6565

6666
virtual void setMapPosition( const QgsPoint& pos );
6767
QgsPoint mapPosition() const;

src/analysis/raster/qgsrastercalcnode.cpp

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -83,28 +83,6 @@ QgsRasterCalcNode::~QgsRasterCalcNode()
8383
}
8484
}
8585

86-
bool QgsRasterCalcNode::calculate( QMap<QString, QgsRasterMatrix*>& rasterData, QgsRasterMatrix& result ) const
87-
{
88-
//deprecated method
89-
//convert QgsRasterMatrix to QgsRasterBlock and call replacement method
90-
QMap<QString, QgsRasterBlock* > rasterBlockData;
91-
QMap<QString, QgsRasterMatrix*>::const_iterator it = rasterData.constBegin();
92-
for ( ; it != rasterData.constEnd(); ++it )
93-
{
94-
QgsRasterBlock* block = new QgsRasterBlock( Qgis::Float32, it.value()->nColumns(), it.value()->nRows(), it.value()->nodataValue() );
95-
for ( int row = 0; row < it.value()->nRows(); ++row )
96-
{
97-
for ( int col = 0; col < it.value()->nColumns(); ++col )
98-
{
99-
block->setValue( row, col, it.value()->data()[ row * it.value()->nColumns() + col ] );
100-
}
101-
}
102-
rasterBlockData.insert( it.key(), block );
103-
}
104-
105-
return calculate( rasterBlockData, result );
106-
}
107-
10886
bool QgsRasterCalcNode::calculate( QMap<QString, QgsRasterBlock* >& rasterData, QgsRasterMatrix& result, int row ) const
10987
{
11088
//if type is raster ref: return a copy of the corresponding matrix

src/analysis/raster/qgsrastercalcnode.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ class ANALYSIS_EXPORT QgsRasterCalcNode
9292
*/
9393
bool calculate( QMap<QString, QgsRasterBlock* >& rasterData, QgsRasterMatrix& result, int row = -1 ) const;
9494

95-
/** @deprecated use method which accepts QgsRasterBlocks instead
96-
*/
97-
Q_DECL_DEPRECATED bool calculate( QMap<QString, QgsRasterMatrix*>& rasterData, QgsRasterMatrix& result ) const;
98-
9995
static QgsRasterCalcNode* parseRasterCalcString( const QString& str, QString& parserErrorMsg );
10096

10197
private:

src/app/ogr/qgsvectorlayersaveasdialog.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -628,11 +628,6 @@ QStringList QgsVectorLayerSaveAsDialog::layerOptions() const
628628
return options + mOgrLayerOptions->toPlainText().split( '\n' );
629629
}
630630

631-
bool QgsVectorLayerSaveAsDialog::attributeSelection() const
632-
{
633-
return true;
634-
}
635-
636631
QgsAttributeList QgsVectorLayerSaveAsDialog::selectedAttributes() const
637632
{
638633
QgsAttributeList attributes;

src/app/ogr/qgsvectorlayersaveasdialog.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ class APP_EXPORT QgsVectorLayerSaveAsDialog : public QDialog, private Ui::QgsVec
5151
QStringList datasourceOptions() const;
5252
QStringList layerOptions() const;
5353
long crs() const;
54-
/** @deprecated since 2.16. Now always return true since there is no longer any checkbox */
55-
bool attributeSelection() const;
5654
QgsAttributeList selectedAttributes() const;
5755
/** Return selected attributes that must be exported with their displayed values instead of their raw values. Added in QGIS 2.16 */
5856
QgsAttributeList attributesAsDisplayedValues() const;

src/app/qgisapp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6238,7 +6238,7 @@ void QgisApp::saveAsVectorFileGeneral( QgsVectorLayer* vlayer, bool symbologyOpt
62386238
dialog->onlySelected(),
62396239
&errorMessage,
62406240
datasourceOptions, dialog->layerOptions(),
6241-
dialog->attributeSelection() && dialog->selectedAttributes().isEmpty(),
6241+
dialog->selectedAttributes().isEmpty(),
62426242
&newFilename,
62436243
static_cast< QgsVectorFileWriter::SymbologyExport >( dialog->symbologyExport() ),
62446244
dialog->scaleDenominator(),

src/app/qgsannotationwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ QgsAnnotationWidget::QgsAnnotationWidget( QgsAnnotationItem* item, QWidget * par
3232
{
3333
blockAllSignals( true );
3434

35-
if ( mItem->mapPositionFixed() )
35+
if ( mItem->hasFixedMapPosition() )
3636
{
3737
mMapPositionFixedCheckBox->setCheckState( Qt::Checked );
3838
}

src/app/qgsmaptoolannotation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent* e )
164164
}
165165
else if ( mCurrentMoveAction == QgsAnnotationItem::MoveFramePosition )
166166
{
167-
if ( sItem->mapPositionFixed() )
167+
if ( sItem->hasFixedMapPosition() )
168168
{
169169
sItem->setOffsetFromReferencePoint( sItem->offsetFromReferencePoint() + ( e->posF() - mLastMousePosition ) );
170170
}

src/core/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,6 @@ SET(QGIS_CORE_HDRS
604604
qgsaggregatecalculator.h
605605
qgsannotation.h
606606
qgsattributetableconfig.h
607-
qgsattributeaction.h
608607
qgsattributeeditorelement.h
609608
qgscachedfeatureiterator.h
610609
qgscacheindex.h

src/core/composer/qgscomposermap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2372,7 +2372,7 @@ void QgsComposerMap::drawCanvasItem( const QgsAnnotation* annotation, QPainter*
23722372
double scaleFactor = annotation->scaleFactor();
23732373

23742374
double itemX, itemY;
2375-
if ( annotation->mapPositionFixed() )
2375+
if ( annotation->hasFixedMapPosition() )
23762376
{
23772377
QPointF mapPos = composerMapPosForItem( annotation );
23782378
itemX = mapPos.x();

src/core/diagram/qgsdiagram.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -132,17 +132,3 @@ QSizeF QgsDiagram::sizeForValue( double value, const QgsDiagramSettings &s, cons
132132

133133
return size;
134134
}
135-
136-
void QgsDiagram::renderDiagram( const QgsAttributes& attributes, QgsRenderContext& c, const QgsDiagramSettings& s, QPointF position )
137-
{
138-
QgsFeature feature;
139-
feature.setAttributes( attributes );
140-
renderDiagram( feature, c, s, position );
141-
}
142-
143-
QSizeF QgsDiagram::diagramSize( const QgsAttributes& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s, const QgsDiagramInterpolationSettings& is )
144-
{
145-
QgsFeature feature;
146-
feature.setAttributes( attributes );
147-
return diagramSize( feature, c, s, is );
148-
}

src/core/diagram/qgsdiagram.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,11 @@ class CORE_EXPORT QgsDiagram
4949
*/
5050
QgsExpression* getExpression( const QString& expression, const QgsExpressionContext& context );
5151

52-
/** @deprecated `void renderDiagram( const QgsFeature& feature, QgsRenderContext& c, const QgsDiagramSettings& s, const QPointF& position )` should be used instead */
53-
virtual Q_DECL_DEPRECATED void renderDiagram( const QgsAttributes& att, QgsRenderContext& c, const QgsDiagramSettings& s, QPointF position );
5452
/** Draws the diagram at the given position (in pixel coordinates)*/
5553
virtual void renderDiagram( const QgsFeature& feature, QgsRenderContext& c, const QgsDiagramSettings& s, QPointF position ) = 0;
5654
virtual QString diagramName() const = 0;
5755
/** Returns the size in map units the diagram will use to render.*/
5856
virtual QSizeF diagramSize( const QgsAttributes& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s ) = 0;
59-
/** @deprecated `QSizeF diagramSize( const QgsFeature& feature, const QgsRenderContext& c, const QgsDiagramSettings& s, const QgsDiagramInterpolationSettings& is )` should be used instead */
60-
virtual Q_DECL_DEPRECATED QSizeF diagramSize( const QgsAttributes& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s, const QgsDiagramInterpolationSettings& is );
6157
/** Returns the size in map units the diagram will use to render. Interpolate size*/
6258
virtual QSizeF diagramSize( const QgsFeature& feature, const QgsRenderContext& c, const QgsDiagramSettings& s, const QgsDiagramInterpolationSettings& is ) = 0;
6359

src/core/qgsannotation.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ class CORE_EXPORT QgsAnnotation
5050
* @see mapPosition()
5151
* @see relativePositon()
5252
*/
53-
//TODO QGIS 3 - rename to hasFixedMapPosition()
54-
virtual bool mapPositionFixed() const = 0;
53+
virtual bool hasFixedMapPosition() const = 0;
5554

5655
/** Returns the map position of the annotation, if it is attached to a fixed map
5756
* position.

src/core/qgsattributeaction.h

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/gui/attributetable/qgsorganizetablecolumnsdialog.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "qgslogger.h"
3232
#include "qgsmapcanvas.h"
3333
#include "qgsproject.h"
34-
#include "qgsattributeaction.h"
3534
#include "qgsexpressionbuilderdialog.h"
3635
#include "qgsmessagebar.h"
3736
#include "qgsexpressionselectiondialog.h"

src/gui/qgsannotationitem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class GUI_EXPORT QgsAnnotationItem: public QgsMapCanvasItem, public QgsAnnotatio
6767

6868
//setters and getters
6969
void setMapPositionFixed( bool fixed );
70-
bool mapPositionFixed() const override { return mMapPositionFixed; }
70+
bool hasFixedMapPosition() const override { return mMapPositionFixed; }
7171

7272
virtual void setMapPosition( const QgsPoint& pos );
7373
QgsPoint mapPosition() const override { return mMapPosition; }

0 commit comments

Comments
 (0)