[QGIS Commit] r15436 - in trunk/qgis/src: core gui

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-03-11 11:00:48 -0800 (Fri, 11 Mar 2011)
New Revision: 15436

Modified:
   trunk/qgis/src/core/qgis.h
   trunk/qgis/src/gui/qgsmapcanvasmap.h
Log:
missed two files in r15435

Modified: trunk/qgis/src/core/qgis.h
===================================================================
--- trunk/qgis/src/core/qgis.h	2011-03-11 18:59:25 UTC (rev 15435)
+++ trunk/qgis/src/core/qgis.h	2011-03-11 19:00:48 UTC (rev 15436)
@@ -189,18 +189,4 @@
 #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

Modified: trunk/qgis/src/gui/qgsmapcanvasmap.h
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvasmap.h	2011-03-11 18:59:25 UTC (rev 15435)
+++ trunk/qgis/src/gui/qgsmapcanvasmap.h	2011-03-11 19:00:48 UTC (rev 15436)
@@ -50,7 +50,7 @@
     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();