T ORecordList<T>::operator[]( uint i ) {

-    if ( i < 0 || (i+1) > m_ids.count() )
+    if ( i >= m_ids.count() )

-> fix warning and simplify :)

2 files changed, 2 insertions, 2 deletions

diff --git a/libopie/pim/orecordlist.h b/libopie/pim/orecordlist.h
index b77a4ab..edcd729 100644
--- a/libopie/pim/orecordlist.h
+++ b/libopie/pim/orecordlist.h
@@ -220,81 +220,81 @@ ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids,
     : m_uids( uids ), m_current( 0 ),  m_temp( t ), m_end( false ),
       m_direction( false )
 {
 }
 template <class T>
 uint ORecordListIterator<T>::current()const {
     return m_current;
 }
 template <class T>
 void ORecordListIterator<T>::setCurrent( uint cur ) {
     if( cur < m_uids.count() ) {
 	m_end = false;
 	m_current= cur;
     }
 }
 template <class T>
 uint ORecordListIterator<T>::count()const {
     return m_uids.count();
 }
 template <class T>
 ORecordList<T>::ORecordList( const QArray<int>& ids,
                              const Base* acc )
     : m_ids( ids ), m_acc( acc )
 {
 }
 template <class T>
 ORecordList<T>::~ORecordList() {
 /* nothing to do here */
 }
 template <class T>
 typename ORecordList<T>::Iterator ORecordList<T>::begin() {
     Iterator it( m_ids, m_acc );
     return it;
 }
 template <class T>
 typename ORecordList<T>::Iterator ORecordList<T>::end() {
     Iterator it( m_ids, m_acc );
     it.m_end = true;
     it.m_current = m_ids.count();
 
     return it;
 }
 template <class T>
 uint ORecordList<T>::count()const {
 return m_ids.count();
 }
 template <class T>
 T ORecordList<T>::operator[]( uint i ) {
-    if ( i < 0 || (i+1) > m_ids.count() )
+    if ( i >= m_ids.count() )
         return T();
     /* forward */
     return m_acc->find( m_ids[i], m_ids, i );
 }
 template <class T>
 int ORecordList<T>::uidAt( uint i ) {
     return m_ids[i];
 }
 
 template <class T>
 bool ORecordList<T>::remove( int uid ) {
 	QArray<int> copy( m_ids.count() );
 	int counter = 0;
 	bool ret_val = false;
 
 	for (uint i = 0; i < m_ids.count(); i++){
 		if ( m_ids[i] != uid ){
 			copy[counter++] = m_ids[i];
 
 		}else
 			ret_val = true;
 	}
 
 	copy.resize( counter );
 	m_ids = copy;
 
 
 	return ret_val;
 }
 
 
 #endif
diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h
index b77a4ab..edcd729 100644
--- a/libopie2/opiepim/orecordlist.h
+++ b/libopie2/opiepim/orecordlist.h
@@ -220,81 +220,81 @@ ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids,
     : m_uids( uids ), m_current( 0 ),  m_temp( t ), m_end( false ),
       m_direction( false )
 {
 }
 template <class T>
 uint ORecordListIterator<T>::current()const {
     return m_current;
 }
 template <class T>
 void ORecordListIterator<T>::setCurrent( uint cur ) {
     if( cur < m_uids.count() ) {
 	m_end = false;
 	m_current= cur;
     }
 }
 template <class T>
 uint ORecordListIterator<T>::count()const {
     return m_uids.count();
 }
 template <class T>
 ORecordList<T>::ORecordList( const QArray<int>& ids,
                              const Base* acc )
     : m_ids( ids ), m_acc( acc )
 {
 }
 template <class T>
 ORecordList<T>::~ORecordList() {
 /* nothing to do here */
 }
 template <class T>
 typename ORecordList<T>::Iterator ORecordList<T>::begin() {
     Iterator it( m_ids, m_acc );
     return it;
 }
 template <class T>
 typename ORecordList<T>::Iterator ORecordList<T>::end() {
     Iterator it( m_ids, m_acc );
     it.m_end = true;
     it.m_current = m_ids.count();
 
     return it;
 }
 template <class T>
 uint ORecordList<T>::count()const {
 return m_ids.count();
 }
 template <class T>
 T ORecordList<T>::operator[]( uint i ) {
-    if ( i < 0 || (i+1) > m_ids.count() )
+    if ( i >= m_ids.count() )
         return T();
     /* forward */
     return m_acc->find( m_ids[i], m_ids, i );
 }
 template <class T>
 int ORecordList<T>::uidAt( uint i ) {
     return m_ids[i];
 }
 
 template <class T>
 bool ORecordList<T>::remove( int uid ) {
 	QArray<int> copy( m_ids.count() );
 	int counter = 0;
 	bool ret_val = false;
 
 	for (uint i = 0; i < m_ids.count(); i++){
 		if ( m_ids[i] != uid ){
 			copy[counter++] = m_ids[i];
 
 		}else
 			ret_val = true;
 	}
 
 	copy.resize( counter );
 	m_ids = copy;
 
 
 	return ret_val;
 }
 
 
 #endif