11 changes: 0 additions & 11 deletions python/core/qgsvectorfilewriter.sip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,6 @@ class QgsVectorFileWriter
ErrInvalidLayer, // added in 2.0
};

/** Write contents of vector layer to a shapefile
@deprecated Use writeAsVectorFormat instead*/
static WriterError writeAsShapefile( QgsVectorLayer* layer,
const QString& shapefileName,
const QString& fileEncoding,
const QgsCoordinateReferenceSystem *,
bool onlySelected = false,
QString *errorMessage = 0,
const QStringList &datasourceOptions = QStringList(),
const QStringList &layerOptions = QStringList() ) /Deprecated/;

/** Write contents of vector layer to an (OGR supported) vector formt
@note: this method was added in version 1.5*/
static WriterError writeAsVectorFormat( QgsVectorLayer* layer,
Expand Down
11 changes: 0 additions & 11 deletions python/core/qgsvectorlayer.sip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,6 @@ class QgsVectorLayer : QgsMapLayer
*/
virtual long featureCount() const;

/** This function does nothing useful, it's kept only for compatibility.
* @todo to be removed
*/
virtual long updateFeatureCount() const /Deprecated/;

/**
* Set the string (typically sql) used to define a subset of the layer
* @param subset The subset string. This may be the where clause of a sql statement
Expand Down Expand Up @@ -381,7 +376,6 @@ class QgsVectorLayer : QgsMapLayer
5 if several features are selected,
6 if selected geometry not found*/
int addPart( const QList<QgsPoint>& ring );
int addIsland( const QList<QgsPoint>& ring ) /Deprecated/;

/**Translates feature by dx, dy
@param featureId id of the feature to translate
Expand Down Expand Up @@ -515,11 +509,6 @@ class QgsVectorLayer : QgsMapLayer
@note added in version 1.2 */
bool addAttribute( const QgsField &field );

/** add an attribute field (but does not commit it)
returns true if the field was added
@deprecated */
bool addAttribute( QString name, QString type ) /Deprecated/;

/**Sets an alias (a display name) for attributes to display in dialogs
@note added in version 1.2*/
void addAttributeAlias( int attIndex, QString aliasString );
Expand Down
62 changes: 0 additions & 62 deletions python/core/raster/qgsrasterlayer.sip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,6 @@ class QgsRasterLayer : QgsMapLayer
/** \brief Accessor to find out how many standard deviations are being plotted */
double standardDeviations() const;

/** \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data?
* @deprecated in 2.0
*/
bool usesProvider() /Deprecated/;

/** \brief Accessor that returns the width of the (unclipped) raster */
int width();

Expand Down Expand Up @@ -330,21 +325,6 @@ class QgsRasterLayer : QgsMapLayer
@note this method was added in version 1.8*/
QList< QPair< QString, QColor > > legendSymbologyItems() const;

/** \brief Get a legend image for this layer */
QPixmap legendAsPixmap() /Deprecated/;

/** \brief Overloaded version of above function that can print layer name onto legend */
QPixmap legendAsPixmapBool( bool ) /Deprecated/;
%MethodCode
sipRes = new QPixmap( sipCpp->legendAsPixmap( a0 ) );
%End

/** \brief Use this method when you want an annotated legend suitable for print output etc */
QPixmap legendAsPixmapCount( int theLabelCount ) /Deprecated/;
%MethodCode
sipRes = new QPixmap( sipCpp->legendAsPixmap( a0 ) );
%End

/** \brief Accessor for maximum value user for contrast enhancement */
double maximumValue( unsigned int theBand );

Expand All @@ -368,11 +348,6 @@ class QgsRasterLayer : QgsMapLayer
*/
QString providerType() const;

/** \brief [ data provider interface ] Which provider is being used for this Raster Layer?
* @deprecated use providerType()
*/
QString providerKey() const /Deprecated/;

/** \brief Returns the number of raster units per each raster pixel. In a world file, this is normally the first row (without the sign) */
double rasterUnitsPerPixel();

Expand All @@ -382,15 +357,6 @@ class QgsRasterLayer : QgsMapLayer
/** \brief Simple reset function that set the noDataValue back to the value stored in the first raster band */
//void resetNoDataValue();

/** \brief Mutator for blue band name mapping */
void setBlueBandName( const QString & theBandName );

/** \brief Mutator for color shader algorithm */
void setColorShadingAlgorithm( QgsRasterLayer::ColorShadingAlgorithm theShaderAlgorithm );

/** \brief Mutator for color shader algorithm */
void setColorShadingAlgorithm( QString theShaderAlgorithm ) /Deprecated/;

static QString contrastEnhancementLimitsAsString( QgsRasterLayer::ContrastEnhancementLimits theLimits );
static ContrastEnhancementLimits contrastEnhancementLimitsFromString( QString theLimits );

Expand Down Expand Up @@ -425,18 +391,9 @@ class QgsRasterLayer : QgsMapLayer
/** \brief Overloaded version of the above function for convenience when restoring from xml */
void setDrawingStyle( const QString & theDrawingStyleQString );

/** \brief Mutator for gray band name mapping */
void setGrayBandName( const QString & theBandName ) /Deprecated/;

/** \brief Mutator for green band name mapping */
void setGreenBandName( const QString & theBandName ) /Deprecated/;

/** \brief Mutator for setting the maximum value for contrast enhancement */
void setMaximumValue( unsigned int theBand, double theValue, bool theGenerateLookupTableFlag = true );

/** \brief Mutator for setting the maximum value for contrast enhancement */
void setMaximumValue( QString theBand, double theValue, bool theGenerateLookupTableFlag = true ) /Deprecated/;

/** \brief Sets the minimum and maximum values for the band(s) currently
* being displayed using the only pixel values from the last/current extent
* */
Expand All @@ -446,31 +403,12 @@ class QgsRasterLayer : QgsMapLayer
* being displayed using the only pixel values from the dataset min/max */
void setMinimumMaximumUsingDataset();

/** \brief Mutator for setting the minimum value for contrast enhancement */
void setMinimumValue( unsigned int theBand, double theValue, bool theGenerateLookupTableFlag = true ) /Deprecated/;

/** \brief Mutator for setting the minimum value for contrast enhancement */
void setMinimumValue( QString theBand, double theValue, bool theGenerateLookupTableFlag = true ) /Deprecated/;

/** \brief Set the raster shader function to a user defined function
\note ownership of the shader function is transfered to raster shader */
void setRasterShaderFunction( QgsRasterShaderFunction* theFunction /Transfer/ ) /Deprecated/;

/** \brief Mutator for red band name (allows alternate mappings e.g. map blue as red color) */
void setRedBandName( const QString & theBandName ) /Deprecated/;

/** \brief Mutator for transparent band name mapping */
void setTransparentBandName( const QString & theBandName ) /Deprecated/;

/** \brief [ data provider interface ] A wrapper function to emit a progress update signal */
void showProgress( int theValue );

/** \brief Returns the sublayers of this layer - Useful for providers that manage their own layers, such as WMS */
virtual QStringList subLayers() const;

/** \brief Draws a thumbnail of the rasterlayer into the supplied pixmap pointer */
void thumbnailAsPixmap( QPixmap * theQPixmap ) /Deprecated/;

/** \brief Draws a preview of the rasterlayer into a pixmap */
QPixmap previewAsPixmap( QSize size, QColor bgColor = QColor( 255, 255, 255 ) );

Expand Down
30 changes: 0 additions & 30 deletions python/gui/qgisinterface.sip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,6 @@ class QgisInterface : QObject
*/
virtual void removeDockWidget( QDockWidget * dockwidget ) = 0;

/** refresh the legend of a layer
\deprecated use QgsLegendInterface::refreshLayerSymbology
*/
virtual void refreshLegend( QgsMapLayer * layer ) = 0 /Deprecated/;

/** open layer properties dialog
\note added in 1.5
*/
Expand Down Expand Up @@ -290,40 +285,27 @@ class QgisInterface : QObject
//! File menu actions
virtual QAction *actionNewProject() = 0;
virtual QAction *actionOpenProject() = 0;
virtual QAction *actionFileSeparator1() = 0 /Deprecated/;
virtual QAction *actionSaveProject() = 0;
virtual QAction *actionSaveProjectAs() = 0;
virtual QAction *actionSaveMapAsImage() = 0;
virtual QAction *actionFileSeparator2() = 0 /Deprecated/;
virtual QAction *actionProjectProperties() = 0;
virtual QAction *actionFileSeparator3() = 0 /Deprecated/;
virtual QAction *actionPrintComposer() = 0;
virtual QAction *actionFileSeparator4() = 0 /Deprecated/;
virtual QAction *actionExit() = 0;

//! Edit menu actions
virtual QAction *actionCutFeatures() = 0;
virtual QAction *actionCopyFeatures() = 0;
virtual QAction *actionPasteFeatures() = 0;
virtual QAction *actionEditSeparator1() = 0 /Deprecated/;
virtual QAction *actionAddFeature() = 0;
virtual QAction *actionCapturePoint() = 0 /Deprecated/;
virtual QAction *actionCaptureLine() = 0 /Deprecated/;
virtual QAction *actionCapturePolygon() = 0 /Deprecated/;
virtual QAction *actionDeleteSelected() = 0;
virtual QAction *actionMoveFeature() = 0;
virtual QAction *actionSplitFeatures() = 0;
virtual QAction *actionAddVertex() = 0 /Deprecated/;
virtual QAction *actionDeleteVertex() = 0 /Deprecated/;
virtual QAction *actionMoveVertex() = 0 /Deprecated/;
virtual QAction *actionAddRing() = 0;
virtual QAction *actionAddIsland() = 0 /Deprecated/;
virtual QAction *actionAddPart() = 0;
virtual QAction *actionSimplifyFeature() = 0;
virtual QAction *actionDeleteRing() = 0;
virtual QAction *actionDeletePart() = 0;
virtual QAction *actionNodeTool() = 0;
virtual QAction *actionEditSeparator2() = 0 /Deprecated/;

//! View menu actions
virtual QAction *actionPan() = 0;
Expand All @@ -339,26 +321,22 @@ class QgisInterface : QObject
virtual QAction *actionIdentify() = 0;
virtual QAction *actionMeasure() = 0;
virtual QAction *actionMeasureArea() = 0;
virtual QAction *actionViewSeparator1() = 0 /Deprecated/;
virtual QAction *actionZoomFullExtent() = 0;
virtual QAction *actionZoomToLayer() = 0;
virtual QAction *actionZoomToSelected() = 0;
virtual QAction *actionZoomLast() = 0;
virtual QAction *actionZoomActualSize() = 0;
virtual QAction *actionViewSeparator2() = 0 /Deprecated/;
virtual QAction *actionMapTips() = 0;
virtual QAction *actionNewBookmark() = 0;
virtual QAction *actionShowBookmarks() = 0;
virtual QAction *actionDraw() = 0;
virtual QAction *actionViewSeparator3() = 0 /Deprecated/;

//! Layer menu actions
virtual QAction *actionNewVectorLayer() = 0;
virtual QAction *actionAddOgrLayer() = 0;
virtual QAction *actionAddRasterLayer() = 0;
virtual QAction *actionAddPgLayer() = 0;
virtual QAction *actionAddWmsLayer() = 0;
virtual QAction *actionLayerSeparator1() = 0 /Deprecated/;
/** @note added in 1.9 */
virtual QAction *actionCopyLayerStyle() = 0;
/** @note added in 1.9 */
Expand All @@ -375,34 +353,26 @@ class QgisInterface : QObject
/** @note added in 1.9 */
virtual QAction *actionDuplicateLayer() = 0;
virtual QAction *actionLayerProperties() = 0;
virtual QAction *actionLayerSeparator2() = 0 /Deprecated/;
virtual QAction *actionAddToOverview() = 0;
virtual QAction *actionAddAllToOverview() = 0;
virtual QAction *actionRemoveAllFromOverview() = 0;
virtual QAction *actionLayerSeparator3() = 0 /Deprecated/;
virtual QAction *actionHideAllLayers() = 0;
virtual QAction *actionShowAllLayers() = 0;

//! Plugin menu actions
virtual QAction *actionManagePlugins() = 0;
virtual QAction *actionPluginSeparator1() = 0 /Deprecated/;
virtual QAction *actionPluginListSeparator() = 0;
virtual QAction *actionPluginSeparator2() = 0 /Deprecated/;
virtual QAction *actionPluginPythonSeparator() = 0 /Deprecated/;
virtual QAction *actionShowPythonDialog() = 0;

//! Settings menu actions
virtual QAction *actionToggleFullScreen() = 0;
virtual QAction *actionSettingsSeparator1() = 0 /Deprecated/;
virtual QAction *actionOptions() = 0;
virtual QAction *actionCustomProjection() = 0;

//! Help menu actions
virtual QAction *actionHelpContents() = 0;
virtual QAction *actionHelpSeparator1() = 0 /Deprecated/;
virtual QAction *actionQgisHomePage() = 0;
virtual QAction *actionCheckQgisVersion() = 0;
virtual QAction *actionHelpSeparator2() = 0 /Deprecated/;
virtual QAction *actionAbout() = 0;

//! Open feature form
Expand Down
5 changes: 0 additions & 5 deletions python/gui/qgsgenericprojectionselector.sip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,10 @@ class QgsGenericProjectionSelector : QDialog //, private Ui::QgsGenericProjectio
long selectedCrsId();
QString selectedAuthId();

long selectedEpsg() /Deprecated/;
QString selectedProj4String() /Deprecated/;

void setSelectedCrsName( QString theName );
void setSelectedCrsId( long theID );
void setSelectedAuthId( QString authId );

void setSelectedEpsg( long theID ) /Deprecated/;

/**
* \brief filters this dialog by the given CRSs
*
Expand Down
6 changes: 1 addition & 5 deletions python/gui/qgsmapcanvas.sip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class QgsMapCanvas : QGraphicsView
%TypeHeaderCode
#include <qgsmapcanvas.h>
%End

%ConvertToSubClassCode
if (dynamic_cast<QgsMapCanvas*>(sipCpp) != NULL)
sipClass = sipClass_QgsMapCanvas;
Expand Down Expand Up @@ -59,10 +59,6 @@ class QgsMapCanvas : QGraphicsView

QgsMapRenderer* mapRenderer() /Transfer/;

//! Accessor for the canvas pixmap
// @deprecated use canvasPaintDevice()
QPixmap& canvasPixmap() /Deprecated/;

//! Accessor for the canvas paint device
QPaintDevice &canvasPaintDevice();

Expand Down
15 changes: 6 additions & 9 deletions python/gui/qgsmapcanvasmap.sip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ class QgsMapCanvasMap : QGraphicsRectItem
%End

%ConvertToSubClassCode
if (dynamic_cast<QgsMapCanvasMap*>(sipCpp) != NULL)
{
sipClass = sipClass_QgsMapCanvasMap;
}
else
if (dynamic_cast<QgsMapCanvasMap*>(sipCpp) != NULL)
{
sipClass = sipClass_QgsMapCanvasMap;
}
else
{
sipClass = NULL;
}
%End

public:

//! constructor
QgsMapCanvasMap( QgsMapCanvas* canvas /TransferThis/ );

Expand All @@ -42,9 +42,6 @@ class QgsMapCanvasMap : QGraphicsRectItem

void setPanningOffset( const QPoint& point );

//! @deprecated Please use paintDevice() function which is also save in case QImage is used
QPixmap& pixmap() /Deprecated/;

QPaintDevice& paintDevice();

void paint( QPainter* p, const QStyleOptionGraphicsItem*, QWidget* );
Expand Down
8 changes: 0 additions & 8 deletions python/gui/qgsprojectionselector.sip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ class QgsProjectionSelector : QWidget
*/
const QString sqlSafeString( const QString theSQL );

//! Gets the current EpsgCrsId-style projection identifier
// @deprecated there are other authorities - use selectedAuthId()
long selectedEpsg() /Deprecated/;

//! Gets the current authority-style projection identifier
QString selectedAuthId();

Expand All @@ -64,10 +60,6 @@ class QgsProjectionSelector : QWidget

void setSelectedAuthId( QString authId );

//! Get the selected coordinate system
// @deprecated there are other authorities - so not always defined
void setSelectedEpsg( long epsg ) /Deprecated/;

QString selectedProj4String();

//! Gets the current PostGIS-style projection identifier
Expand Down
36 changes: 0 additions & 36 deletions src/app/qgisappinterface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,14 +309,6 @@ void QgisAppInterface::removeDockWidget( QDockWidget * dockwidget )
qgis->removeDockWidget( dockwidget );
}

void QgisAppInterface::refreshLegend( QgsMapLayer *l )
{
if ( l && qgis && qgis->legend() )
{
qgis->legend()->refreshLayerSymbology( l->id() );
}
}

void QgisAppInterface::showLayerProperties( QgsMapLayer *l )
{
if ( l && qgis )
Expand Down Expand Up @@ -386,43 +378,27 @@ QToolBar *QgisAppInterface::webToolBar() { return qgis->webToolBar(); }
//! File menu actions
QAction *QgisAppInterface::actionNewProject() { return qgis->actionNewProject(); }
QAction *QgisAppInterface::actionOpenProject() { return qgis->actionOpenProject(); }
QAction *QgisAppInterface::actionFileSeparator1() { return 0; }
QAction *QgisAppInterface::actionSaveProject() { return qgis->actionSaveProject(); }
QAction *QgisAppInterface::actionSaveProjectAs() { return qgis->actionSaveProjectAs(); }
QAction *QgisAppInterface::actionSaveMapAsImage() { return qgis->actionSaveMapAsImage(); }
QAction *QgisAppInterface::actionFileSeparator2() { return 0; }
QAction *QgisAppInterface::actionProjectProperties() { return qgis->actionProjectProperties(); }
QAction *QgisAppInterface::actionFileSeparator3() { return 0; }
QAction *QgisAppInterface::actionPrintComposer() { return qgis->actionNewPrintComposer(); }
QAction *QgisAppInterface::actionFileSeparator4() { return 0; }
QAction *QgisAppInterface::actionExit() { return qgis->actionExit(); }

//! Edit menu actions
QAction *QgisAppInterface::actionCutFeatures() { return qgis->actionCutFeatures(); }
QAction *QgisAppInterface::actionCopyFeatures() { return qgis->actionCopyFeatures(); }
QAction *QgisAppInterface::actionPasteFeatures() { return qgis->actionPasteFeatures(); }
QAction *QgisAppInterface::actionEditSeparator1() { return 0; }
QAction *QgisAppInterface::actionAddFeature() { return qgis->actionAddFeature(); }
QAction *QgisAppInterface::actionCapturePoint() { return qgis->actionAddFeature(); }
QAction *QgisAppInterface::actionCaptureLine() { return qgis->actionAddFeature(); }
QAction *QgisAppInterface::actionCapturePolygon() { return qgis->actionAddFeature(); }
QAction *QgisAppInterface::actionDeleteSelected() { return qgis->actionDeleteSelected(); }
QAction *QgisAppInterface::actionMoveFeature() { return qgis->actionMoveFeature(); }
QAction *QgisAppInterface::actionSplitFeatures() { return qgis->actionSplitFeatures(); }
//these three actions are removed from the ui as of qgis v1.4
//for plugin api completeness we now return a null pointer
//but these should be removed from the plugin interface for v2
QAction *QgisAppInterface::actionAddVertex() { return 0; }
QAction *QgisAppInterface::actionDeleteVertex() { return 0; }
QAction *QgisAppInterface::actionMoveVertex() { return 0; }
QAction *QgisAppInterface::actionAddRing() { return qgis->actionAddRing(); }
QAction *QgisAppInterface::actionAddPart() { return qgis->actionAddPart(); }
QAction *QgisAppInterface::actionAddIsland() { return qgis->actionAddPart(); }
QAction *QgisAppInterface::actionSimplifyFeature() { return qgis->actionSimplifyFeature(); }
QAction *QgisAppInterface::actionDeleteRing() { return qgis->actionDeleteRing(); }
QAction *QgisAppInterface::actionDeletePart() { return qgis->actionDeletePart(); }
QAction *QgisAppInterface::actionNodeTool() { return qgis->actionNodeTool(); }
QAction *QgisAppInterface::actionEditSeparator2() { return 0; }

//! View menu actions
QAction *QgisAppInterface::actionPan() { return qgis->actionPan(); }
Expand All @@ -439,27 +415,23 @@ QAction *QgisAppInterface::actionIdentify() { return qgis->actionIdentify(); }
QAction *QgisAppInterface::actionFeatureAction() { return qgis->actionFeatureAction(); }
QAction *QgisAppInterface::actionMeasure() { return qgis->actionMeasure(); }
QAction *QgisAppInterface::actionMeasureArea() { return qgis->actionMeasureArea(); }
QAction *QgisAppInterface::actionViewSeparator1() { return 0; }
QAction *QgisAppInterface::actionZoomFullExtent() { return qgis->actionZoomFullExtent(); }
QAction *QgisAppInterface::actionZoomToLayer() { return qgis->actionZoomToLayer(); }
QAction *QgisAppInterface::actionZoomToSelected() { return qgis->actionZoomToSelected(); }
QAction *QgisAppInterface::actionZoomLast() { return qgis->actionZoomLast(); }
QAction *QgisAppInterface::actionZoomNext() { return qgis->actionZoomNext(); }
QAction *QgisAppInterface::actionZoomActualSize() { return qgis->actionZoomActualSize(); }
QAction *QgisAppInterface::actionViewSeparator2() { return 0; }
QAction *QgisAppInterface::actionMapTips() { return qgis->actionMapTips(); }
QAction *QgisAppInterface::actionNewBookmark() { return qgis->actionNewBookmark(); }
QAction *QgisAppInterface::actionShowBookmarks() { return qgis->actionShowBookmarks(); }
QAction *QgisAppInterface::actionDraw() { return qgis->actionDraw(); }
QAction *QgisAppInterface::actionViewSeparator3() { return 0; }

//! Layer menu actions
QAction *QgisAppInterface::actionNewVectorLayer() { return qgis->actionNewVectorLayer(); }
QAction *QgisAppInterface::actionAddOgrLayer() { return qgis->actionAddOgrLayer(); }
QAction *QgisAppInterface::actionAddRasterLayer() { return qgis->actionAddRasterLayer(); }
QAction *QgisAppInterface::actionAddPgLayer() { return qgis->actionAddPgLayer(); }
QAction *QgisAppInterface::actionAddWmsLayer() { return qgis->actionAddWmsLayer(); }
QAction *QgisAppInterface::actionLayerSeparator1() { return 0; }
QAction *QgisAppInterface::actionCopyLayerStyle() { return qgis->actionCopyLayerStyle(); }
QAction *QgisAppInterface::actionPasteLayerStyle() { return qgis->actionPasteLayerStyle(); }
QAction *QgisAppInterface::actionOpenTable() { return qgis->actionOpenTable(); }
Expand All @@ -471,34 +443,26 @@ QAction *QgisAppInterface::actionLayerSelectionSaveAs() { return qgis->actionLay
QAction *QgisAppInterface::actionRemoveLayer() { return qgis->actionRemoveLayer(); }
QAction *QgisAppInterface::actionDuplicateLayer() { return qgis->actionDuplicateLayer(); }
QAction *QgisAppInterface::actionLayerProperties() { return qgis->actionLayerProperties(); }
QAction *QgisAppInterface::actionLayerSeparator2() { return 0; }
QAction *QgisAppInterface::actionAddToOverview() { return qgis->actionAddToOverview(); }
QAction *QgisAppInterface::actionAddAllToOverview() { return qgis->actionAddAllToOverview(); }
QAction *QgisAppInterface::actionRemoveAllFromOverview() { return qgis->actionRemoveAllFromOverview(); }
QAction *QgisAppInterface::actionLayerSeparator3() { return 0; }
QAction *QgisAppInterface::actionHideAllLayers() { return qgis->actionHideAllLayers(); }
QAction *QgisAppInterface::actionShowAllLayers() { return qgis->actionShowAllLayers(); }

//! Plugin menu actions
QAction *QgisAppInterface::actionManagePlugins() { return qgis->actionManagePlugins(); }
QAction *QgisAppInterface::actionPluginSeparator1() { return 0; }
QAction *QgisAppInterface::actionPluginListSeparator() { return qgis->actionPluginListSeparator(); }
QAction *QgisAppInterface::actionPluginSeparator2() { return 0; }
QAction *QgisAppInterface::actionPluginPythonSeparator() { return qgis->actionPluginPythonSeparator(); }
QAction *QgisAppInterface::actionShowPythonDialog() { return qgis->actionShowPythonDialog(); }

//! Settings menu actions
QAction *QgisAppInterface::actionToggleFullScreen() { return qgis->actionToggleFullScreen(); }
QAction *QgisAppInterface::actionSettingsSeparator1() { return 0; }
QAction *QgisAppInterface::actionOptions() { return qgis->actionOptions(); }
QAction *QgisAppInterface::actionCustomProjection() { return qgis->actionCustomProjection(); }

//! Help menu actions
QAction *QgisAppInterface::actionHelpContents() { return qgis->actionHelpContents(); }
QAction *QgisAppInterface::actionHelpSeparator1() { return 0; }
QAction *QgisAppInterface::actionQgisHomePage() { return qgis->actionQgisHomePage(); }
QAction *QgisAppInterface::actionCheckQgisVersion() { return qgis->actionCheckQgisVersion(); }
QAction *QgisAppInterface::actionHelpSeparator2() { return 0; }
QAction *QgisAppInterface::actionAbout() { return qgis->actionAbout(); }

bool QgisAppInterface::openFeatureForm( QgsVectorLayer *vlayer, QgsFeature &f, bool updateFeatureOnly )
Expand Down
27 changes: 0 additions & 27 deletions src/app/qgisappinterface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@ class QgisAppInterface : public QgisInterface
/** Remove specified dock widget from main window (doesn't delete it). Added in QGIS 1.1. */
void removeDockWidget( QDockWidget * dockwidget );

virtual void refreshLegend( QgsMapLayer *l );

/** show layer properties dialog for layer
* @param l layer to show properties table for
* @note added in added in 1.5
Expand Down Expand Up @@ -237,40 +235,27 @@ class QgisAppInterface : public QgisInterface
//! File menu actions
virtual QAction *actionNewProject();
virtual QAction *actionOpenProject();
virtual QAction *actionFileSeparator1();
virtual QAction *actionSaveProject();
virtual QAction *actionSaveProjectAs();
virtual QAction *actionSaveMapAsImage();
virtual QAction *actionFileSeparator2();
virtual QAction *actionProjectProperties();
virtual QAction *actionFileSeparator3();
virtual QAction *actionPrintComposer();
virtual QAction *actionFileSeparator4();
virtual QAction *actionExit();

//! Edit menu actions
virtual QAction *actionCutFeatures();
virtual QAction *actionCopyFeatures();
virtual QAction *actionPasteFeatures();
virtual QAction *actionEditSeparator1();
virtual QAction *actionAddFeature();
Q_DECL_DEPRECATED virtual QAction *actionCapturePoint();
Q_DECL_DEPRECATED virtual QAction *actionCaptureLine();
Q_DECL_DEPRECATED virtual QAction *actionCapturePolygon();
virtual QAction *actionDeleteSelected();
virtual QAction *actionMoveFeature();
virtual QAction *actionSplitFeatures();
virtual QAction *actionAddVertex();
virtual QAction *actionDeleteVertex();
virtual QAction *actionMoveVertex();
virtual QAction *actionAddRing();
virtual QAction *actionAddPart();
Q_DECL_DEPRECATED virtual QAction *actionAddIsland();
virtual QAction *actionSimplifyFeature();
virtual QAction *actionDeleteRing();
virtual QAction *actionDeletePart();
virtual QAction *actionNodeTool();
virtual QAction *actionEditSeparator2();

//! View menu actions
virtual QAction *actionPan();
Expand All @@ -287,27 +272,23 @@ class QgisAppInterface : public QgisInterface
virtual QAction *actionFeatureAction();
virtual QAction *actionMeasure();
virtual QAction *actionMeasureArea();
virtual QAction *actionViewSeparator1();
virtual QAction *actionZoomFullExtent();
virtual QAction *actionZoomToLayer();
virtual QAction *actionZoomToSelected();
virtual QAction *actionZoomLast();
virtual QAction *actionZoomNext();
virtual QAction *actionZoomActualSize();
virtual QAction *actionViewSeparator2();
virtual QAction *actionMapTips();
virtual QAction *actionNewBookmark();
virtual QAction *actionShowBookmarks();
virtual QAction *actionDraw();
virtual QAction *actionViewSeparator3();

//! Layer menu actions
virtual QAction *actionNewVectorLayer();
virtual QAction *actionAddOgrLayer();
virtual QAction *actionAddRasterLayer();
virtual QAction *actionAddPgLayer();
virtual QAction *actionAddWmsLayer();
virtual QAction *actionLayerSeparator1();
/** @note added in 1.9 */
virtual QAction *actionCopyLayerStyle();
/** @note added in 1.9 */
Expand All @@ -324,34 +305,26 @@ class QgisAppInterface : public QgisInterface
/** @note added in 1.9 */
virtual QAction *actionDuplicateLayer();
virtual QAction *actionLayerProperties();
virtual QAction *actionLayerSeparator2();
virtual QAction *actionAddToOverview();
virtual QAction *actionAddAllToOverview();
virtual QAction *actionRemoveAllFromOverview();
virtual QAction *actionLayerSeparator3();
virtual QAction *actionHideAllLayers();
virtual QAction *actionShowAllLayers();

//! Plugin menu actions
virtual QAction *actionManagePlugins();
virtual QAction *actionPluginSeparator1();
virtual QAction *actionPluginListSeparator();
virtual QAction *actionPluginSeparator2();
virtual QAction *actionPluginPythonSeparator();
virtual QAction *actionShowPythonDialog();

//! Settings menu actions
virtual QAction *actionToggleFullScreen();
virtual QAction *actionSettingsSeparator1();
virtual QAction *actionOptions();
virtual QAction *actionCustomProjection();

//! Help menu actions
virtual QAction *actionHelpContents();
virtual QAction *actionHelpSeparator1();
virtual QAction *actionQgisHomePage();
virtual QAction *actionCheckQgisVersion();
virtual QAction *actionHelpSeparator2();
virtual QAction *actionAbout();

//! open feature form
Expand Down
13 changes: 1 addition & 12 deletions src/core/composer/qgscomposeritem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,24 +159,13 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem
/**Reads parameter that are not subclass specific in document. Usually called from readXML methods of subclasses*/
bool _readXML( const QDomElement& itemElem, const QDomDocument& doc );

/** Whether this item has a frame or not.
* @return boolean - true if there is a frame around this item, otherwise false.
* @note deprecated since 1.8 don't use!
* @see hasFrame
*/
Q_DECL_DEPRECATED bool frame() const {return hasFrame();}
/** Whether this item has a frame or not.
* @returns true if there is a frame around this item, otherwise false.
* @note introduced since 1.8
* @see hasFrame
*/
bool hasFrame() const {return mFrame;}
/** Set whether this item has a frame drawn around it or not.
* @returns void
* @note deprecated since 1.8 don't use!
* @see setFrameEnabled
*/
Q_DECL_DEPRECATED void setFrame( bool drawFrame ) { setFrameEnabled( drawFrame );}

/** Set whether this item has a frame drawn around it or not.
* @param drawFrame draw frame
* @returns nothing
Expand Down
5 changes: 0 additions & 5 deletions src/core/composer/qgscomposermap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,6 @@ QgsComposerMap::~QgsComposerMap()
delete mGridLineSymbol;
}

void QgsComposerMap::draw( QPainter *painter, const QgsRectangle& extent, const QSize& size, int dpi )
{
draw( painter, extent, QSizeF( size.width(), size.height() ), dpi );
}

/* This function is called by paint() and cache() to render the map. It does not override any functions
from QGraphicsItem. */
void QgsComposerMap::draw( QPainter *painter, const QgsRectangle& extent, const QSizeF& size, double dpi, double* forceWidthScale )
Expand Down
3 changes: 0 additions & 3 deletions src/core/composer/qgscomposermap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,6 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
Top
};

/**This function is deprecated*/
Q_DECL_DEPRECATED void draw( QPainter *painter, const QgsRectangle& extent, const QSize& size, int dpi );

/** \brief Draw to paint device
@param painter painter
@param extent map extent
Expand Down
3 changes: 0 additions & 3 deletions src/core/composer/qgscomposermultiframe.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ class CORE_EXPORT QgsComposerMultiFrame: public QObject
/**Removes and deletes all frames from mComposition*/
void deleteFrames();


/** Deprecated in 2.0 use frameCount rather. **/
Q_DECL_DEPRECATED int nFrames() const { return mFrameItems.size(); }
/** Return the number of frames associated with this multiframeset.
@note added in 2.0, replaces nFrames
**/
Expand Down
8 changes: 0 additions & 8 deletions src/core/qgis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,14 +257,6 @@ const QString GEOWKT =
" AXIS[\"Lat\",NORTH], "
" AXIS[\"Long\",EAST], "
" AUTHORITY[\"EPSG\",4326]]";
/** Wkt string that represents a geographic coord sys
* @note deprecated in 1.8 due to violation of coding conventions (globals
* should be in all caps).
*/
#ifndef _MSC_VER
Q_DECL_DEPRECATED
#endif
const QString GEOWkt = GEOWKT;

const QString PROJECT_SCALES =
"1:1000000,1:500000,1:250000,1:100000,1:50000,1:25000,"
Expand Down
14 changes: 0 additions & 14 deletions src/core/qgsapplication.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,11 +428,6 @@ const QString QgsApplication::translatorsFilePath()
return ABISYM( mPkgDataPath ) + QString( "/doc/TRANSLATORS" );
}

const QString QgsApplication::developerPath()
{
return QString(); // developer images are no longer shipped!
}

/*!
Returns the path to the help application.
*/
Expand Down Expand Up @@ -542,15 +537,6 @@ const QStringList QgsApplication::svgPaths()
return myPathList;
}

/*!
Returns the path to the applications svg directories.
*/
const QString QgsApplication::svgPath()
{
QString svgSubDir( ABISYM( mRunningFromBuildDir ) ? "/images/svg/" : "/svg/" );
return ABISYM( mPkgDataPath ) + svgSubDir;
}

const QString QgsApplication::userStyleV2Path()
{
return qgisSettingsDirPath() + QString( "symbology-ng-style.db" );
Expand Down
8 changes: 0 additions & 8 deletions src/core/qgsapplication.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,6 @@ class CORE_EXPORT QgsApplication: public QApplication
*/
static const QString translatorsFilePath();

//! Returns the path to the developer image directory.
//! @deprecated images are not provided anymore :-P
Q_DECL_DEPRECATED static const QString developerPath();

//! Returns the path to the help application.
static const QString helpAppPath();

Expand Down Expand Up @@ -124,10 +120,6 @@ class CORE_EXPORT QgsApplication: public QApplication
//! @note added in 1.4
static const QStringList svgPaths();

//! Returns the paths to svg applications svg directory.
//! @deprecated since 1.4 - use svgPaths()
Q_DECL_DEPRECATED static const QString svgPath();

//! Returns the path to the application prefix directory.
static const QString prefixPath();

Expand Down
28 changes: 0 additions & 28 deletions src/core/qgsattributeaction.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,34 +45,6 @@ void QgsAttributeAction::addAction( QgsAction::ActionType type, QString name, QS
mActions << QgsAction( type, name, action, capture );
}

void QgsAttributeAction::doAction( int index, const QgsAttributeMap &attributes,
int defaultValueIndex, void ( *executePython )( const QString & ) )
{
if ( index < 0 || index >= size() )
return;

const QgsAction &action = at( index );
if ( !action.runable() )
return;

// A couple of extra options for running the action may be
// useful. For example,
// - run the action inside a terminal (on unix)
// - capture the stdout from the process and display in a dialog
// box
//
// The capture stdout one is partially implemented. It just needs
// the UI and the code in this function to select on the
// action.capture() return value.

QString expandedAction = expandAction( action.action(), attributes, defaultValueIndex );
if ( expandedAction.isEmpty() )
return;

QgsAction newAction( action.type(), action.name(), expandedAction, action.capture() );
runAction( newAction, executePython );
}

void QgsAttributeAction::doAction( int index, QgsFeature &feat, int defaultValueIndex )
{
QMap<QString, QVariant> substitutionMap;
Expand Down
11 changes: 0 additions & 11 deletions src/core/qgsattributeaction.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,17 +109,6 @@ class CORE_EXPORT QgsAttributeAction
// dialog box.
void addAction( QgsAction::ActionType type, QString name, QString action, bool capture = false );

/*! Does the action using the given values. defaultValueIndex is an
* index into values which indicates which value in the values vector
* is to be used if the action has a default placeholder.
* @note parameter executePython deprecated (and missing in python binding)
* @deprecated
*/
Q_DECL_DEPRECATED void doAction( int index,
const QgsAttributeMap &attributes,
int defaultValueIndex = 0,
void ( *executePython )( const QString & ) = 0 );

/*! Does the given values. defaultValueIndex is the index of the
* field to be used if the action has a $currfield placeholder.
* @note added in 1.9
Expand Down
20 changes: 0 additions & 20 deletions src/core/qgscoordinatereferencesystem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,6 @@ bool QgsCoordinateReferenceSystem::createFromSrid( long id )
return loadFromDb( QgsApplication::srsDbFilePath(), "srid", QString::number( id ) );
}

bool QgsCoordinateReferenceSystem::createFromEpsg( long id )
{
return createFromOgcWmsCrs( QString( "EPSG:%1" ).arg( id ) );
}

bool QgsCoordinateReferenceSystem::createFromSrsId( long id )
{
return loadFromDb( id < USER_CRS_START_ID ? QgsApplication::srsDbFilePath() :
Expand Down Expand Up @@ -819,14 +814,6 @@ long QgsCoordinateReferenceSystem::postgisSrid() const

}

long QgsCoordinateReferenceSystem::epsg() const
{
if ( mAuthId.startsWith( "EPSG:", Qt::CaseInsensitive ) )
return mAuthId.mid( 5 ).toLong();
else
return 0;
}

QString QgsCoordinateReferenceSystem::authid() const
{
return mAuthId;
Expand Down Expand Up @@ -1132,13 +1119,6 @@ bool QgsCoordinateReferenceSystem::operator!=( const QgsCoordinateReferenceSyste
return !( *this == theSrs );
}

bool QgsCoordinateReferenceSystem::equals( QString theProj4String )
{
QgsCoordinateReferenceSystem r;
r.createFromProj4( theProj4String );
return *this == r;
}

QString QgsCoordinateReferenceSystem::toWkt() const
{
if ( mWkt.isEmpty() )
Expand Down
25 changes: 1 addition & 24 deletions src/core/qgscoordinatereferencesystem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
{
InternalCrsId,
PostgisCrsId,
EpsgCrsId // deprecated
EpsgCrsId // deprecated
};

//! Default constructor
Expand Down Expand Up @@ -118,16 +118,6 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
*/
bool createFromWkt( const QString theWkt );

/*! Set up this srs by fetching the appropriate information from the
* sqlite backend. First the system level read only srs.db will be checked
* and then the users ~/.qgis/qgis.db database will be checked for a match.
* @note Any members will be overwritten during this process.
* @param theEpsg The EpsgCrsId for the desired spatial reference system.
* @return bool TRUE if success else false
* @deprecated use createFromOgcWmsCrs()
*/
Q_DECL_DEPRECATED bool createFromEpsg( const long theEpsg );

/*! Set up this srs by fetching the appropriate information from the
* sqlite backend. If the srsid is < 100000, only the system srs.db
* will be checked. If the srsid > 100000 the srs will be retrieved from
Expand Down Expand Up @@ -242,13 +232,6 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
* Returns opposite bool value to operator ==
*/
bool operator!=( const QgsCoordinateReferenceSystem &theSrs ) const;
/*! Overloaded == operator used to compare to CRS's.
* Internally it will use OGR isSameCRS() or isSameGeoCRS() methods as appropriate.
* Additionally logic may also be applied if the result from the OGR methods
* is inconclusive.
* @deprecated in 1.8 as the same proj.4 string not necessarily means the same CRS
*/
Q_DECL_DEPRECATED bool equals( QString theProj4String );

/*! Restores state from the given Dom node.
* @param theNode The node from which state will be restored
Expand Down Expand Up @@ -298,12 +281,6 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
*/
long postgisSrid() const;

/*! Get the EpsgCrsId identifier for this srs
* @return long theEpsg the EPSG identifier for this srs (defaults to 0)
* @deprecated there are other authorities - use authid()
*/
Q_DECL_DEPRECATED long epsg() const;

/*! Get the authority identifier for this srs
* @return QString the Authority identifier for this srs
* @note added in 1.5
Expand Down
7 changes: 0 additions & 7 deletions src/core/qgsdistancearea.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,6 @@ void QgsDistanceArea::setSourceCrs( long srsid )
mCoordTransform->setSourceCrs( srcCRS );
}

void QgsDistanceArea::setSourceEpsgCrsId( long epsgId )
{
QgsCoordinateReferenceSystem srcCRS;
srcCRS.createFromOgcWmsCrs( QString( "EPSG:%1" ).arg( epsgId ) );
mCoordTransform->setSourceCrs( srcCRS );
}

void QgsDistanceArea::setSourceAuthId( QString authId )
{
QgsCoordinateReferenceSystem srcCRS;
Expand Down
6 changes: 0 additions & 6 deletions src/core/qgsdistancearea.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,13 @@ class CORE_EXPORT QgsDistanceArea

//! sets whether coordinates must be projected to ellipsoid before measuring
void setEllipsoidalMode( bool flag );
Q_DECL_DEPRECATED void setProjectionsEnabled( bool flag ) { setEllipsoidalMode( flag ); };

//! returns projections enabled flag
bool ellipsoidalEnabled() const { return mEllipsoidalMode; }
Q_DECL_DEPRECATED bool hasCrsTransformEnabled() { return mEllipsoidalMode; }

//! sets source spatial reference system (by QGIS CRS)
void setSourceCrs( long srsid );

//! sets source spatial reference system (by EpsgCrsId)
// @deprecated use setSourceAuthid()
Q_DECL_DEPRECATED void setSourceEpsgCrsId( long epsgId );

//! sets source spatial reference system by authid
void setSourceAuthId( QString authid );

Expand Down
1 change: 0 additions & 1 deletion src/core/qgsgeometry.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ class CORE_EXPORT QgsGeometry
@return 0 in case of success, 1 if not a multipolygon, 2 if ring is not a valid geometry, 3 if new polygon ring
not disjoint with existing polygons of the feature*/
int addPart( const QList<QgsPoint> &points );
Q_DECL_DEPRECATED int addIsland( const QList<QgsPoint> &points ) { return addPart( points ); }

/**Translate this geometry by dx, dy
@return 0 in case of success*/
Expand Down
5 changes: 0 additions & 5 deletions src/core/qgslabel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -523,11 +523,6 @@ QgsLabelAttributes *QgsLabel::labelAttributes( void )
{
return mLabelAttributes;
}
// @note this will be deprecated use attributes rather
QgsLabelAttributes *QgsLabel::layerAttributes( void )
{
return mLabelAttributes;
}

void QgsLabel::labelPoint( std::vector<labelpoint>& points, QgsFeature & feature )
{
Expand Down
33 changes: 0 additions & 33 deletions src/core/qgslabel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,34 +90,6 @@ class CORE_EXPORT QgsLabel
double angle;
};

/** \brief render label
* \param painter painter to render label in
* \param viewExtent extent to render labels in
* \param coordinateTransform coordinate transformation to use
* \param transform transformation from coordinate to canvas pixels
* \param feature feature to label
* \param selected feature is selected
* \param classAttributes attributes to create label from
* \param sizeScale scale
* \param rasterScaleFactor raster scale
* \deprecated
*/
Q_DECL_DEPRECATED void renderLabel( QPainter* painter, const QgsRectangle& viewExtent,
QgsCoordinateTransform* coordinateTransform,
const QgsMapToPixel *transform,
QgsFeature &feature, bool selected, QgsLabelAttributes *classAttributes = 0,
double sizeScale = 1.0, double rasterScaleFactor = 1.0 )
{
QgsRenderContext r;
r.setExtent( viewExtent );
r.setCoordinateTransform( new QgsCoordinateTransform( coordinateTransform->sourceCrs(), coordinateTransform->destCRS() ) );
r.setMapToPixel( *transform );
r.setPainter( painter );
r.setScaleFactor( sizeScale );
r.setRasterScaleFactor( rasterScaleFactor );
renderLabel( r, feature, selected, classAttributes );
}

/** \brief render label
* \param renderContext the render context
* \param feature feature to render the label for
Expand All @@ -144,11 +116,6 @@ class CORE_EXPORT QgsLabel
//! Available vector fields
QgsFieldMap & fields();

/** Pointer to default attributes.
* @deprecated in version 2 as it is badly named. Rather use attributes.
* @see labelAttributes method rather */
Q_DECL_DEPRECATED QgsLabelAttributes *layerAttributes();

/** Pointer to default attributes.
* @note this replaces the to-be-deprecated layerAttributes method.
* @note introduced in QGIS 1.4
Expand Down
7 changes: 0 additions & 7 deletions src/core/qgsmaplayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,13 +584,6 @@ const QgsCoordinateReferenceSystem& QgsMapLayer::crs() const
return *mCRS;
}

const QgsCoordinateReferenceSystem& QgsMapLayer::srs()
{
// This will be dropped in QGIS 2.0 due to conflicting name
// Please use crs() in the future
return *mCRS;
}

void QgsMapLayer::setCrs( const QgsCoordinateReferenceSystem& srs, bool emitSignal )
{
*mCRS = srs;
Expand Down
12 changes: 0 additions & 12 deletions src/core/qgsmaplayer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@ class CORE_EXPORT QgsMapLayer : public QObject
*/
QString id() const;

/** Get this layer's unique ID, this ID is used to access this layer from map layer registry
* @deprecated use id()
*/
Q_DECL_DEPRECATED QString getLayerID() const { return id(); }

/** Set the display name of the layer
* @param name New name for the layer
*/
Expand Down Expand Up @@ -230,13 +225,6 @@ class CORE_EXPORT QgsMapLayer : public QObject
*/
const QgsCoordinateReferenceSystem& crs() const;

/** Returns layer's spatial reference system
@note This method is here for API compatibility
and will be deprecated in 2.0
@deprecated use crs()
*/
Q_DECL_DEPRECATED const QgsCoordinateReferenceSystem& srs();

/** Sets layer's spatial reference system
@note emitSignal added in 1.4 */
void setCrs( const QgsCoordinateReferenceSystem& srs, bool emitSignal = true );
Expand Down
20 changes: 0 additions & 20 deletions src/core/qgsmaplayerregistry.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,17 +91,6 @@ QList<QgsMapLayer *> QgsMapLayerRegistry::addMapLayers(
return myResultList;
} // QgsMapLayerRegistry::addMapLayers

//this is deprecated by addMapLayers and is just a thin wrapper for that
QgsMapLayer *
QgsMapLayerRegistry::addMapLayer( QgsMapLayer * theMapLayer,
bool theEmitSignal )
{
QList<QgsMapLayer *> myList;
myList.append( theMapLayer );
addMapLayers( myList, theEmitSignal );
return theMapLayer;
} // QgsMapLayerRegistry::addMapLayer

//introduced in 1.8
void QgsMapLayerRegistry::removeMapLayers( QStringList theLayerIds,
bool theEmitSignal )
Expand All @@ -119,15 +108,6 @@ void QgsMapLayerRegistry::removeMapLayers( QStringList theLayerIds,
emit layersWillBeRemoved( theLayerIds );
}

//deprecated 1.8 use removeMapLayers rather
void QgsMapLayerRegistry::removeMapLayer( QString theLayerId,
bool theEmitSignal )
{
QStringList myList;
myList << theLayerId;
removeMapLayers( myList, theEmitSignal );
}

void QgsMapLayerRegistry::removeAllMapLayers()
{
// moved before physically removing the layers
Expand Down
27 changes: 0 additions & 27 deletions src/core/qgsmaplayerregistry.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,6 @@ class CORE_EXPORT QgsMapLayerRegistry : public QObject
//! Retrieve the mapLayers collection (mainly intended for use by projection)
QMap<QString, QgsMapLayer*> & mapLayers();

/** Add a layer to the map of loaded layers
@returns NULL if unable to add layer, otherwise pointer to newly added layer
@note
As a side-effect QgsProject is made dirty.
Emits signal that layer has been added only if theEmitSignal is true (by default).
Not emitting signal is useful when you want to use registry for layers
on a different canvas and don't want them added to the main canvas automatically.
@note This method is deprecated since QGIS 1.8, you should use addMapLayers rather.
*/
Q_DECL_DEPRECATED QgsMapLayer *addMapLayer( QgsMapLayer * theMapLayer, bool theEmitSignal = true );

/** Add a list of layers to the map of loaded layers
@returns QList<QgsMapLayer *> - a list of the map layers that were added
successfully. If a layer is invalid, or already exists in the registry,
Expand All @@ -80,18 +65,6 @@ class CORE_EXPORT QgsMapLayerRegistry : public QObject
bool theEmitSignal = true );


/** Remove a layer from qgis
@note As a side-effect QgsProject is made dirty. Any canvases using that layer will need to remove it
If theEmitSignal is true (by default), a layerWillBeRemoved( QString theId )
signal will be emitted indicating to any listeners that the layer is being removed.
The layer being removed is deleted as well as the registry
table entry.
@note This method is deprecated since QGIS 1.8, you should use removeMapLayers rather.
*/
Q_DECL_DEPRECATED void removeMapLayer( QString theLayerId, bool theEmitSignal = true );

/** Remove a set of layers from qgis
@note As a side-effect QgsProject is made dirty.
Any canvases using the affected layers will need to remove them
Expand Down
15 changes: 0 additions & 15 deletions src/core/qgsmaprenderer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,6 @@ class CORE_EXPORT QgsMapRenderer : public QObject
//! Recalculate the map scale
void updateScale();

//! Return the measuring object
//! @deprecated
Q_DECL_DEPRECATED QgsDistanceArea *distanceArea() { return mDistArea; }
QGis::UnitType mapUnits() const;
void setMapUnits( QGis::UnitType u );

Expand Down Expand Up @@ -193,18 +190,6 @@ class CORE_EXPORT QgsMapRenderer : public QObject
//! returns true if projections are enabled for this layer set
bool hasCrsTransformEnabled() const;

/** sets destination coordinate reference system
* @note deprecated by qgis 1.7
* @see setDestinationCrs
*/
Q_DECL_DEPRECATED void setDestinationSrs( const QgsCoordinateReferenceSystem& srs ) { setDestinationCrs( srs ); };

/** returns CRS of destination coordinate reference system
* @note deprecated by qgis 1.7
* @see destinationCrs
*/
Q_DECL_DEPRECATED const QgsCoordinateReferenceSystem& destinationSrs() { return destinationCrs(); };

//! sets destination coordinate reference system
void setDestinationCrs( const QgsCoordinateReferenceSystem& crs );

Expand Down
10 changes: 0 additions & 10 deletions src/core/qgsoverlayobject.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,6 @@ QgsOverlayObject& QgsOverlayObject::operator=( const QgsOverlayObject & other )
return *this;
}

GEOSGeometry* QgsOverlayObject::getGeosGeometry()
{
if ( !mGeometry )
{
return 0;
}

return mGeometry->asGeos();
}

void QgsOverlayObject::addPosition( const QgsPoint& position )
{
mPositions.push_back( position );
Expand Down
13 changes: 0 additions & 13 deletions src/core/qgsoverlayobject.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,6 @@ class CORE_EXPORT QgsOverlayObject
QgsOverlayObject( const QgsOverlayObject& other );
QgsOverlayObject& operator=( const QgsOverlayObject& other );


/**Returns the feature geometry in geos format. The calling function does _not_ take
* ownership of the generated object. The geometry is in map coordinates
* @deprecated Please use geometry() and QgsGeometry::asGeos instead
* @note not available in python bindings
*/
Q_DECL_DEPRECATED GEOSGeometry* getGeosGeometry();
/**Feature geometry is released when object is destructed so this function is empty.
* @deprecated nop
* @note not available in python bindings
*/
Q_DECL_DEPRECATED void releaseGeosGeometry( GEOSGeometry *the_geom ) { Q_UNUSED( the_geom ); }

//getters
int width() const {return mWidth;}
int height() const {return mHeight;}
Expand Down
2 changes: 0 additions & 2 deletions src/core/qgsrectangle.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ class CORE_EXPORT QgsRectangle
QgsPoint center() const;
//! Scale the rectangle around its center point
void scale( double scaleFactor, const QgsPoint *c = 0 );
//! Deprecated in 1.9, use scale instead
Q_DECL_DEPRECATED void expand( double scaleFactor, const QgsPoint *c = 0 ) { return scale( scaleFactor * 2.0, c ); }
//! return the intersection with the given rectangle
QgsRectangle intersect( const QgsRectangle *rect ) const;
//! returns true when rectangle intersects with other rectangle
Expand Down
42 changes: 0 additions & 42 deletions src/core/qgsvectordataprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ QString QgsVectorDataProvider::storageType() const
return "Generic vector file";
}

long QgsVectorDataProvider::updateFeatureCount()
{
return -1;
}

bool QgsVectorDataProvider::featureAtId( QgsFeatureId featureId,
QgsFeature& feature,
bool fetchGeometry,
Expand Down Expand Up @@ -88,26 +83,6 @@ bool QgsVectorDataProvider::addAttributes( const QList<QgsField> &attributes )
return false;
}

bool QgsVectorDataProvider::addAttributes( const QMap<QString, QString> &attributes )
{
const QList< NativeType > &types = nativeTypes();
QList< QgsField > list;

for ( QMap<QString, QString>::const_iterator it = attributes.constBegin(); it != attributes.constEnd(); it++ )
{
int i;
for ( i = 0; i < types.size() && types[i].mTypeName != it.value(); i++ )
;

if ( i == types.size() )
return false;

list << QgsField( it.key(), types[i].mType, it.value() );
}

return addAttributes( list );
}

bool QgsVectorDataProvider::deleteAttributes( const QgsAttributeIds &attributes )
{
Q_UNUSED( attributes );
Expand Down Expand Up @@ -287,23 +262,6 @@ const QList< QgsVectorDataProvider::NativeType > &QgsVectorDataProvider::nativeT
return mNativeTypes;
}

const QMap<QString, QVariant::Type> &QgsVectorDataProvider::supportedNativeTypes() const
{
if ( mOldTypeList.size() > 0 )
return mOldTypeList;

QgsVectorDataProvider *p = ( QgsVectorDataProvider * )this;

const QList< QgsVectorDataProvider::NativeType > &types = nativeTypes();

for ( QList< QgsVectorDataProvider::NativeType >::const_iterator it = types.constBegin(); it != types.constEnd(); it++ )
{
p->mOldTypeList.insert( it->mTypeName, it->mType );
}

return p->mOldTypeList;
}

bool QgsVectorDataProvider::supportedType( const QgsField &field ) const
{
int i;
Expand Down
20 changes: 0 additions & 20 deletions src/core/qgsvectordataprovider.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,6 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
bool fetchGeometry = true,
bool useIntersect = false ) = 0;

/**
* This function does nothing useful, it's kept only for compatibility.
* @todo to be removed
*/
Q_DECL_DEPRECATED virtual long updateFeatureCount();

/**
* Gets the feature at the given feature ID.
* @param featureId id of the feature
Expand Down Expand Up @@ -234,14 +228,6 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
*/
virtual bool addAttributes( const QList<QgsField> &attributes );

/**
* Add new attributes
* @param attributes map of attributes name as key and type as value
* @return true in case of success and false in case of failure
* @deprecated
*/
Q_DECL_DEPRECATED virtual bool addAttributes( const QMap<QString, QString> &attributes );

/**
* Deletes existing attributes
* @param attributes a set containing indices of attributes
Expand Down Expand Up @@ -344,12 +330,6 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
*/
const QList< NativeType > &nativeTypes() const;

/**
* Returns the names of the supported types
* @deprecated use nativeTypes()
*/
Q_DECL_DEPRECATED const QMap<QString, QVariant::Type> &supportedNativeTypes() const;

/** Returns true if the provider is strict about the type of inserted features
(e.g. no multipolygon in a polygon layer)
@note: added in version 1.4*/
Expand Down
16 changes: 0 additions & 16 deletions src/core/qgsvectorfilewriter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,22 +594,6 @@ QgsVectorFileWriter::~QgsVectorFileWriter()
}
}




QgsVectorFileWriter::WriterError
QgsVectorFileWriter::writeAsShapefile( QgsVectorLayer* layer,
const QString& shapefileName,
const QString& fileEncoding,
const QgsCoordinateReferenceSystem* destCRS,
bool onlySelected,
QString *errorMessage,
const QStringList &datasourceOptions,
const QStringList &layerOptions )
{
return writeAsVectorFormat( layer, shapefileName, fileEncoding, destCRS, "ESRI Shapefile", onlySelected, errorMessage, datasourceOptions, layerOptions );
}

QgsVectorFileWriter::WriterError
QgsVectorFileWriter::writeAsVectorFormat( QgsVectorLayer* layer,
const QString& fileName,
Expand Down
12 changes: 0 additions & 12 deletions src/core/qgsvectorfilewriter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,6 @@ class CORE_EXPORT QgsVectorFileWriter
ErrInvalidLayer, // added in 2.0
};

/** Write contents of vector layer to a shapefile
@deprecated Use writeAsVectorFormat instead*/
Q_DECL_DEPRECATED static WriterError writeAsShapefile( QgsVectorLayer* layer,
const QString& shapefileName,
const QString& fileEncoding,
const QgsCoordinateReferenceSystem *destCRS,
bool onlySelected = false,
QString *errorMessage = 0,
const QStringList &datasourceOptions = QStringList(), // added in 1.6
const QStringList &layerOptions = QStringList() // added in 1.6
);

/** Write contents of vector layer to an (OGR supported) vector formt
@note: this method was added in version 1.5
@param layer layer to write
Expand Down
16 changes: 0 additions & 16 deletions src/core/qgsvectorlayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1540,11 +1540,6 @@ bool QgsVectorLayer::countSymbolFeatures( bool showProgress )
return true;
}

long QgsVectorLayer::updateFeatureCount() const
{
return -1;
}

void QgsVectorLayer::updateExtents()
{
mValidExtent = false;
Expand Down Expand Up @@ -3798,17 +3793,6 @@ bool QgsVectorLayer::addAttribute( const QgsField &field )
return true;
}

bool QgsVectorLayer::addAttribute( QString name, QString type )
{
const QList< QgsVectorDataProvider::NativeType > &types = mDataProvider->nativeTypes();

int i;
for ( i = 0; i < types.size() && types[i].mTypeName != type; i++ )
;

return i < types.size() && addAttribute( QgsField( name, types[i].mType, type ) );
}

void QgsVectorLayer::addAttributeAlias( int attIndex, QString aliasString )
{
if ( !pendingFields().contains( attIndex ) )
Expand Down
11 changes: 0 additions & 11 deletions src/core/qgsvectorlayer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,11 +433,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
*/
bool countSymbolFeatures( bool showProgress = true );

/** This function does nothing useful, it's kept only for compatibility.
* @todo to be removed
*/
Q_DECL_DEPRECATED virtual long updateFeatureCount() const;

/**
* Set the string (typically sql) used to define a subset of the layer
* @param subset The subset string. This may be the where clause of a sql statement
Expand Down Expand Up @@ -531,7 +526,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
5 if several features are selected,
6 if selected geometry not found*/
int addPart( const QList<QgsPoint>& ring );
Q_DECL_DEPRECATED int addIsland( const QList<QgsPoint>& ring ) { return addPart( ring ); }

/**Translates feature by dx, dy
@param featureId id of the feature to translate
Expand Down Expand Up @@ -665,11 +659,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
@note added in version 1.2 */
bool addAttribute( const QgsField &field );

/** add an attribute field (but does not commit it)
returns true if the field was added
@deprecated */
Q_DECL_DEPRECATED bool addAttribute( QString name, QString type );

/**Sets an alias (a display name) for attributes to display in dialogs
@note added in version 1.2*/
void addAttributeAlias( int attIndex, QString aliasString );
Expand Down
144 changes: 0 additions & 144 deletions src/core/raster/qgsrasterlayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1127,34 +1127,6 @@ QList< QPair< QString, QColor > > QgsRasterLayer::legendSymbologyItems() const
#endif //0
}

/**
* This is an overloaded version of the legendAsPixmap( bool ) assumes false for the legend name flag.
* @return a pixmap representing a legend image
*/
QPixmap QgsRasterLayer::legendAsPixmap()
{
return QPixmap();
}

/**
* @param theWithNameFlag - boolean flag whether to overlay the legend name in the text
* @return a pixmap representing a legend image
*/
QPixmap QgsRasterLayer::legendAsPixmap( bool theWithNameFlag )
{
Q_UNUSED( theWithNameFlag );
return QPixmap();
} //end of legendAsPixmap function

/**
* \param theLabelCount number of vertical labels to display
* @return a pixmap representing a legend image
*/
QPixmap QgsRasterLayer::legendAsPixmap( int )
{
return QPixmap();
}//end of getDetailedLegend

/**
* @param theBand the band number for which to get the maximum pixel value
* @return the maximum pixel value
Expand Down Expand Up @@ -1544,11 +1516,6 @@ void QgsRasterLayer::resetNoDataValue()
}
#endif

void QgsRasterLayer::setBlueBandName( QString const & theBandName )
{
mBlueBandName = validateBandName( theBandName );
}

void QgsRasterLayer::init()
{
// keep this until mGeoTransform occurences are removed!
Expand Down Expand Up @@ -1795,16 +1762,6 @@ void QgsRasterLayer::closeDataProvider()
mContrastEnhancementList.clear();
}

void QgsRasterLayer::setColorShadingAlgorithm( ColorShadingAlgorithm )
{
//legacy method
}

void QgsRasterLayer::setColorShadingAlgorithm( QString )
{
//legacy method
}

void QgsRasterLayer::setContrastEnhancementAlgorithm( QgsContrastEnhancement::ContrastEnhancementAlgorithm theAlgorithm, bool theGenerateLookupTableFlag )
{
setContrastEnhancementAlgorithm( theAlgorithm, ContrastEnhancementMinMax, QgsRectangle(), SAMPLE_SIZE, theGenerateLookupTableFlag );
Expand Down Expand Up @@ -2080,16 +2037,6 @@ void QgsRasterLayer::setDrawingStyle( QString const & theDrawingStyleQString )
}
}

void QgsRasterLayer::setGrayBandName( QString const & )
{
//legacy method
}

void QgsRasterLayer::setGreenBandName( QString const & )
{
//legacy method
}

void QgsRasterLayer::setLayerOrder( QStringList const & layers )
{
QgsDebugMsg( "entered." );
Expand All @@ -2111,14 +2058,6 @@ void QgsRasterLayer::setMaximumValue( unsigned int theBand, double theValue, boo
}
}

void QgsRasterLayer::setMaximumValue( QString theBand, double theValue, bool theGenerateLookupTableFlag )
{
if ( theBand != tr( "Not Set" ) )
{
setMaximumValue( bandNumber( theBand ), theValue, theGenerateLookupTableFlag );
}
}

void QgsRasterLayer::setMinimumMaximumUsingLastExtent()
{
//legacy method
Expand All @@ -2129,16 +2068,6 @@ void QgsRasterLayer::setMinimumMaximumUsingDataset()
//legacy method
}

void QgsRasterLayer::setMinimumValue( unsigned int, double, bool )
{
//legacy method
}

void QgsRasterLayer::setMinimumValue( QString, double, bool )
{
//legacy method
}

#if 0
void QgsRasterLayer::setNoDataValue( double theNoDataValue )
{
Expand All @@ -2160,16 +2089,6 @@ void QgsRasterLayer::setNoDataValue( double theNoDataValue )
}
#endif

void QgsRasterLayer::setRasterShaderFunction( QgsRasterShaderFunction* )
{
//legacy method
}

void QgsRasterLayer::setRedBandName( QString const & )
{
//legacy method
}

void QgsRasterLayer::setSubLayerVisibility( QString name, bool vis )
{

Expand All @@ -2181,11 +2100,6 @@ void QgsRasterLayer::setSubLayerVisibility( QString name, bool vis )

}

void QgsRasterLayer::setTransparentBandName( QString const & )
{
//legacy method
}

void QgsRasterLayer::setRenderer( QgsRasterRenderer* theRenderer )
{
QgsDebugMsg( "Entered" );
Expand Down Expand Up @@ -2229,59 +2143,6 @@ QStringList QgsRasterLayer::subLayers() const
}


void QgsRasterLayer::thumbnailAsPixmap( QPixmap * theQPixmap )
{
//deprecated, use previewAsPixmap() instead
if ( !theQPixmap )
return;

theQPixmap->fill( ); //defaults to white

QgsRasterViewPort *myRasterViewPort = new QgsRasterViewPort();

double myMapUnitsPerPixel;
double myX = 0.0;
double myY = 0.0;
QgsRectangle myExtent = mDataProvider->extent();
if ( myExtent.width() / myExtent.height() >= theQPixmap->width() / theQPixmap->height() )
{
myMapUnitsPerPixel = myExtent.width() / theQPixmap->width();
myY = ( theQPixmap->height() - myExtent.height() / myMapUnitsPerPixel ) / 2;
}
else
{
myMapUnitsPerPixel = myExtent.height() / theQPixmap->height();
myX = ( theQPixmap->width() - myExtent.width() / myMapUnitsPerPixel ) / 2;
}

double myPixelWidth = myExtent.width() / myMapUnitsPerPixel;
double myPixelHeight = myExtent.height() / myMapUnitsPerPixel;

//myRasterViewPort->topLeftPoint = QgsPoint( 0, 0 );
myRasterViewPort->topLeftPoint = QgsPoint( myX, myY );

//myRasterViewPort->bottomRightPoint = QgsPoint( theQPixmap->width(), theQPixmap->height() );

myRasterViewPort->bottomRightPoint = QgsPoint( myPixelWidth, myPixelHeight );
myRasterViewPort->drawableAreaXDim = theQPixmap->width();
myRasterViewPort->drawableAreaYDim = theQPixmap->height();
//myRasterViewPort->drawableAreaXDim = myPixelWidth;
//myRasterViewPort->drawableAreaYDim = myPixelHeight;

myRasterViewPort->mDrawnExtent = myExtent;
myRasterViewPort->mSrcCRS = QgsCoordinateReferenceSystem(); // will be invalid
myRasterViewPort->mDestCRS = QgsCoordinateReferenceSystem(); // will be invalid

QgsMapToPixel *myMapToPixel = new QgsMapToPixel( myMapUnitsPerPixel );

QPainter * myQPainter = new QPainter( theQPixmap );
draw( myQPainter, myRasterViewPort, myMapToPixel );
delete myRasterViewPort;
delete myMapToPixel;
myQPainter->end();
delete myQPainter;
}

QPixmap QgsRasterLayer::previewAsPixmap( QSize size, QColor bgColor )
{
QPixmap myQPixmap( size );
Expand Down Expand Up @@ -2843,11 +2704,6 @@ bool QgsRasterLayer::update()
return mValid;
}

bool QgsRasterLayer::usesProvider()
{
return !mProviderKey.isEmpty();
}

QString QgsRasterLayer::validateBandName( QString const & theBandName )
{
QgsDebugMsg( "Checking..." );
Expand Down
56 changes: 0 additions & 56 deletions src/core/raster/qgsrasterlayer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,11 +368,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
/** \brief Accessor to find out how many standard deviations are being plotted */
double standardDeviations() const { return mStandardDeviations; }

/** \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data?
* @deprecated in 2.0
*/
Q_DECL_DEPRECATED bool usesProvider();

/** \brief Accessor that returns the width of the (unclipped) raster */
int width() { return mWidth; }

Expand Down Expand Up @@ -498,18 +493,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
@note this method was added in version 1.8*/
QList< QPair< QString, QColor > > legendSymbologyItems() const;

/** \brief Get a legend image for this layer */
Q_DECL_DEPRECATED QPixmap legendAsPixmap();

/** \brief Overloaded version of above function that can print layer name onto legend */
//! @deprecated
//! @note available as legendAsPixmapBool in python bindings
Q_DECL_DEPRECATED QPixmap legendAsPixmap( bool );

/** \brief Use this method when you want an annotated legend suitable for print output etc */
//! @note available as legendAsPixmapCount in python bindings
Q_DECL_DEPRECATED QPixmap legendAsPixmap( int theLabelCount );

/** \brief Accessor for maximum value user for contrast enhancement */
double maximumValue( unsigned int theBand );

Expand All @@ -533,11 +516,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
*/
QString providerType() const;

/** \brief [ data provider interface ] Which provider is being used for this Raster Layer?
* @deprecated use providerType()
*/
Q_DECL_DEPRECATED QString providerKey() const { return providerType(); }

/** \brief Returns the number of raster units per each raster pixel. In a world file, this is normally the first row (without the sign) */
double rasterUnitsPerPixel();

Expand All @@ -552,12 +530,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
/** \brief Mutator for blue band name mapping */
void setBlueBandName( const QString & theBandName );

/** \brief Mutator for color shader algorithm */
void setColorShadingAlgorithm( QgsRasterLayer::ColorShadingAlgorithm theShaderAlgorithm );

/** \brief Mutator for color shader algorithm */
Q_DECL_DEPRECATED void setColorShadingAlgorithm( QString theShaderAlgorithm );

static QString contrastEnhancementLimitsAsString( QgsRasterLayer::ContrastEnhancementLimits theLimits );
static ContrastEnhancementLimits contrastEnhancementLimitsFromString( QString theLimits );

Expand Down Expand Up @@ -593,18 +565,9 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
/** \brief Overloaded version of the above function for convenience when restoring from xml */
void setDrawingStyle( const QString & theDrawingStyleQString );

/** \brief Mutator for gray band name mapping */
Q_DECL_DEPRECATED void setGrayBandName( const QString & theBandName );

/** \brief Mutator for green band name mapping */
Q_DECL_DEPRECATED void setGreenBandName( const QString & theBandName );

/** \brief Mutator for setting the maximum value for contrast enhancement */
void setMaximumValue( unsigned int theBand, double theValue, bool theGenerateLookupTableFlag = true );

/** \brief Mutator for setting the maximum value for contrast enhancement */
Q_DECL_DEPRECATED void setMaximumValue( QString theBand, double theValue, bool theGenerateLookupTableFlag = true );

/** \brief Sets the minimum and maximum values for the band(s) currently
* being displayed using the only pixel values from the last/current extent
* */
Expand All @@ -614,31 +577,12 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
* being displayed using the only pixel values from the dataset min/max */
void setMinimumMaximumUsingDataset();

/** \brief Mutator for setting the minimum value for contrast enhancement */
Q_DECL_DEPRECATED void setMinimumValue( unsigned int theBand, double theValue, bool theGenerateLookupTableFlag = true );

/** \brief Mutator for setting the minimum value for contrast enhancement */
Q_DECL_DEPRECATED void setMinimumValue( QString theBand, double theValue, bool theGenerateLookupTableFlag = true );

/** \brief Set the raster shader function to a user defined function
\note ownership of the shader function is transfered to raster shader */
Q_DECL_DEPRECATED void setRasterShaderFunction( QgsRasterShaderFunction* theFunction );

/** \brief Mutator for red band name (allows alternate mappings e.g. map blue as red color) */
Q_DECL_DEPRECATED void setRedBandName( const QString & theBandName );

/** \brief Mutator for transparent band name mapping */
Q_DECL_DEPRECATED void setTransparentBandName( const QString & theBandName );

/** \brief [ data provider interface ] A wrapper function to emit a progress update signal */
void showProgress( int theValue );

/** \brief Returns the sublayers of this layer - Useful for providers that manage their own layers, such as WMS */
virtual QStringList subLayers() const;

/** \brief Draws a thumbnail of the rasterlayer into the supplied pixmap pointer */
Q_DECL_DEPRECATED void thumbnailAsPixmap( QPixmap * theQPixmap );

/** \brief Draws a preview of the rasterlayer into a pixmap */
QPixmap previewAsPixmap( QSize size, QColor bgColor = Qt::white );

Expand Down
105 changes: 0 additions & 105 deletions src/gui/qgisinterface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,14 +240,6 @@ class GUI_EXPORT QgisInterface : public QObject
*/
virtual void removeDockWidget( QDockWidget * dockwidget ) = 0;

/** refresh the legend of a layer
\deprecated use QgsLegendInterface::refreshLayerSymbology
*/
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual void refreshLegend( QgsMapLayer *l ) = 0;

/** open layer properties dialog
\note added in 1.5
*/
Expand Down Expand Up @@ -341,79 +333,27 @@ class GUI_EXPORT QgisInterface : public QObject
//! File menu actions
virtual QAction *actionNewProject() = 0;
virtual QAction *actionOpenProject() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionFileSeparator1() = 0;
virtual QAction *actionSaveProject() = 0;
virtual QAction *actionSaveProjectAs() = 0;
virtual QAction *actionSaveMapAsImage() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionFileSeparator2() = 0;
virtual QAction *actionProjectProperties() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionFileSeparator3() = 0;
virtual QAction *actionPrintComposer() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionFileSeparator4() = 0;
virtual QAction *actionExit() = 0;

//! Edit menu actions
virtual QAction *actionCutFeatures() = 0;
virtual QAction *actionCopyFeatures() = 0;
virtual QAction *actionPasteFeatures() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionEditSeparator1() = 0;
virtual QAction *actionAddFeature() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionCapturePoint() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionCaptureLine() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionCapturePolygon() = 0;
virtual QAction *actionDeleteSelected() = 0;
virtual QAction *actionMoveFeature() = 0;
virtual QAction *actionSplitFeatures() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionAddVertex() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionDeleteVertex() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionMoveVertex() = 0;
virtual QAction *actionAddRing() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionAddIsland() = 0;
virtual QAction *actionAddPart() = 0;
virtual QAction *actionSimplifyFeature() = 0;
virtual QAction *actionDeleteRing() = 0;
virtual QAction *actionDeletePart() = 0;
virtual QAction *actionNodeTool() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionEditSeparator2() = 0;

//! View menu actions
virtual QAction *actionPan() = 0;
Expand All @@ -429,38 +369,22 @@ class GUI_EXPORT QgisInterface : public QObject
virtual QAction *actionIdentify() = 0;
virtual QAction *actionMeasure() = 0;
virtual QAction *actionMeasureArea() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionViewSeparator1() = 0;
virtual QAction *actionZoomFullExtent() = 0;
virtual QAction *actionZoomToLayer() = 0;
virtual QAction *actionZoomToSelected() = 0;
virtual QAction *actionZoomLast() = 0;
virtual QAction *actionZoomActualSize() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionViewSeparator2() = 0;
virtual QAction *actionMapTips() = 0;
virtual QAction *actionNewBookmark() = 0;
virtual QAction *actionShowBookmarks() = 0;
virtual QAction *actionDraw() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionViewSeparator3() = 0;

//! Layer menu actions
virtual QAction *actionNewVectorLayer() = 0;
virtual QAction *actionAddOgrLayer() = 0;
virtual QAction *actionAddRasterLayer() = 0;
virtual QAction *actionAddPgLayer() = 0;
virtual QAction *actionAddWmsLayer() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionLayerSeparator1() = 0;
/** @note added in 1.9 */
virtual QAction *actionCopyLayerStyle() = 0;
/** @note added in 1.9 */
Expand All @@ -477,55 +401,26 @@ class GUI_EXPORT QgisInterface : public QObject
/** @note added in 1.9 */
virtual QAction *actionDuplicateLayer() = 0;
virtual QAction *actionLayerProperties() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionLayerSeparator2() = 0;
virtual QAction *actionAddToOverview() = 0;
virtual QAction *actionAddAllToOverview() = 0;
virtual QAction *actionRemoveAllFromOverview() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionLayerSeparator3() = 0;
virtual QAction *actionHideAllLayers() = 0;
virtual QAction *actionShowAllLayers() = 0;

//! Plugin menu actions
virtual QAction *actionManagePlugins() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionPluginSeparator1() = 0;
virtual QAction *actionPluginListSeparator() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionPluginSeparator2() = 0;
virtual QAction *actionPluginPythonSeparator() = 0;
virtual QAction *actionShowPythonDialog() = 0;

//! Settings menu actions
virtual QAction *actionToggleFullScreen() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionSettingsSeparator1() = 0;
virtual QAction *actionOptions() = 0;
virtual QAction *actionCustomProjection() = 0;

//! Help menu actions
virtual QAction *actionHelpContents() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionHelpSeparator1() = 0;
virtual QAction *actionQgisHomePage() = 0;
virtual QAction *actionCheckQgisVersion() = 0;
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
virtual QAction *actionHelpSeparator2() = 0;
virtual QAction *actionAbout() = 0;

//! Open feature form
Expand Down
20 changes: 0 additions & 20 deletions src/gui/qgsgenericprojectionselector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,6 @@ QgsGenericProjectionSelector::~QgsGenericProjectionSelector()
settings.setValue( "/Windows/ProjectionSelector/geometry", saveGeometry() );
}

void QgsGenericProjectionSelector::setSelectedEpsg( long theId )
{
projectionSelector->setSelectedAuthId( QString( "EPSG:%1" ).arg( theId ) );
}

void QgsGenericProjectionSelector::setSelectedCrsName( QString theName )
{
projectionSelector->setSelectedCrsName( theName );
Expand All @@ -85,27 +80,12 @@ void QgsGenericProjectionSelector::setSelectedAuthId( QString theID )
projectionSelector->setSelectedAuthId( theID );
}

QString QgsGenericProjectionSelector::selectedProj4String()
{
//@note don't use getSelectedWkt as that just returns the name part!
return projectionSelector->selectedProj4String();
}

long QgsGenericProjectionSelector::selectedCrsId()
{
//@note don't use getSelectedWkt as that just returns the name part!
return projectionSelector->selectedCrsId();
}

long QgsGenericProjectionSelector::selectedEpsg()
{
QString authid = projectionSelector->selectedAuthId();
if ( authid.startsWith( "EPSG:", Qt::CaseInsensitive ) )
return authid.mid( 5 ).toLong();
else
return 0;
}

QString QgsGenericProjectionSelector::selectedAuthId()
{
return projectionSelector->selectedAuthId();
Expand Down
5 changes: 0 additions & 5 deletions src/gui/qgsgenericprojectionselector.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,10 @@ class GUI_EXPORT QgsGenericProjectionSelector : public QDialog, private Ui::QgsG
long selectedCrsId();
QString selectedAuthId();

Q_DECL_DEPRECATED QString selectedProj4String();
Q_DECL_DEPRECATED long selectedEpsg();

void setSelectedCrsName( QString theName );
void setSelectedCrsId( long theID );
void setSelectedAuthId( QString authId );

Q_DECL_DEPRECATED void setSelectedEpsg( long theID );

/**
* \brief filters this dialog by the given CRSs
*
Expand Down
25 changes: 0 additions & 25 deletions src/gui/qgsmapcanvas.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1294,31 +1294,6 @@ bool QgsMapCanvas::isFrozen()
} // freeze


QPixmap& QgsMapCanvas::canvasPixmap()
{
QPixmap *pixmap = dynamic_cast<QPixmap *>( &canvasPaintDevice() );
if ( pixmap )
{
return *pixmap;
}

qWarning( "QgsMapCanvas::canvasPixmap() deprecated - returning static pixmap instance - use QgsMapCanvas::paintDevice()" );

static QPixmap staticPixmap;

QImage *image = dynamic_cast<QImage *>( &mMap->paintDevice() );
if ( image )
{
staticPixmap = QPixmap::fromImage( *image );
}
else
{
staticPixmap = QPixmap( canvasPaintDevice().width(), canvasPaintDevice().height() );
}

return staticPixmap;
} // canvasPixmap

QPaintDevice &QgsMapCanvas::canvasPaintDevice()
{
return mMap->paintDevice();
Expand Down
4 changes: 0 additions & 4 deletions src/gui/qgsmapcanvas.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,6 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView

QgsMapRenderer* mapRenderer();

//! Accessor for the canvas pixmap
//! @deprecated use canvasPaintDevice()
Q_DECL_DEPRECATED QPixmap& canvasPixmap();

//! Accessor for the canvas paint device
QPaintDevice &canvasPaintDevice();

Expand Down
3 changes: 0 additions & 3 deletions src/gui/qgsmapcanvasmap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ class GUI_EXPORT QgsMapCanvasMap : public QGraphicsRectItem

void setPanningOffset( const QPoint& point );

//! @deprecated Please use paintDevice() function which is also save in case QImage is used
Q_DECL_DEPRECATED QPixmap& pixmap() { return mPixmap; }

QPaintDevice& paintDevice();

void paint( QPainter* p, const QStyleOptionGraphicsItem*, QWidget* );
Expand Down
17 changes: 0 additions & 17 deletions src/gui/qgsprojectionselector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,6 @@ void QgsProjectionSelector::setSelectedCrsId( long theCRSID )
applySelection( QGIS_CRS_ID_COLUMN, QString::number( theCRSID ) );
}

void QgsProjectionSelector::setSelectedEpsg( long id )
{
setSelectedAuthId( QString( "EPSG:%1" ).arg( id ) );
}

void QgsProjectionSelector::setSelectedAuthId( QString id )
{
applySelection( AUTHID_COLUMN, id );
Expand Down Expand Up @@ -438,18 +433,6 @@ QString QgsProjectionSelector::getSelectedExpression( QString expression )
return attributeValue;
}

long QgsProjectionSelector::selectedEpsg()
{
if ( getSelectedExpression( "auth_name" ).compare( "EPSG", Qt::CaseInsensitive ) == 0 )
{
return getSelectedExpression( "auth_id" ).toLong();
}
else
{
QgsDebugMsg( "selected projection is NOT EPSG" );
return 0;
}
}

long QgsProjectionSelector::selectedPostgresSrId()
{
Expand Down
8 changes: 0 additions & 8 deletions src/gui/qgsprojectionselector.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ class GUI_EXPORT QgsProjectionSelector : public QWidget, private Ui::QgsProjecti
*/
const QString sqlSafeString( const QString theSQL );

//! Gets the current EpsgCrsId-style projection identifier
// @deprecated there are other authorities - use selectedAuthId()
Q_DECL_DEPRECATED long selectedEpsg();

//! Gets the current authority-style projection identifier
QString selectedAuthId();

Expand All @@ -82,10 +78,6 @@ class GUI_EXPORT QgsProjectionSelector : public QWidget, private Ui::QgsProjecti

void setSelectedAuthId( QString authId );

//! Get the selected coordinate system
// @deprecated there are other authorities - so not always defined
Q_DECL_DEPRECATED void setSelectedEpsg( long epsg );

QString selectedProj4String();

//! Gets the current PostGIS-style projection identifier
Expand Down