diff options
| -rw-r--r-- | java/javaendian.h (renamed from java/endian.h) | 0 | ||||
| -rw-r--r-- | java/membuffer.h | 2 | ||||
| -rw-r--r-- | libutil/include/siglist_impl.h | 10 |
3 files changed, 6 insertions, 6 deletions
diff --git a/java/endian.h b/java/javaendian.h index fa6207fe..fa6207fe 100644 --- a/java/endian.h +++ b/java/javaendian.h diff --git a/java/membuffer.h b/java/membuffer.h index 48304b9f..2ea3a69b 100644 --- a/java/membuffer.h +++ b/java/membuffer.h @@ -3,7 +3,7 @@ #include <string> #include <vector> #include <exception> -#include "endian.h" +#include "javaendian.h" namespace util { diff --git a/libutil/include/siglist_impl.h b/libutil/include/siglist_impl.h index 9736b2cf..5cdc632a 100644 --- a/libutil/include/siglist_impl.h +++ b/libutil/include/siglist_impl.h @@ -48,7 +48,7 @@ template <typename T> void SigList<T>::erase(typename QList<T>::iterator pos) { T value = *pos; - int index = indexOf(*pos); + int index = QList<T>::indexOf(*pos); QList<T>::erase(pos); onItemRemoved(value, index); } @@ -57,9 +57,9 @@ template <typename T> void SigList<T>::erase(typename QList<T>::iterator first, typename QList<T>::iterator last) { QList<T> removedValues; - int firstIndex = indexOf(*first); + int firstIndex = QList<T>::indexOf(*first); - for (SigList<T>::iterator iter = first; iter < last; iter++) + for (auto iter = first; iter < last; iter++) { removedValues << *iter; QList<T>::erase(iter); @@ -79,7 +79,7 @@ template <typename T> void SigList<T>::insert(typename QList<T>::iterator before, const T &t) { QList<T>::insert(before, t); - onItemAdded(t, indexOf(t)); + onItemAdded(t, QList<T>::indexOf(t)); } template <typename T> @@ -101,7 +101,7 @@ int SigList<T>::removeAll(const T &t) template <typename T> bool SigList<T>::removeOne(const T &t) { - int index = indexOf(t); + int index = QList<T>::indexOf(t); if (QList<T>::removeOne(t)) { onItemRemoved(t, index); |