From f9f0c26d9ac94586ffc36efa1b582ece3dbc43cf Mon Sep 17 00:00:00 2001 From: mickeyl Date: Mon, 23 Feb 2004 13:15:42 +0000 Subject: cosmetics --- (limited to 'libopie2/opiepim/orecordlist.h') diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h index 8f0011b..1742dcc 100644 --- a/libopie2/opiepim/orecordlist.h +++ b/libopie2/opiepim/orecordlist.h @@ -27,15 +27,18 @@ Boston, MA 02111-1307, USA. */ -#ifndef OPIE_RECORD_LIST_H -#define OPIE_RECORD_LIST_H - -#include +#ifndef ORECORDLIST_H +#define ORECORDLIST_H +/* OPIE */ #include #include -namespace Opie { +/* QT */ +#include + +namespace Opie +{ class ORecordListIteratorPrivate; /** @@ -47,9 +50,11 @@ class ORecordListIteratorPrivate; */ template class ORecordList; template -class ORecordListIterator { +class ORecordListIterator +{ friend class ORecordList; -public: + + public: typedef OTemplateBase Base; /** @@ -65,7 +70,7 @@ public: ~ORecordListIterator(); ORecordListIterator( const ORecordListIterator& ); - ORecordListIterator &operator=(const ORecordListIterator& ); + ORecordListIterator &operator=( const ORecordListIterator& ); /** * a * operator ;) @@ -81,47 +86,49 @@ public: /** * the current item */ - uint current()const; + uint current() const; /** * the number of items */ - uint count()const; + uint count() const; /** * sets the current item */ void setCurrent( uint cur ); -private: + private: QArray m_uids; uint m_current; const Base* m_temp; bool m_end : 1; T m_record; - bool m_direction :1; + bool m_direction : 1; /* d pointer for future versions */ ORecordListIteratorPrivate *d; }; + class ORecordListPrivate; /** * The recordlist used as a return type * from OPimAccessTemplate */ template -class ORecordList { -public: +class ORecordList +{ + public: typedef OTemplateBase Base; typedef ORecordListIterator Iterator; /** * c'tor */ - ORecordList () { - } -ORecordList( const QArray& ids, + ORecordList () + {} + ORecordList( const QArray& ids, const Base* ); ~ORecordList(); @@ -138,29 +145,31 @@ ORecordList( const QArray& ids, /** * the number of items in the list */ - uint count()const; + uint count() const; - T operator[]( uint i ); - int uidAt(uint i ); + T operator[] ( uint i ); + int uidAt( uint i ); - /** - * Remove the contact with given uid - */ + /** + * Remove the contact with given uid + */ bool remove( int uid ); /* ConstIterator begin()const; ConstIterator end()const; */ -private: + private: QArray m_ids; const Base* m_acc; ORecordListPrivate *d; }; + /* ok now implement it */ template -ORecordListIterator::ORecordListIterator() { +ORecordListIterator::ORecordListIterator() +{ m_current = 0; m_temp = 0l; m_end = true; @@ -168,14 +177,19 @@ ORecordListIterator::ORecordListIterator() { /* forward */ m_direction = TRUE; } + + template -ORecordListIterator::~ORecordListIterator() { -/* nothing to delete */ +ORecordListIterator::~ORecordListIterator() +{ + /* nothing to delete */ } + template -ORecordListIterator::ORecordListIterator( const ORecordListIterator& it) { -// qWarning("ORecordListIterator copy c'tor"); +ORecordListIterator::ORecordListIterator( const ORecordListIterator& it ) +{ + // qWarning("ORecordListIterator copy c'tor"); m_uids = it.m_uids; m_current = it.m_current; m_temp = it.m_temp; @@ -184,8 +198,10 @@ ORecordListIterator::ORecordListIterator( const ORecordListIterator& it) { m_direction = it.m_direction; } + template -ORecordListIterator &ORecordListIterator::operator=( const ORecordListIterator& it) { +ORecordListIterator &ORecordListIterator::operator=( const ORecordListIterator& it ) +{ m_uids = it.m_uids; m_current = it.m_current; m_temp = it.m_temp; @@ -195,44 +211,57 @@ ORecordListIterator &ORecordListIterator::operator=( const ORecordListIter return *this; } + template -T ORecordListIterator::operator*() { - //qWarning("operator* %d %d", m_current, m_uids[m_current] ); - if (!m_end ) - m_record = m_temp->find( m_uids[m_current], m_uids, m_current, +T ORecordListIterator::operator*() +{ + //qWarning("operator* %d %d", m_current, m_uids[m_current] ); + if ( !m_end ) + m_record = m_temp->find( m_uids[ m_current ], m_uids, m_current, m_direction ? Base::Forward : - Base::Reverse ); + Base::Reverse ); else m_record = T(); return m_record; } + template -ORecordListIterator &ORecordListIterator::operator++() { +ORecordListIterator &ORecordListIterator::operator++() +{ m_direction = true; - if (m_current < m_uids.count() ) { + if ( m_current < m_uids.count() ) + { m_end = false; ++m_current; - }else + } + else m_end = true; return *this; } + + template -ORecordListIterator &ORecordListIterator::operator--() { +ORecordListIterator &ORecordListIterator::operator--() +{ m_direction = false; - if ( m_current > 0 ) { + if ( m_current > 0 ) + { --m_current; m_end = false; - } else + } + else m_end = true; return *this; } + template -bool ORecordListIterator::operator==( const ORecordListIterator& it ) { +bool ORecordListIterator::operator==( const ORecordListIterator& it ) +{ /* if both are at we're the same.... */ if ( m_end == it.m_end ) return true; @@ -243,93 +272,130 @@ bool ORecordListIterator::operator==( const ORecordListIterator& it ) { return true; } + + template -bool ORecordListIterator::operator!=( const ORecordListIterator& it ) { - return !(*this == it ); +bool ORecordListIterator::operator!=( const ORecordListIterator& it ) +{ + return !( *this == it ); } + + template ORecordListIterator::ORecordListIterator( const QArray uids, - const Base* t ) - : m_uids( uids ), m_current( 0 ), m_temp( t ), m_end( false ), - m_direction( false ) + const Base* t ) + : m_uids( uids ), m_current( 0 ), m_temp( t ), m_end( false ), + m_direction( false ) { /* if the list is empty we're already at the end of the list */ - if (uids.count() == 0 ) + if ( uids.count() == 0 ) m_end = true; } + + template -uint ORecordListIterator::current()const { +uint ORecordListIterator::current() const +{ return m_current; } + + template -void ORecordListIterator::setCurrent( uint cur ) { - if( cur < m_uids.count() ) { - m_end = false; - m_current= cur; +void ORecordListIterator::setCurrent( uint cur ) +{ + if ( cur < m_uids.count() ) + { + m_end = false; + m_current = cur; } } template -uint ORecordListIterator::count()const { +uint ORecordListIterator::count() const +{ return m_uids.count(); } + + template ORecordList::ORecordList( const QArray& ids, const Base* acc ) - : m_ids( ids ), m_acc( acc ) -{ -} + : m_ids( ids ), m_acc( acc ) +{} + + template -ORecordList::~ORecordList() { -/* nothing to do here */ +ORecordList::~ORecordList() +{ + /* nothing to do here */ } + + template -typename ORecordList::Iterator ORecordList::begin() { +typename ORecordList::Iterator ORecordList::begin() +{ Iterator it( m_ids, m_acc ); return it; } + + template -typename ORecordList::Iterator ORecordList::end() { +typename ORecordList::Iterator ORecordList::end() +{ Iterator it( m_ids, m_acc ); it.m_end = true; it.m_current = m_ids.count(); return it; } + + template -uint ORecordList::count()const { -return m_ids.count(); +uint ORecordList::count() const +{ + return m_ids.count(); } + + template -T ORecordList::operator[]( uint i ) { +T ORecordList::operator[] ( uint i ) +{ if ( i >= m_ids.count() ) return T(); /* forward */ - return m_acc->find( m_ids[i], m_ids, i ); -} -template -int ORecordList::uidAt( uint i ) { - return m_ids[i]; + return m_acc->find( m_ids[ i ], m_ids, i ); } + template -bool ORecordList::remove( int uid ) { - QArray copy( m_ids.count() ); - int counter = 0; - bool ret_val = false; +int ORecordList::uidAt( uint i ) +{ + return m_ids[ i ]; +} - for (uint i = 0; i < m_ids.count(); i++){ - if ( m_ids[i] != uid ){ - copy[counter++] = m_ids[i]; - }else - ret_val = true; - } +template +bool ORecordList::remove( int uid ) +{ + QArray 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; + copy.resize( counter ); + m_ids = copy; - return ret_val; + return ret_val; } } -- cgit v0.9.0.2