From 75ab5a15c486480777fa79d8eaa137830fa7bfc8 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 8 Jan 2012 20:37:22 +0100 Subject: Rename handler/handlerManager. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idbac004120ea686d403421ea4f2fb4db87f55149 Reviewed-by: Jędrzej Nowacki --- src/corelib/kernel/qvariant.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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 -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(&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 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(); 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; } -- cgit v1.2.3