diff options
| -rw-r--r-- | dist/changes-5.0.0 | 2 | ||||
| -rw-r--r-- | src/corelib/global/qtypeinfo.h | 4 | ||||
| -rw-r--r-- | src/gui/image/qpixmapcache_p.h | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index 5a9ce7e6c7..e1f1f07203 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -45,6 +45,8 @@ information about a particular change. in Qt4, so these methods return a bool now. If your code used the undocumented QBool, simply replace it with bool. +- qIsDetached<> has been removed without replacement. + - QMetaType: * QMetaType::construct() has been renamed to QMetaType::create(). * QMetaType::unregisterType() has been removed. diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h index 815be935f7..1c08bbe1cf 100644 --- a/src/corelib/global/qtypeinfo.h +++ b/src/corelib/global/qtypeinfo.h @@ -49,15 +49,12 @@ QT_BEGIN_NAMESPACE /* QTypeInfo - type trait functionality - qIsDetached - data sharing functionality */ /* The catch-all template. */ -template <typename T> inline bool qIsDetached(T &) { return true; } - template <typename T> class QTypeInfo { @@ -188,7 +185,6 @@ QT_BEGIN_NAMESPACE #endif #define Q_DECLARE_SHARED(TYPE) \ -template <> inline bool qIsDetached<TYPE>(TYPE &t) { return t.isDetached(); } \ template <> inline void qSwap<TYPE>(TYPE &value1, TYPE &value2) \ { qSwap(value1.data_ptr(), value2.data_ptr()); } \ Q_DECLARE_SHARED_STL(TYPE) diff --git a/src/gui/image/qpixmapcache_p.h b/src/gui/image/qpixmapcache_p.h index 6ca109b03f..426a6d9954 100644 --- a/src/gui/image/qpixmapcache_p.h +++ b/src/gui/image/qpixmapcache_p.h @@ -96,8 +96,6 @@ public: QPixmapCache::Key key; }; -inline bool qIsDetached(QPixmapCacheEntry &t) { return t.isDetached(); } - QT_END_NAMESPACE #endif // QPIXMAPCACHE_P_H |