1 files changed, 6 insertions, 5 deletions

diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp
index 80b8599..f3b0783 100644
--- a/libopie/pim/otodoaccessxml.cpp
+++ b/libopie/pim/otodoaccessxml.cpp
@@ -440,25 +440,23 @@ public:
             todo.description().left(20 ) :
             todo.summary();
     }
     /**
      * we take the sortorder( switch on it )
      *
      */
     int compareItems( Item d1, Item d2 ) {
-        qWarning("compare items");
         int ret =0;
         OTodoXMLContainer* con1 = (OTodoXMLContainer*)d1;
         OTodoXMLContainer* con2 = (OTodoXMLContainer*)d2;
 
         /* same item */
         if ( con1->todo.uid() == con2->todo.uid() )
             return 0;
-        qWarning("m_sort %d", m_sort );
 
         switch ( m_sort ) {
             /* completed */
         case 0: {
             ret = 0;
             if ( con1->todo.isCompleted() ) ret++;
             if ( con2->todo.isCompleted() ) ret--;
             break;
@@ -482,16 +480,18 @@ public:
             /* deadline */
         case 3: {
             /* either bot got a dueDate
              * or one of them got one
              */
             if ( con1->todo.hasDueDate() &&
                  con2->todo.hasDueDate() )
                 ret = con1->todo.dueDate().daysTo( con2->todo.dueDate() );
+
+
             else if ( con1->todo.hasDueDate() )
                 ret = -1;
             else if ( con2->todo.hasDueDate() )
                 ret = 0;
             break;
         }
         default:
             ret = 0;
@@ -506,31 +506,31 @@ public:
  private:
     bool m_asc;
     int m_sort;
 
 };
 
 QArray<int> OTodoAccessXML::sorted( bool asc,  int sortOrder,
                                     int sortFilter,  int cat ) {
+    qWarning("sorted! %d cat",  cat);
     OTodoXMLVector vector(m_events.count(), asc,sortOrder );
     QMap<int, OTodo>::Iterator it;
     int item = 0;
 
     bool bCat = sortFilter & 1 ? true : false;
-    bool bOver = sortFilter & 0 ? true : false;
     bool bOnly = sortFilter & 2 ? true : false;
     for ( it = m_events.begin(); it != m_events.end(); ++it ) {
 
         /* show category */
-        if ( bCat )
+        if ( bCat && cat != 0)
             if (!(*it).categories().contains( cat ) )
                 continue;
         /* isOverdue but we should not show overdue */
-        if ( (*it).isOverdue() && ( !bOver || !bOnly ) )
+        if ( (*it).isOverdue() &&  !bOnly  )
             continue;
         if ( !(*it).isOverdue() && bOnly )
             continue;
 
 
         OTodoXMLContainer* con = new OTodoXMLContainer();
         con->todo = (*it);
         vector.insert(item, con );
@@ -539,10 +539,11 @@ QArray<int> OTodoAccessXML::sorted( bool asc,  int sortOrder,
     vector.resize( item );
     /* sort it now */
     vector.sort();
     /* now get the uids */
     QArray<int> array( vector.count() );
     for (uint i= 0; i < vector.count(); i++ ) {
         array[i] = ( vector.at(i) )->todo.uid();
     }
+    qWarning("array count = %d %d", array.count(), vector.count() );
     return array;
 };