From 2020d9c24bf0c2d024a3f42f38d7e106ab8a49eb Mon Sep 17 00:00:00 2001
From: Andrew <forkk@forkk.net>
Date: Thu, 21 Feb 2013 12:42:16 -0600
Subject: Fixed MSVC issues.

---
 libutil/include/siglist.h      | 9 +++------
 libutil/include/siglist_impl.h | 6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'libutil')

diff --git a/libutil/include/siglist.h b/libutil/include/siglist.h
index 347cf752..dcae7c04 100644
--- a/libutil/include/siglist.h
+++ b/libutil/include/siglist.h
@@ -26,9 +26,6 @@
 template <typename T>
 class SigList : public QList<T>
 {
-private:
-	typedef typename QList<T>::iterator iterator;
-	
 public:
 	explicit SigList() : QList<T>() {}
 	
@@ -37,11 +34,11 @@ public:
 	
 	virtual void clear();
 	
-	virtual void erase(iterator pos);
-	virtual void erase(iterator first, iterator last);
+	virtual void erase(typename QList<T>::iterator pos);
+	virtual void erase(typename QList<T>::iterator first, typename QList<T>::iterator last);
 	
 	virtual void insert(int i, const T &t);
-	virtual void insert(iterator before, const T &t);
+	virtual void insert(typename QList<T>::iterator before, const T &t);
 	
 	virtual void move(int from, int to);
 	
diff --git a/libutil/include/siglist_impl.h b/libutil/include/siglist_impl.h
index cb37ea4b..9736b2cf 100644
--- a/libutil/include/siglist_impl.h
+++ b/libutil/include/siglist_impl.h
@@ -45,7 +45,7 @@ void SigList<T>::clear()
 }
 
 template <typename T>
-void SigList<T>::erase(SigList<T>::iterator pos)
+void SigList<T>::erase(typename QList<T>::iterator pos)
 {
 	T value = *pos;
 	int index = indexOf(*pos);
@@ -54,7 +54,7 @@ void SigList<T>::erase(SigList<T>::iterator pos)
 }
 
 template <typename T>
-void SigList<T>::erase(SigList<T>::iterator first, SigList<T>::iterator last)
+void SigList<T>::erase(typename QList<T>::iterator first, typename QList<T>::iterator last)
 {
 	QList<T> removedValues;
 	int firstIndex = indexOf(*first);
@@ -76,7 +76,7 @@ void SigList<T>::insert(int i, const T &t)
 }
 
 template <typename T>
-void SigList<T>::insert(SigList<T>::iterator before, const T &t)
+void SigList<T>::insert(typename QList<T>::iterator before, const T &t)
 {
 	QList<T>::insert(before, t);
 	onItemAdded(t, indexOf(t));
-- 
cgit v1.2.3