AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some unneeded constructors.

Browse Source 
Change-Id: I34f86960dc0cfaada509957bca5466b2765e8239
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Stephen Kelly 2013-09-10 09:19:35 +02:00 committed by The Qt Project
parent 93d7ee0da3
commit a9770c4b6c
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/kernel/qmetatype.h
View File

@ -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);