summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-01-08 20:37:22 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-09 18:53:37 +0100
commit75ab5a15c486480777fa79d8eaa137830fa7bfc8 (patch)
treef9562a563b8e20134a8883030a084b093f796ea9 /src
parent90a7e6953d85a4d25502783e03c1bc48316f08b3 (diff)
Rename handler/handlerManager.
Change-Id: Idbac004120ea686d403421ea4f2fb4db87f55149 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qvariant.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 3002db480a..9cf131312b 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -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;
}