diff options
author | David Schulz <david.schulz@digia.com> | 2014-03-07 13:18:31 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-15 10:46:17 +0100 |
commit | cc0636ea1eb34b654bd14ce840d1ffa5a07e44fe (patch) | |
tree | 2694b5a44aa0513dba9f0572c2576382841cc986 /src/corelib/kernel | |
parent | c6e271da6d1d972ad73a97871baafe57578a69a9 (diff) |
Remove level 4 compiler warnings from MSVC.
Task-number: QTBUG-7233
Change-Id: I52067e3a22e98a62fd87415906e54a54ff2d6b49
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Dave McClelland
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qmetatype.h | 4 | ||||
-rw-r--r-- | src/corelib/kernel/qobject_impl.h | 2 |
2 files changed, 6 insertions, 0 deletions
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<typename const_iterator> 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. |