Skip to content
Permalink
Browse files

Revert "create a core interface for QgsMapCanvas"

This reverts commit 79c5b35.
  • Loading branch information
3nids committed Nov 6, 2018
1 parent 078b445 commit 20d8db9e28bffde8ea7b45030375035060f0b58a

This file was deleted.

@@ -67,7 +67,6 @@
%Include auto_generated/qgslegendsettings.sip
%Include auto_generated/qgslegendstyle.sip
%Include auto_generated/qgslogger.sip
%Include auto_generated/qgsmapcanvasinterface.sip
%Include auto_generated/qgsmapdecoration.sip
%Include auto_generated/qgsmaphittest.sip
%Include auto_generated/qgsmaplayerdependency.sip
@@ -18,7 +18,7 @@



class QgsMapCanvas : QGraphicsView, QgsMapCanvasInterface
class QgsMapCanvas : QGraphicsView
{
%Docstring
Map canvas is a class for displaying all GIS data types on a canvas.
@@ -65,8 +65,7 @@ empty string before setLayers() calls can be made.

void setCurrentLayer( QgsMapLayer *layer );

virtual const QgsMapSettings &mapSettings() const ${SIP_FINAL} /KeepReference/;

const QgsMapSettings &mapSettings() const /KeepReference/;
%Docstring
Gets access to properties used for map rendering

@@ -890,7 +890,6 @@ SET(QGIS_CORE_HDRS
qgslegendsettings.h
qgslegendstyle.h
qgslogger.h
qgsmapcanvasinterface.h
qgsmapdecoration.h
qgsmaplayerref.h
qgsmaphittest.h

This file was deleted.

@@ -26,7 +26,6 @@
#include "qgsfeatureid.h"
#include "qgsgeometry.h"
#include "qgis.h"
#include "qgsmapcanvasinterface.h"

#include <QDomDocument>
#include <QGraphicsView>
@@ -72,7 +71,7 @@ class QgsMapCanvasAnnotationItem;
* Map canvas is a class for displaying all GIS data types on a canvas.
*/

class GUI_EXPORT QgsMapCanvas : public QGraphicsView, public QgsMapCanvasInterface
class GUI_EXPORT QgsMapCanvas : public QGraphicsView
{

#ifdef SIP_RUN
@@ -120,7 +119,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView, public QgsMapCanvasInterfa
* Gets access to properties used for map rendering
* \since QGIS 2.4
*/
const QgsMapSettings &mapSettings() const FINAL SIP_KEEPREFERENCE;
const QgsMapSettings &mapSettings() const SIP_KEEPREFERENCE;

/**
* sets destination coordinate reference system

0 comments on commit 20d8db9

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