Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More GCC fixes

Browse Source
This commit is contained in:
Petr Mrázek 2013-02-21 19:59:34 +01:00
parent 294c8e21c8
commit 50d1f62bf4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
java/endian.h → java/javaendian.h
View File

2
java/membuffer.h
View File

@ -3,7 +3,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <exception> #include <exception>
#include "endian.h" #include "javaendian.h"
namespace util namespace util
{ {

10
libutil/include/siglist_impl.h
View File

@ -48,7 +48,7 @@ template <typename T>
void SigList<T>::erase(typename QList<T>::iterator pos) void SigList<T>::erase(typename QList<T>::iterator pos)
{ {
T value = *pos; T value = *pos;
int index = indexOf(*pos); int index = QList<T>::indexOf(*pos);
QList<T>::erase(pos); QList<T>::erase(pos);
onItemRemoved(value, index); onItemRemoved(value, index);
} }
@ -57,9 +57,9 @@ template <typename T>
void SigList<T>::erase(typename QList<T>::iterator first, typename QList<T>::iterator last) void SigList<T>::erase(typename QList<T>::iterator first, typename QList<T>::iterator last)
{ {
QList<T> removedValues; 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; removedValues << *iter;
QList<T>::erase(iter); QList<T>::erase(iter);
@ -79,7 +79,7 @@ template <typename T>
void SigList<T>::insert(typename QList<T>::iterator before, const T &t) void SigList<T>::insert(typename QList<T>::iterator before, const T &t)
{ {
QList<T>::insert(before, t); QList<T>::insert(before, t);
onItemAdded(t, indexOf(t)); onItemAdded(t, QList<T>::indexOf(t));
} }
template <typename T> template <typename T>
@ -101,7 +101,7 @@ int SigList<T>::removeAll(const T &t)
template <typename T> template <typename T>
bool SigList<T>::removeOne(const T &t) bool SigList<T>::removeOne(const T &t)
{ {
int index = indexOf(t); int index = QList<T>::indexOf(t);
if (QList<T>::removeOne(t)) if (QList<T>::removeOne(t))
{ {
onItemRemoved(t, index); onItemRemoved(t, index);