diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-10-30 22:44:13 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-03 18:09:17 +0100 |
| commit | 1eb7005850b9f54c30b34bd1268d2314767131fe (patch) | |
| tree | 45d888a71db60c01d3b6724eb3a8eadebc88cdf0 /src/gui/image | |
| parent | 63a512023e861380f4489b103212769b741a93dc (diff) | |
Use the new warning enabling/disabling macros in qtbase
Change-Id: I91ff06644e8047c2ca483f9768b46c1372eb6171
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qimage.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index 6a483f610f..8984af12d1 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -349,13 +349,9 @@ inline void QImage::setPixel(const QPoint &pt, uint index_or_rgb) { setPixel(pt. #if QT_DEPRECATED_SINCE(5, 0) -#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#elif defined(Q_CC_MSVC) -# pragma warning(push) -# pragma warning(disable: 4996) -#endif +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") +QT_WARNING_DISABLE_MSVC(4996) inline QString QImage::text(const char* key, const char* lang) const { @@ -427,11 +423,7 @@ inline void QImage::setText(const char* key, const char* lang, const QString &s) setText(k, s); } -#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) -# pragma GCC diagnostic pop -#elif defined(Q_CC_MSVC) -# pragma warning(pop) -#endif +QT_WARNING_POP inline int QImage::numColors() const { |