diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-07-10 14:10:23 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-24 00:17:04 +0200 |
| commit | ab867673f0aa556924792745c12b8774d1e6b4a4 (patch) | |
| tree | 2ee4f15b6d36cd93a3d68c1236c2ed9a234aba78 | |
| parent | 6754198c338abd560f3af31ff09630e0f1085843 (diff) | |
Cleanup unused code
Change-Id: I27821ca7e63fccd5353c48eebfde19756846dd2e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 5 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant_p.h | 5 |
3 files changed, 0 insertions, 11 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index c5ed0c636a..cbbb51a3c9 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -1184,7 +1184,6 @@ struct QPairVariantInterfaceConvertFunctor<std::pair<T, U> > } class QObject; -class QWidget; #define QT_FORWARD_DECLARE_SHARED_POINTER_TYPES_ITER(Name) \ template <class T> class Name; \ diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 96756fdda7..0664caba45 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -513,15 +513,10 @@ protected: #ifndef QT_NO_DEBUG_STREAM friend Q_CORE_EXPORT QDebug operator<<(QDebug, const QVariant &); #endif -// ### Qt6: FIXME: Remove the special Q_CC_MSVC handling, it was introduced to maintain BC for QTBUG-41810 . -#if !defined(Q_NO_TEMPLATE_FRIENDS) && !defined(Q_CC_MSVC) template<typename T> friend inline T qvariant_cast(const QVariant &); template<typename T> friend struct QtPrivate::QVariantValueHelper; protected: -#else -public: -#endif Private d; void create(int type, const void *copy); bool equals(const QVariant &other) const; diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h index 926e95386f..833e1c6adb 100644 --- a/src/corelib/kernel/qvariant_p.h +++ b/src/corelib/kernel/qvariant_p.h @@ -103,11 +103,6 @@ inline T *v_cast(QVariant::Private *d, T * = nullptr) #endif -enum QVariantConstructionFlags : uint { - Default = 0x0, - PointerType = 0x1 -}; - template <class T> inline void v_construct_helper(QVariant::Private *x, const T &t, std::true_type) { |