missed two files in r15435

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15436 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 11, 2011 · 16261f2 · 16261f2
1 parent 21c6367
commit 16261f2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -189,18 +189,4 @@ const double DEFAULT_LINE_WIDTH = 0.26;
 #endif
 #endif
 
-#ifndef QGISDEPRECATED
-#ifndef Q_MOC_RUN
-#ifdef _MSC_VER
-#  define QGISDEPRECATED __declspec(deprecated)
-#elif __GNUC__
-#  define QGISDEPRECATED __attribute__((__deprecated__))
-#else
-#  define QGISDEPRECATED
-#endif
-#else
-#define QGISDEPRECATED
-#endif
-#endif
-
 #endif
diff --git a/src/gui/qgsmapcanvasmap.h b/src/gui/qgsmapcanvasmap.h
@@ -50,7 +50,7 @@ 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
-    QGISDEPRECATED QPixmap& pixmap() { return mPixmap; }
+    Q_DECL_DEPRECATED QPixmap& pixmap() { return mPixmap; }
 
     QPaintDevice& paintDevice();