diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-04-26 13:00:56 +0300 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-26 15:33:00 +0200 |
commit | f3721d77067d4d0f81971a4bfb1bb135bf146d8a (patch) | |
tree | 33dbdff4faa162c5158fc5bf531b486213d4ded6 /src/corelib/tools/qrect.h | |
parent | 93132154b5283bf26baee47c60471a245884382f (diff) |
get rid of Q_*_EXPORT_INLINE macros
> Girish:
> We should be able to remove the macro completely today,
> just mark all those functions as plain inline.
> With Qt5, we don't have to worry about bc yet.
this fixes "import attribute ignored" warnings on mingw with -fno-keep-inline-dllexport
Change-Id: I616e5de7c8d59953ce03a316b941a439fae56298
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/tools/qrect.h')
-rw-r--r-- | src/corelib/tools/qrect.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h index 1186cf1fdd..ff318dbe6f 100644 --- a/src/corelib/tools/qrect.h +++ b/src/corelib/tools/qrect.h @@ -144,8 +144,8 @@ public: QT_DEPRECATED QRect intersect(const QRect &r) const { return intersected(r); } #endif - friend Q_CORE_EXPORT_INLINE Q_DECL_CONSTEXPR bool operator==(const QRect &, const QRect &); - friend Q_CORE_EXPORT_INLINE Q_DECL_CONSTEXPR bool operator!=(const QRect &, const QRect &); + friend Q_DECL_CONSTEXPR inline bool operator==(const QRect &, const QRect &); + friend Q_DECL_CONSTEXPR inline bool operator!=(const QRect &, const QRect &); private: int x1; @@ -155,8 +155,8 @@ private: }; Q_DECLARE_TYPEINFO(QRect, Q_MOVABLE_TYPE); -Q_CORE_EXPORT_INLINE Q_DECL_CONSTEXPR bool operator==(const QRect &, const QRect &); -Q_CORE_EXPORT_INLINE Q_DECL_CONSTEXPR bool operator!=(const QRect &, const QRect &); +Q_DECL_CONSTEXPR inline bool operator==(const QRect &, const QRect &); +Q_DECL_CONSTEXPR inline bool operator!=(const QRect &, const QRect &); /***************************************************************************** @@ -544,8 +544,8 @@ public: QT_DEPRECATED QRectF intersect(const QRectF &r) const { return intersected(r); } #endif - friend Q_CORE_EXPORT_INLINE Q_DECL_CONSTEXPR bool operator==(const QRectF &, const QRectF &); - friend Q_CORE_EXPORT_INLINE Q_DECL_CONSTEXPR bool operator!=(const QRectF &, const QRectF &); + friend Q_DECL_CONSTEXPR inline bool operator==(const QRectF &, const QRectF &); + friend Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &, const QRectF &); Q_DECL_CONSTEXPR inline QRect toRect() const; QRect toAlignedRect() const; @@ -558,8 +558,8 @@ private: }; Q_DECLARE_TYPEINFO(QRectF, Q_MOVABLE_TYPE); -Q_CORE_EXPORT_INLINE Q_DECL_CONSTEXPR bool operator==(const QRectF &, const QRectF &); -Q_CORE_EXPORT_INLINE Q_DECL_CONSTEXPR bool operator!=(const QRectF &, const QRectF &); +Q_DECL_CONSTEXPR inline bool operator==(const QRectF &, const QRectF &); +Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &, const QRectF &); /***************************************************************************** |