From cc0636ea1eb34b654bd14ce840d1ffa5a07e44fe Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 7 Mar 2014 13:18:31 +0100 Subject: Remove level 4 compiler warnings from MSVC. Task-number: QTBUG-7233 Change-Id: I52067e3a22e98a62fd87415906e54a54ff2d6b49 Reviewed-by: Kurt Pattyn Reviewed-by: Oliver Wolff Reviewed-by: Joerg Bornemann Reviewed-by: Dave McClelland --- src/corelib/kernel/qmetatype.h | 4 ++++ src/corelib/kernel/qobject_impl.h | 2 ++ 2 files changed, 6 insertions(+) (limited to 'src/corelib/kernel') diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 83801a20c5..5e354b3f41 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -771,9 +771,13 @@ struct VariantData , flags(flags_) { } + VariantData(const VariantData &other) + : metaTypeId(other.metaTypeId), data(other.data), flags(other.flags){} const int metaTypeId; const void *data; const uint flags; +private: + VariantData &operator=(const VariantData &) Q_DECL_EQ_DELETE; }; template diff --git a/src/corelib/kernel/qobject_impl.h b/src/corelib/kernel/qobject_impl.h index d2996e6e4d..aea9d41c67 100644 --- a/src/corelib/kernel/qobject_impl.h +++ b/src/corelib/kernel/qobject_impl.h @@ -132,6 +132,8 @@ namespace QtPrivate { inline void call(QObject *r, void **a) { m_impl(Call, this, r, a, 0); } protected: ~QSlotObjectBase() {} + private: + Q_DISABLE_COPY(QSlotObjectBase) }; // implementation of QSlotObjectBase for which the slot is a pointer to member function of a QObject // Args and R are the List of arguments and the returntype of the signal to which the slot is connected. -- cgit v1.2.3