1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix connecting to a functor with 3 arguments

Browse Source 
Task-number: QTBUG-28285

Change-Id: I07bd870c093482035728aa783d0ecbc8aa8670d2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Olivier Goffart 2012-11-29 21:32:47 +01:00 committed by The Qt Project
parent c3b4f27603
commit d8e6be1603
2 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qobjectdefs_impl.h
View File

@ -445,7 +445,7 @@ namespace QtPrivate {
static void call(Function &f, void *, void **arg) {
f( *reinterpret_cast<typename RemoveRef<typename List_Select<Args, 0>::Value>::Type *>(arg[1]),
*reinterpret_cast<typename RemoveRef<typename List_Select<Args, 1>::Value>::Type *>(arg[2]),
*reinterpret_cast<typename RemoveRef<typename List_Select<Args, 2>::Value>::Type *>(arg[4])), ApplyReturnValue<R>(arg[0]);
*reinterpret_cast<typename RemoveRef<typename List_Select<Args, 2>::Value>::Type *>(arg[3])), ApplyReturnValue<R>(arg[0]);
}
};
template<typename Function> struct Functor<Function, 4>

53
tests/auto/corelib/kernel/qobject/tst_qobject.cpp
View File

@ -5081,6 +5081,51 @@ namespace ManyArgumentNamespace {
MANYARGUMENT_COMPARE(d); MANYARGUMENT_COMPARE(e); MANYARGUMENT_COMPARE(f);
count++;
}
struct Funct1 {
void operator()(const QString &a) {
MANYARGUMENT_COMPARE(a);
count++;
}
};
struct Funct2 {
void operator()(const QString &a, const QString &b) {
MANYARGUMENT_COMPARE(a); MANYARGUMENT_COMPARE(b);
count++;
}
};
struct Funct3 {
void operator()(const QString &a, const QString &b, const QString &c) {
MANYARGUMENT_COMPARE(a); MANYARGUMENT_COMPARE(b); MANYARGUMENT_COMPARE(c);
count++;
}
};
struct Funct4 {
void operator()(const QString &a, const QString &b, const QString &c, const QString&d) {
MANYARGUMENT_COMPARE(a); MANYARGUMENT_COMPARE(b); MANYARGUMENT_COMPARE(c);
MANYARGUMENT_COMPARE(d);
count++;
}
};
struct Funct5 {
void operator()(const QString &a, const QString &b, const QString &c, const QString&d, const QString&e) {
MANYARGUMENT_COMPARE(a); MANYARGUMENT_COMPARE(b); MANYARGUMENT_COMPARE(c);
MANYARGUMENT_COMPARE(d); MANYARGUMENT_COMPARE(e);
count++;
}
};
struct Funct6 {
void operator()(const QString &a, const QString &b, const QString &c, const QString&d, const QString&e, const QString&f) {
MANYARGUMENT_COMPARE(a); MANYARGUMENT_COMPARE(b); MANYARGUMENT_COMPARE(c);
MANYARGUMENT_COMPARE(d); MANYARGUMENT_COMPARE(e); MANYARGUMENT_COMPARE(f);
count++;
}
};
}
void tst_QObject::connectManyArguments()
@ -5128,10 +5173,16 @@ void tst_QObject::connectManyArguments()
connect(&ob2, &ManyArgumentObject::signal6, ManyArgumentNamespace::slot4);
connect(&ob2, &ManyArgumentObject::signal6, ManyArgumentNamespace::slot5);
connect(&ob2, &ManyArgumentObject::signal6, ManyArgumentNamespace::slot6);
connect(&ob2, &ManyArgumentObject::signal6, ManyArgumentNamespace::Funct1());
connect(&ob2, &ManyArgumentObject::signal6, ManyArgumentNamespace::Funct2());
connect(&ob2, &ManyArgumentObject::signal6, ManyArgumentNamespace::Funct3());
connect(&ob2, &ManyArgumentObject::signal6, ManyArgumentNamespace::Funct4());
connect(&ob2, &ManyArgumentObject::signal6, ManyArgumentNamespace::Funct5());
connect(&ob2, &ManyArgumentObject::signal6, ManyArgumentNamespace::Funct6());
emit ob2.signal6("a", "b", "c", "d", "e", "f");
QCOMPARE(ob2.count, 6);
QCOMPARE(ManyArgumentNamespace::count, 6);
QCOMPARE(ManyArgumentNamespace::count, 12);
}
class ReturnValue : public QObject {