Added remove

2 files changed, 62 insertions, 6 deletions

diff --git a/libopie/pim/orecordlist.h b/libopie/pim/orecordlist.h
index e377447..2f4a5d3 100644
--- a/libopie/pim/orecordlist.h
+++ b/libopie/pim/orecordlist.h
@@ -80,46 +80,51 @@ private:
  */
 template <class T = OPimRecord >
 class ORecordList {
 public:
     typedef OTemplateBase<T> Base;
     typedef ORecordListIterator<T> Iterator;
 
     /**
      * c'tor
      */
     ORecordList () {
     }
-    ORecordList( const QArray<int>& ids,
+ORecordList( const QArray<int>& ids,
                  const Base* );
     ~ORecordList();
 
     /**
      * the first iterator
      */
     Iterator begin();
 
     /**
      * the end
      */
     Iterator end();
 
     /**
      * the number of items in the list
      */
      uint count()const;
 
     T operator[]( uint i );
     int uidAt(uint i );
-     // FIXME implemenent remove
+
+   /** 
+    * Remove the contact with given uid
+    */
+    bool remove( int uid );
+
     /*
       ConstIterator begin()const;
       ConstIterator end()const;
     */
 private:
     QArray<int> m_ids;
     const Base* m_acc;
 };
 
 /* ok now implement it  */
 template <class T>
 ORecordListIterator<T>::ORecordListIterator() {
@@ -150,25 +155,25 @@ template <class T>
 ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) {
     m_uids = it.m_uids;
     m_current = it.m_current;
     m_temp = it.m_temp;
     m_end = it.m_end;
     m_record = it.m_record;
 
     return *this;
 }
 
 template <class T>
 T ORecordListIterator<T>::operator*() {
-    qWarning("operator* %d %d", m_current,  m_uids[m_current] );
+	//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  );
     else
         m_record = T();
 
     return m_record;
 }
 
 template <class T>
 ORecordListIterator<T> &ORecordListIterator<T>::operator++() {
@@ -260,13 +265,36 @@ return m_ids.count();
 }
 template <class T>
 T ORecordList<T>::operator[]( uint i ) {
     if ( i < 0 || (i+1) > 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 e377447..2f4a5d3 100644
--- a/libopie2/opiepim/orecordlist.h
+++ b/libopie2/opiepim/orecordlist.h
@@ -80,46 +80,51 @@ private:
  */
 template <class T = OPimRecord >
 class ORecordList {
 public:
     typedef OTemplateBase<T> Base;
     typedef ORecordListIterator<T> Iterator;
 
     /**
      * c'tor
      */
     ORecordList () {
     }
-    ORecordList( const QArray<int>& ids,
+ORecordList( const QArray<int>& ids,
                  const Base* );
     ~ORecordList();
 
     /**
      * the first iterator
      */
     Iterator begin();
 
     /**
      * the end
      */
     Iterator end();
 
     /**
      * the number of items in the list
      */
      uint count()const;
 
     T operator[]( uint i );
     int uidAt(uint i );
-     // FIXME implemenent remove
+
+   /** 
+    * Remove the contact with given uid
+    */
+    bool remove( int uid );
+
     /*
       ConstIterator begin()const;
       ConstIterator end()const;
     */
 private:
     QArray<int> m_ids;
     const Base* m_acc;
 };
 
 /* ok now implement it  */
 template <class T>
 ORecordListIterator<T>::ORecordListIterator() {
@@ -150,25 +155,25 @@ template <class T>
 ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) {
     m_uids = it.m_uids;
     m_current = it.m_current;
     m_temp = it.m_temp;
     m_end = it.m_end;
     m_record = it.m_record;
 
     return *this;
 }
 
 template <class T>
 T ORecordListIterator<T>::operator*() {
-    qWarning("operator* %d %d", m_current,  m_uids[m_current] );
+	//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  );
     else
         m_record = T();
 
     return m_record;
 }
 
 template <class T>
 ORecordListIterator<T> &ORecordListIterator<T>::operator++() {
@@ -260,13 +265,36 @@ return m_ids.count();
 }
 template <class T>
 T ORecordList<T>::operator[]( uint i ) {
     if ( i < 0 || (i+1) > 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