summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-08-01 11:32:55 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-16 17:32:04 +0200
commit409655f3451815930b70a71baa175ab9f34467ed (patch)
treed0e21bbc79422f0d3743103a56d1de78c878808f
parentd6b4d9ad75b06b16d7555ebeace6f06010379cf5 (diff)
downloadqtxmlpatterns-old/5.1.tar.gz
Replace use of C-style cast with something that is not a cast.old/5.1
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 <oswald.buddenhagen@digia.com>
-rw-r--r--src/xmlpatterns/api/qabstractxmlnodemodel.h6
1 files 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;