Merging changes from BRANCH_1_0 to HEAD

1 files changed, 9 insertions, 3 deletions

diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h
index edcd729..5211f57 100644
--- a/libopie2/opiepim/orecordlist.h
+++ b/libopie2/opiepim/orecordlist.h
@@ -9,2 +9,3 @@
 
+class ORecordListIteratorPrivate;
 /**
@@ -73,5 +74,6 @@ private:
     /* d pointer for future versions */
-    class IteratorPrivate;
-    IteratorPrivate *d;
+    ORecordListIteratorPrivate *d;
 };
+
+class ORecordListPrivate;
 /**
@@ -113,3 +115,3 @@ ORecordList( const QArray<int>& ids,
 
-   /** 
+   /**
     * Remove the contact with given uid
@@ -125,2 +127,3 @@ private:
     const Base* m_acc;
+    ORecordListPrivate *d;
 };
@@ -222,2 +225,5 @@ ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids,
 {
+    /* if the list is empty we're already at the end of the list */
+    if (uids.count() == 0 )
+        m_end = true;
 }