diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-09-10 09:19:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-13 14:37:32 +0200 |
| commit | a9770c4b6c9fb80ae1b33f5e901ed0a5e5bfb25c (patch) | |
| tree | 13327af55bf72edf763aa4a8374eab3568c7cb3d | |
| parent | 93d7ee0da371f9e15fdb0c173df53c28eab307c7 (diff) | |
Remove some unneeded constructors.
Change-Id: I34f86960dc0cfaada509957bca5466b2765e8239
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 0c8f273887..0b8be3af89 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -995,8 +995,6 @@ public: template<typename From> struct QSequentialIterableConvertFunctor { - QSequentialIterableConvertFunctor() {} - QSequentialIterableImpl operator()(const From &f) const { return QSequentialIterableImpl(&f); @@ -1162,8 +1160,6 @@ public: template<typename From> struct QAssociativeIterableConvertFunctor { - QAssociativeIterableConvertFunctor() {} - QAssociativeIterableImpl operator()(const From& f) const { return QAssociativeIterableImpl(&f); @@ -1219,8 +1215,6 @@ struct QPairVariantInterfaceConvertFunctor; template<typename T, typename U> struct QPairVariantInterfaceConvertFunctor<QPair<T, U> > { - QPairVariantInterfaceConvertFunctor() {} - QPairVariantInterfaceImpl operator()(const QPair<T, U>& f) const { return QPairVariantInterfaceImpl(&f); @@ -1230,8 +1224,6 @@ struct QPairVariantInterfaceConvertFunctor<QPair<T, U> > template<typename T, typename U> struct QPairVariantInterfaceConvertFunctor<std::pair<T, U> > { - QPairVariantInterfaceConvertFunctor() {} - QPairVariantInterfaceImpl operator()(const std::pair<T, U>& f) const { return QPairVariantInterfaceImpl(&f); @@ -2014,7 +2006,7 @@ inline bool QtPrivate::IsMetaTypePair<T, true>::registerConverter(int id) { const int toId = qMetaTypeId<QtMetaTypePrivate::QPairVariantInterfaceImpl>(); if (!QMetaType::hasRegisteredConverterFunction(id, toId)) { - static const QtMetaTypePrivate::QPairVariantInterfaceConvertFunctor<T> o; + QtMetaTypePrivate::QPairVariantInterfaceConvertFunctor<T> o; static const QtPrivate::ConverterFunctor<T, QtMetaTypePrivate::QPairVariantInterfaceImpl, QtMetaTypePrivate::QPairVariantInterfaceConvertFunctor<T> > f(o); @@ -2031,7 +2023,7 @@ namespace QtPrivate { { const int toId = qMetaTypeId<QtMetaTypePrivate::QSequentialIterableImpl>(); if (!QMetaType::hasRegisteredConverterFunction(id, toId)) { - static const QtMetaTypePrivate::QSequentialIterableConvertFunctor<T> o; + QtMetaTypePrivate::QSequentialIterableConvertFunctor<T> o; static const QtPrivate::ConverterFunctor<T, QtMetaTypePrivate::QSequentialIterableImpl, QtMetaTypePrivate::QSequentialIterableConvertFunctor<T> > f(o); @@ -2048,7 +2040,7 @@ namespace QtPrivate { { const int toId = qMetaTypeId<QtMetaTypePrivate::QAssociativeIterableImpl>(); if (!QMetaType::hasRegisteredConverterFunction(id, toId)) { - static const QtMetaTypePrivate::QAssociativeIterableConvertFunctor<T> o; + QtMetaTypePrivate::QAssociativeIterableConvertFunctor<T> o; static const QtPrivate::ConverterFunctor<T, QtMetaTypePrivate::QAssociativeIterableImpl, QtMetaTypePrivate::QAssociativeIterableConvertFunctor<T> > f(o); |