From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Sun, 8 Jan 2012 19:37:22 +0000 (+0100)
Subject: Rename handler/handlerManager.
X-Git-Tag: qt-v5.0.0-alpha1~1960
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75ab5a15c486480777fa79d8eaa137830fa7bfc8;p=profile%2Fivi%2Fqtbase.git

Rename handler/handlerManager.

Change-Id: Idbac004120ea686d403421ea4f2fb4db87f55149
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
---

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 3002db4..9cf1313 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;
 }