From e7127f8766f9ee5c5e5b7fedf884d0e2fbf36f49 Mon Sep 17 00:00:00 2001 From: wonder Date: Sat, 3 Mar 2007 11:13:57 +0000 Subject: [PATCH] QgsMapCanvasItem is not to be derived from QObject - no need for that. git-svn-id: http://svn.osgeo.org/qgis/trunk@6750 c8812cc2-4d05-0410-92ff-de0c093fc19c --- python/gui/qgsmapcanvasitem.sip | 2 +- src/gui/CMakeLists.txt | 1 - src/gui/qgsmapcanvasitem.h | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/python/gui/qgsmapcanvasitem.sip b/python/gui/qgsmapcanvasitem.sip index b6979030175..4fc5be5433e 100644 --- a/python/gui/qgsmapcanvasitem.sip +++ b/python/gui/qgsmapcanvasitem.sip @@ -1,5 +1,5 @@ -class QgsMapCanvasItem : QObject, QGraphicsItem +class QgsMapCanvasItem : QGraphicsItem { %TypeHeaderCode #include diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index dcf7ef5ee24..0a40365e19a 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -25,7 +25,6 @@ qgisinterface.h qgsencodingfiledialog.h qgslayerprojectionselector.h qgsmapcanvas.h -qgsmapcanvasitem.h qgsmapoverviewcanvas.h qgsprojectionselector.h ) diff --git a/src/gui/qgsmapcanvasitem.h b/src/gui/qgsmapcanvasitem.h index a6bb7663e4e..a4f58d76dc4 100644 --- a/src/gui/qgsmapcanvasitem.h +++ b/src/gui/qgsmapcanvasitem.h @@ -23,10 +23,8 @@ class QgsMapCanvas; class QPainter; -class GUI_EXPORT QgsMapCanvasItem : public QObject, public QGraphicsItem +class GUI_EXPORT QgsMapCanvasItem : public QGraphicsItem { - Q_OBJECT; - protected: //! protected constructor: cannot be constructed directly