summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/otodoaccessxml.cpp11
-rw-r--r--libopie2/opiepim/backend/otodoaccessxml.cpp11
2 files changed, 12 insertions, 10 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
@@ -447,3 +447,2 @@ public:
int compareItems( Item d1, Item d2 ) {
- qWarning("compare items");
int ret =0;
@@ -455,3 +454,2 @@ public:
return 0;
- qWarning("m_sort %d", m_sort );
@@ -489,2 +487,4 @@ public:
ret = con1->todo.dueDate().daysTo( con2->todo.dueDate() );
+
+
else if ( con1->todo.hasDueDate() )
@@ -513,2 +513,3 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
int sortFilter, int cat ) {
+ qWarning("sorted! %d cat", cat);
OTodoXMLVector vector(m_events.count(), asc,sortOrder );
@@ -518,3 +519,2 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
bool bCat = sortFilter & 1 ? true : false;
- bool bOver = sortFilter & 0 ? true : false;
bool bOnly = sortFilter & 2 ? true : false;
@@ -523,3 +523,3 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
/* show category */
- if ( bCat )
+ if ( bCat && cat != 0)
if (!(*it).categories().contains( cat ) )
@@ -527,3 +527,3 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
/* isOverdue but we should not show overdue */
- if ( (*it).isOverdue() && ( !bOver || !bOnly ) )
+ if ( (*it).isOverdue() && !bOnly )
continue;
@@ -546,2 +546,3 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
}
+ qWarning("array count = %d %d", array.count(), vector.count() );
return array;
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 80b8599..f3b0783 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -447,3 +447,2 @@ public:
int compareItems( Item d1, Item d2 ) {
- qWarning("compare items");
int ret =0;
@@ -455,3 +454,2 @@ public:
return 0;
- qWarning("m_sort %d", m_sort );
@@ -489,2 +487,4 @@ public:
ret = con1->todo.dueDate().daysTo( con2->todo.dueDate() );
+
+
else if ( con1->todo.hasDueDate() )
@@ -513,2 +513,3 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
int sortFilter, int cat ) {
+ qWarning("sorted! %d cat", cat);
OTodoXMLVector vector(m_events.count(), asc,sortOrder );
@@ -518,3 +519,2 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
bool bCat = sortFilter & 1 ? true : false;
- bool bOver = sortFilter & 0 ? true : false;
bool bOnly = sortFilter & 2 ? true : false;
@@ -523,3 +523,3 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
/* show category */
- if ( bCat )
+ if ( bCat && cat != 0)
if (!(*it).categories().contains( cat ) )
@@ -527,3 +527,3 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
/* isOverdue but we should not show overdue */
- if ( (*it).isOverdue() && ( !bOver || !bOnly ) )
+ if ( (*it).isOverdue() && !bOnly )
continue;
@@ -546,2 +546,3 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
}
+ qWarning("array count = %d %d", array.count(), vector.count() );
return array;