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 class SigList : public QList { -private: - typedef typename QList::iterator iterator; - public: explicit SigList() : QList() {} @@ -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::iterator pos); + virtual void erase(typename QList::iterator first, typename QList::iterator last); virtual void insert(int i, const T &t); - virtual void insert(iterator before, const T &t); + virtual void insert(typename QList::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::clear() } template -void SigList::erase(SigList::iterator pos) +void SigList::erase(typename QList::iterator pos) { T value = *pos; int index = indexOf(*pos); @@ -54,7 +54,7 @@ void SigList::erase(SigList::iterator pos) } template -void SigList::erase(SigList::iterator first, SigList::iterator last) +void SigList::erase(typename QList::iterator first, typename QList::iterator last) { QList removedValues; int firstIndex = indexOf(*first); @@ -76,7 +76,7 @@ void SigList::insert(int i, const T &t) } template -void SigList::insert(SigList::iterator before, const T &t) +void SigList::insert(typename QList::iterator before, const T &t) { QList::insert(before, t); onItemAdded(t, indexOf(t));