From 444914839541154b0927cd1d49890677b8368148 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 12 Dec 2013 17:30:44 +0100 Subject: QMetaType: Rename template type of type-erased iterator operations. This struct is a specialization for the case that the const_iterator is a pointer to the value type. Reflect that in the type name. Change-Id: I0a4ac03840658056285080860baec8313746c71c Reviewed-by: Simon Hausmann --- src/corelib/kernel/qmetatype.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index a2e6960949..06adf7cffd 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -805,17 +805,17 @@ struct IteratorOwner return &*it; } }; -template -struct IteratorOwner +template +struct IteratorOwner { - static void assign(void **ptr, const const_iterator *iterator ) + static void assign(void **ptr, const value_type *iterator ) { - *ptr = const_cast(iterator); + *ptr = const_cast(iterator); } static void advance(void **iterator, int step) { - const_iterator *it = static_cast(*iterator); + value_type *it = static_cast(*iterator); std::advance(it, step); *iterator = it; } @@ -829,7 +829,7 @@ struct IteratorOwner return *iterator; } - static const void *getData(const const_iterator *it) + static const void *getData(const value_type *it) { return it; } -- cgit v1.2.3