X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewitemiterator.hpp;h=c4c6f2afd7923c60e0948a02af4a1128458a8d60;hp=179de383965218d2b31321b96b67686ab424f316;hb=24c29d4f917ffac5a280d572cc04d1edb66a81b9;hpb=c373f82810ad9c5376a7370118de9dd587ee0e43

diff --git a/pv/view/viewitemiterator.hpp b/pv/view/viewitemiterator.hpp
index 179de383..c4c6f2af 100644
--- a/pv/view/viewitemiterator.hpp
+++ b/pv/view/viewitemiterator.hpp
@@ -14,12 +14,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEW_VIEWITEMITERATOR_HPP
-#define PULSEVIEW_PV_VIEW_VIEWITEMITERATOR_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMITERATOR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMITERATOR_HPP
 
 #include <algorithm>
 #include <cassert>
@@ -32,19 +31,17 @@
 #include <pv/session.hpp>
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 template<class Owner, class Item> class ViewItemIterator
 {
 public:
-	typedef typename std::conditional<std::is_const<Owner>::value,
-		typename Owner::item_list::const_iterator,
-		typename Owner::item_list::iterator>::type child_iterator;
-
+	typedef typename Owner::item_list::const_iterator child_iterator;
 	typedef std::shared_ptr<Item> value_type;
 	typedef ptrdiff_t difference_type;
 	typedef value_type pointer;
-	typedef value_type& reference;
+	typedef const value_type& reference;
 	typedef std::forward_iterator_tag iterator_category;
 
 public:
@@ -126,7 +123,8 @@ void swap(ViewItemIterator<Owner, Item>& a, ViewItemIterator<Owner, Item>& b)
 	a.swap(b);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_VIEWITEMITERATOR_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMITERATOR_HPP