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

Remove redundant template parameter from QMetaType's internal classes.

Browse Source 
Filter doesn't have to be a parameter because we always use
DefinedTypesFilter.

Change-Id: I19b8eb47a4c50e290cf712f909aaead8fdc94cd9
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Jędrzej Nowacki 2011-12-19 16:55:47 +01:00 committed by Qt by Nokia
parent 4954f71648
commit 1dc86cbe85
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/corelib/kernel/qmetatype.cpp
View File

@ -1410,9 +1410,8 @@ void QMetaType::destroy(int type, void *data)
}
namespace {
template<class Filter>
class TypeConstructor {
template<typename T, bool IsAcceptedType = Filter::template Acceptor<T>::IsAccepted>
template<typename T, bool IsAcceptedType = DefinedTypesFilter::Acceptor<T>::IsAccepted>
struct ConstructorImpl {
static void *Construct(const int /*type*/, void *where, const T *copy) { return qMetaTypeConstructHelper(where, copy); }
};
@ -1497,15 +1496,14 @@ void *QMetaType::construct(int type, void *where, const void *copy)
{
if (!where)
return 0;
TypeConstructor<DefinedTypesFilter> constructor(type, where);
TypeConstructor constructor(type, where);
return QMetaTypeSwitcher::switcher<void*>(constructor, type, copy);
}
namespace {
template<class Filter>
class TypeDestructor {
template<typename T, bool IsAcceptedType = Filter::template Acceptor<T>::IsAccepted>
template<typename T, bool IsAcceptedType = DefinedTypesFilter::Acceptor<T>::IsAccepted>
struct DestructorImpl {
static void Destruct(const int /* type */, T *where) { qMetaTypeDestructHelper(where); }
};
@ -1573,15 +1571,14 @@ void QMetaType::destruct(int type, void *where)
{
if (!where)
return;
TypeDestructor<DefinedTypesFilter> destructor(type);
TypeDestructor destructor(type);
QMetaTypeSwitcher::switcher<void>(destructor, type, where);
}
namespace {
template<class Filter>
class SizeOf {
template<typename T, bool IsAcceptedType = Filter::template Acceptor<T>::IsAccepted>
template<typename T, bool IsAcceptedType = DefinedTypesFilter::Acceptor<T>::IsAccepted>
struct SizeOfImpl {
static int Size(const int) { return sizeof(T); }
};
@ -1640,7 +1637,7 @@ private:
*/
int QMetaType::sizeOf(int type)
{
SizeOf<DefinedTypesFilter> sizeOf(type);
SizeOf sizeOf(type);
return QMetaTypeSwitcher::switcher<int>(sizeOf, type, 0);
}