whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename handler/handlerManager. 

Change-Id: Idbac004120ea686d403421ea4f2fb4db87f55149
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
bb10
Stephen Kelly 2012-01-08 20:37:22 +01:00 committed by Qt by Nokia
parent 90a7e6953d
commit 75ab5a15c4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/kernel/qvariant.cpp
View File

@ -1899,13 +1899,13 @@ QDataStream& operator<<(QDataStream &s, const QVariant::Type p)
*/
template <typename T>
inline T qVariantToHelper(const QVariant::Private &d, QVariant::Type t, const HandlersManager &handler)
inline T qVariantToHelper(const QVariant::Private &d, QVariant::Type t, const HandlersManager &handlerManager)
{
if (d.type == t)
return *v_cast<T>(&d);
T ret;
handler[d.type]->convert(&d, t, &ret, 0);
handlerManager[d.type]->convert(&d, t, &ret, 0);
return ret;
}
@ -2212,7 +2212,7 @@ QBitArray QVariant::toBitArray() const
template <typename T>
inline T qNumVariantToHelper(const QVariant::Private &d,
const HandlersManager &handler, bool *ok, const T& val)
const HandlersManager &handlerManager, bool *ok, const T& val)
{
uint t = qMetaTypeId<T>();
if (ok)
@ -2221,7 +2221,7 @@ inline T qNumVariantToHelper(const QVariant::Private &d,
return val;
T ret = 0;
if (!handler[d.type]->convert(&d, QVariant::Type(t), &ret, ok) && ok)
if (!handlerManager[d.type]->convert(&d, QVariant::Type(t), &ret, ok) && ok)
*ok = false;
return ret;
}