summaryrefslogtreecommitdiff
path: root/libopie2/opiepim/backend
Side-by-side diff
Diffstat (limited to 'libopie2/opiepim/backend') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/backend/otodoaccesssql.cpp31
-rw-r--r--libopie2/opiepim/backend/otodoaccesssql.h3
2 files changed, 24 insertions, 10 deletions
diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
index a059dab..ea8b3c9 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.cpp
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -242,5 +242,5 @@ namespace {
OTodoAccessBackendSQL::OTodoAccessBackendSQL( const QString& file )
- : OTodoAccessBackend(), m_dict(15)
+ : OTodoAccessBackend(), m_dict(15), m_dirty(true)
{
QString fi = file;
@@ -262,6 +262,5 @@ bool OTodoAccessBackendSQL::load(){
OSQLResult res = m_driver->query(&creat );
- update();
- qWarning("loaded %d", m_uids.count() );
+ m_dirty = true;
return true;
}
@@ -274,4 +273,7 @@ bool OTodoAccessBackendSQL::save(){
}
QArray<int> OTodoAccessBackendSQL::allRecords()const {
+ if (m_dirty )
+ update();
+
return m_uids;
}
@@ -304,5 +306,5 @@ OTodo OTodoAccessBackendSQL::find( int uid, const QArray<int>& ints,
/* reverse */
case 1:
- for (uint i = cur; i >= 0 && size < 8; i-- ) {
+ for (uint i = cur; i != 0 && size < 8; i-- ) {
search[size] = ints[i];
size++;
@@ -343,5 +345,5 @@ bool OTodoAccessBackendSQL::remove( int uid ) {
return false;
- update();
+ m_dirty = true;
return true;
}
@@ -353,5 +355,7 @@ bool OTodoAccessBackendSQL::remove( int uid ) {
bool OTodoAccessBackendSQL::replace( const OTodo& t) {
remove( t.uid() );
- return add(t);
+ bool b= add(t);
+ m_dirty = false; // we changed some stuff but the UID stayed the same
+ return b;
}
QArray<int> OTodoAccessBackendSQL::overDue() {
@@ -370,4 +374,5 @@ QArray<int> OTodoAccessBackendSQL::effectiveToDos( const QDate& s,
QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
int sortFilter, int cat ) {
+ qWarning("sorted %d, %d", asc, sortOrder );
QString query;
query = "select uid from todolist WHERE ";
@@ -422,6 +427,9 @@ QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
break;
}
- if ( !asc )
+
+ if ( !asc ) {
+ qWarning("not ascending!");
query += " DESC";
+ }
qWarning( query );
@@ -502,5 +510,10 @@ void OTodoAccessBackendSQL::fillDict() {
m_dict.insert("AlarmDateTime", new int(OTodo::AlarmDateTime) );
}
-void OTodoAccessBackendSQL::update() {
+/*
+ * need to be const so let's fool the
+ * compiler :(
+ */
+void OTodoAccessBackendSQL::update()const {
+ ((OTodoAccessBackendSQL*)this)->m_dirty = false;
LoadQuery lo;
OSQLResult res = m_driver->query(&lo);
@@ -508,5 +521,5 @@ void OTodoAccessBackendSQL::update() {
return;
- m_uids = uids( res );
+ ((OTodoAccessBackendSQL*)this)->m_uids = uids( res );
}
QArray<int> OTodoAccessBackendSQL::uids( const OSQLResult& res) const{
diff --git a/libopie2/opiepim/backend/otodoaccesssql.h b/libopie2/opiepim/backend/otodoaccesssql.h
index c1aa2ed..0f6dd2c 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.h
+++ b/libopie2/opiepim/backend/otodoaccesssql.h
@@ -33,5 +33,5 @@ public:
private:
- void update();
+ void update()const;
void fillDict();
inline bool date( QDate& date, const QString& )const;
@@ -44,4 +44,5 @@ private:
OSQLDriver* m_driver;
QArray<int> m_uids;
+ bool m_dirty : 1;
};