From 9c9bbfc13c0ace717d2f569fa809d30b5b9d9efe Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 9 Nov 2011 15:58:27 +0100 Subject: [PATCH] QVariant: Fix MSVC compiler warning about unused variable null. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use static method isnull(). Introduced by ca26fefc0624264262a2abe630568271cefa2753. Change-Id: I752f8d8a5ec473dcc5f50fbda47d061b8d3a7e13 Reviewed-by: Olivier Goffart Reviewed-by: Jędrzej Nowacki --- src/corelib/kernel/qvariant_p.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h index 5729c0d2d5..3c2176856d 100644 --- a/src/corelib/kernel/qvariant_p.h +++ b/src/corelib/kernel/qvariant_p.h @@ -282,8 +282,7 @@ public: template bool delegate(const T*) { - CallIsNull null; - return null.isNull(m_d); + return CallIsNull::isNull(m_d); } // we need that as sizof(void) is undefined and it is needed in HasIsNullMethod bool delegate(const void *) { return m_d->is_null; }