From 409655f3451815930b70a71baa175ab9f34467ed Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 1 Aug 2013 11:32:55 -0700 Subject: Replace use of C-style cast with something that is not a cast. Avoids a warning in user code. We should add -Wold-style-cast to our header checks. Task-number: QTBUG-32735 Change-Id: Ic284e3a5df56789d51484364b34a9ebc026bb20a Reviewed-by: Oswald Buddenhagen --- src/xmlpatterns/api/qabstractxmlnodemodel.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h index 0bdf9c4..98148f7 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.h +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h @@ -92,10 +92,10 @@ namespace QPatternist }; void *pointer() const { - /* Constructing to qptrdiff means we avoid the warning "cast to pointer - * from integer of different size." + /* Constructing to qptrdiff means we avoid warnings. */ - return (void *)qptrdiff(data); + char *null = 0; + return null + qptrdiff(data); } Data additionalData; -- cgit v1.2.1