replace deprecation pragmas with macro (followup 5134ef9)

qgis · Feb 27, 2014 · 3b1e192 · 3b1e192
1 parent 33a8b63
commit 3b1e192
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 43 deletions.
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -435,21 +435,9 @@ void QgsComposerMap::setCacheUpdated( bool u )
 
 const QgsMapRenderer *QgsComposerMap::mapRenderer() const
 {
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4996)
-#endif
+  Q_NOWARN_DEPRECATED_PUSH
   return mComposition->mapRenderer();
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+  Q_NOWARN_DEPRECATED_POP
 }
 
 QStringList QgsComposerMap::layersToRender()

diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -404,6 +404,23 @@ typedef QMap<QString, QString> QgsStringMap;
  *  KEEP IN SYNC WITH qgssize defined in SIP! */
 typedef unsigned long long qgssize;
 
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) || defined(__clang__)
+#define Q_NOWARN_DEPRECATED_PUSH \
+    _Pragma("GCC diagnostic push") \
+    _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#define Q_NOWARN_DEPRECATED_POP \
+    _Pragma("GCC diagnostic pop")
+#elif defined(_MSC_VER)
+#define Q_NOWARN_DEPRECATED_PUSH \
+    __pragma(warning(push)) \
+    __pragma(warning(disable:4996))
+#define Q_NOWARN_DEPRECATED_POP \
+    __pragma(warning(pop))
+#else
+#define Q_NOWARN_DEPRECATED_PUSH
+#define Q_NOWARN_DEPRECATED_POP
+#endif
+
 // FIXME: also in qgisinterface.h
 #ifndef QGISEXTERN
 #ifdef WIN32

diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp
@@ -30,7 +30,6 @@
 #include "qgsproject.h"
 #include "qgsvectorlayer.h"
 
-
 #include <QDomDocument>
 #include <QDomNode>
 #include <QMutexLocker>
@@ -645,21 +644,9 @@ void QgsMapRenderer::setProjectionsEnabled( bool enabled )
     updateFullExtent();
     mLastExtent.setMinimal();
 
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4996)
-#endif
+    Q_NOWARN_DEPRECATED_PUSH
     emit hasCrsTransformEnabled( enabled ); // deprecated
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+    Q_NOWARN_DEPRECATED_POP
 
     emit hasCrsTransformEnabledChanged( enabled );
   }

diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -1525,21 +1525,9 @@ bool QgsMapCanvas::isFrozen()
 
 QPaintDevice &QgsMapCanvas::canvasPaintDevice()
 {
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4996)
-#endif
+  Q_NOWARN_DEPRECATED_PUSH
   return mMap->paintDevice();
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+  Q_NOWARN_DEPRECATED_POP
 }
 
 double QgsMapCanvas::mapUnitsPerPixel() const