Skip to content

Commit

Permalink
Revert "create a core interface for QgsMapCanvas"
Browse files Browse the repository at this point in the history
This reverts commit 79c5b35.
  • Loading branch information
3nids committed Nov 6, 2018
1 parent 078b445 commit 20d8db9
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 75 deletions.
42 changes: 0 additions & 42 deletions python/core/auto_generated/qgsmapcanvasinterface.sip.in

This file was deleted.

1 change: 0 additions & 1 deletion python/core/core_auto.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions python/gui/auto_generated/qgsmapcanvas.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion src/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,6 @@ SET(QGIS_CORE_HDRS
qgslegendsettings.h
qgslegendstyle.h
qgslogger.h
qgsmapcanvasinterface.h
qgsmapdecoration.h
qgsmaplayerref.h
qgsmaphittest.h
Expand Down
25 changes: 0 additions & 25 deletions src/core/qgsmapcanvasinterface.h

This file was deleted.

5 changes: 2 additions & 3 deletions src/gui/qgsmapcanvas.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include "qgsfeatureid.h"
#include "qgsgeometry.h"
#include "qgis.h"
#include "qgsmapcanvasinterface.h"

#include <QDomDocument>
#include <QGraphicsView>
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 20d8db9

Please sign in to comment.