Fixing bug #1501 and preparing for implementation of generic QueryByExample and

sorted for datebook and todo..

13 files changed, 134 insertions, 42 deletions

diff --git a/libopie2/opiepim/ChangeLog b/libopie2/opiepim/ChangeLog
index 564e92a..2007744 100644
--- a/libopie2/opiepim/ChangeLog
+++ b/libopie2/opiepim/ChangeLog
@@ -1,15 +1,17 @@
 2004-12-28  Stefan Eilers <stefan@eilers-online.net>
 	* Make improved query by example accessable via frontend
-	* Some API improvement
+	* Some API documentation improvement
+	* Cleanup of backend api..
+	* Fixing bug #1501
 2004-11-23  Stefan Eilers <stefan@eilers-online.net>
 	* Implement fast and full featured version of sorted() for addressbook
 	* Implement generic queryByExample for all Addressboook backends. It allows incremental search.
 	* Update of API Documentation
 2004-11-18  Holger Freyther  <freyther@handhelds.org>
 	* Every Access can give a set of Occurrences for a period or a datetime
 	* QueryByExample, Find, Sort can be generically accessed by OPimBase 
 	  pointer interface
 	* OPimBackendOccurrence gets split up to OPimOccurrences by 
 	  OPimTemplateBase
 	* Add safeCast to various OPimRecords
 	* Kill memleak in OPimTodo
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend.h b/libopie2/opiepim/backend/ocontactaccessbackend.h
index ee6dbc2..27d70ab 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend.h
@@ -71,31 +71,31 @@ class OPimContactAccessBackend: public OPimAccessBackend<OPimContact> {
      * this case. It is not our problem to handle this conflict ...
      * @return <i>true</i> if the database was changed and if save without reload will
      * be dangerous. <i>false</i> if the database was not changed or it is save to write
      * in this situation.
      */
     virtual bool wasChangedExternally() = 0;
 
     /**
      *  Return all possible settings.
      *  @return All settings provided by the current backend
      * (i.e.: query_WildCards & query_IgnoreCase)
      */
-    virtual const uint querySettings() const;
+    const uint querySettings() const;
 
     /**
      * Check whether settings are correct.
      * @return <i>true</i> if the given settings are correct and possible.
      */
-    virtual bool hasQuerySettings (uint querySettings) const;
+    bool hasQuerySettings (uint querySettings) const;
 
     /** 
      * Advanced search mechanism. 
      */
     UIDArray queryByExample( const UIDArray& uidlist, const OPimContact&, int settings, const QDateTime &d = QDateTime() ) const;
     /**
      * Slow and inefficent default implementation
      */
 //@{
     UIDArray sorted( const UIDArray&, bool asc, int, int, const QArray<int>& )const;
     OPimBackendOccurrence::List occurrences( const QDate&, const QDate& )const;
 //@}
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
index 9375f43..2368865 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
@@ -270,51 +270,53 @@ namespace {
                 + ",'"
                 + it.data()
                 + "');";
         }
         // qu  += "commit;";
         odebug << "add " << qu << "" << oendl;
         return qu;
     }
 
 
     RemoveQuery::RemoveQuery(int uid )
         : OSQLQuery(), m_uid( uid ) {}
+
     RemoveQuery::~RemoveQuery() {}
+
     QString RemoveQuery::query()const {
         QString qu = "DELETE from addressbook where uid = "
             + QString::number(m_uid) + ";";
         qu += "DELETE from custom_data where uid = "
             + QString::number(m_uid) + ";";
         return qu;
     }
 
 
-
-
     FindQuery::FindQuery(int uid)
         : OSQLQuery(), m_uid( uid ) {
     }
     FindQuery::FindQuery(const UIDArray& ints)
         : OSQLQuery(), m_uids( ints ){
     }
     FindQuery::~FindQuery() {
     }
     QString FindQuery::query()const{
-	    if ( m_uids.count() == 0 )
-		    return single();
-	    else
-		    return multi();
+           if ( m_uids.count() == 0 )
+                   return single();
+           else
+                   return multi();
     }
 
+
+
     QString FindQuery::multi()const {
 	    QString qu = "select * from addressbook where";
 	    for (uint i = 0; i < m_uids.count(); i++ ) {
 		    qu += " uid = " + QString::number( m_uids[i] ) + " OR";
 	    }
 	    qu.remove( qu.length()-2, 2 ); // Hmmmm..
 
 	    odebug << "find query: " << qu << "" << oendl;
 	    return qu;
     }
 
     QString FindQuery::single()const{
@@ -519,28 +521,41 @@ OPimContact OPimContactAccessBackend_SQL::find( int uid, const UIDArray& queryUi
     }
 
     //Shrink to real size..
     searchList.resize( size );
 
     OPimContact retContact( requestContactsAndCache( uid, searchList ) );
 
     odebug << "OPimContactAccessBackend_SQL::find( ..multi.. ) needed: " << t.elapsed() << " ms" << oendl;
     return retContact;
 }
 
 
-UIDArray OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &query, int settings, 
+UIDArray OPimContactAccessBackend_SQL::queryByExample ( const UIDArray& uidlist, const OPimContact &query, int settings, 
 							   const QDateTime& qd ) const
 {
     QString qu = "SELECT uid FROM addressbook WHERE";
+
+    // Just add uid's selection if we really try to search in a subset of all uids! Otherwise this would
+    // just take time and memory!
+    if ( uidlist.count() != m_uids.count() ) {
+	    qu += " (";
+
+	    for ( uint i = 0; i < uidlist.count(); i++ ) {
+		    qu += " uid = " + QString::number( uidlist[i] ) + " OR";
+	    }
+	    qu.remove( qu.length()-2, 2 ); // Hmmmm..
+	    qu += " ) AND ";
+    }
+
     QString searchQuery ="";
 
     QDate startDate;
 
     if ( qd.isValid() )
         startDate = qd.date();
     else
         startDate = QDate::currentDate();
 
 
     QMap<int, QString> queryFields = query.toMap();
     QStringList fieldList = OPimContactFields::untrfields( false );
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.h b/libopie2/opiepim/backend/ocontactaccessbackend_sql.h
index 299c175..1cf1185 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.h
@@ -66,25 +66,25 @@ class OPimContactAccessBackend_SQL : public OPimContactAccessBackend {
 
 	bool load ();
 
 	void clear ();
 
 	bool wasChangedExternally();
 
 	UIDArray allRecords() const;
 
 	OPimContact find( int uid ) const;
 	OPimContact find( int uid, const UIDArray& items, uint cur, Frontend::CacheDirection ) const; 
 
-	UIDArray queryByExample ( const OPimContact &query, int settings, 
+	UIDArray queryByExample ( const UIDArray& uidlist, const OPimContact &query, int settings, 
 				     const QDateTime& d ) const;
 
 	UIDArray matchRegexp(  const QRegExp &r ) const;
 
 	const uint querySettings() const;
 
 	bool hasQuerySettings (uint querySettings) const;
 
 	UIDArray sorted( const UIDArray& ar, bool asc, int sortOrder,
 			 int filter, const QArray<int>& categories)const;	
 
  	bool add ( const OPimContact &newcontact );
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend.cpp b/libopie2/opiepim/backend/odatebookaccessbackend.cpp
index 73c7059..e44912a 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend.cpp
+++ b/libopie2/opiepim/backend/odatebookaccessbackend.cpp
@@ -91,48 +91,65 @@ ODateBookAccessBackend::ODateBookAccessBackend()
 ODateBookAccessBackend::~ODateBookAccessBackend() {
 
 }
 OPimBackendOccurrence::List ODateBookAccessBackend::occurrences( const QDate& from,
                                                                  const QDate& to )const {
     OPimBackendOccurrence::List tmpList;
 
     events( tmpList, directNonRepeats(), from, to );
     repeat( tmpList, directRawRepeats(),from,to );
 
     return tmpList;
 }
-OPimBackendOccurrence::List ODateBookAccessBackend::occurrences( const QDateTime& dt )const {
+
+OPimBackendOccurrence::List ODateBookAccessBackend::occurrences( const QDateTime& dt )const 
+{
     OPimBackendOccurrence::List day = occurrences( dt.date(), dt.date() );
 
     return filterOccurrences( day, dt );
 }
 
 OPimBackendOccurrence::List ODateBookAccessBackend::effectiveNonRepeatingEvents( const QDate& from,
-                                                                                 const QDate& to )const {
+                                                                                 const QDate& to )const 
+{
     OPimBackendOccurrence::List tmpList;
     OPimEvent::ValueList list = directNonRepeats();
 
     events( tmpList, list, from, to );
 
     return tmpList;
 }
 
-OPimBackendOccurrence::List ODateBookAccessBackend::effectiveNonRepeatingEvents( const QDateTime& dt )const {
+OPimBackendOccurrence::List ODateBookAccessBackend::effectiveNonRepeatingEvents( const QDateTime& dt )const 
+{
     OPimBackendOccurrence::List day = effectiveNonRepeatingEvents( dt.date(), dt.date() );
     return filterOccurrences( day,dt );
 }
 
+const uint ODateBookAccessBackend::querySettings() const
+{
+	return 0;
+}
+
+bool ODateBookAccessBackend::hasQuerySettings (uint querySettings) const
+{
+	return false;
+}
+
+
 
-UIDArray ODateBookAccessBackend::queryByExample( const OPimEvent&, int settings,
-                                                 const QDateTime& d )const {
+UIDArray ODateBookAccessBackend::queryByExample( const UIDArray& uidlist, const OPimEvent&, int settings,
+                                                 const QDateTime& d )const 
+{
+	qDebug( "Accessing ODateBookAccessBackend::queryByExample() which is not implemented!" );
     return UIDArray();
 }
 
 UIDArray ODateBookAccessBackend::sorted( const UIDArray&, bool asc, int, int, const QArray<int>& )const {
     return UIDArray();
 }
 
 OPimBackendOccurrence::List ODateBookAccessBackend::filterOccurrences( const OPimBackendOccurrence::List dayList,
                                                                        const QDateTime& dt ) {
     OPimBackendOccurrence::List tmpList;
     OPimBackendOccurrence::List::ConstIterator it;
 
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend.h b/libopie2/opiepim/backend/odatebookaccessbackend.h
index 8927ca1..91f63aa 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend.h
+++ b/libopie2/opiepim/backend/odatebookaccessbackend.h
@@ -85,25 +85,38 @@ public:
     /**
      * this is an overloaded member function
      * @see effectiveNonRepeatingEvents( const QDate& from, const QDate& to )
      */
     virtual OPimBackendOccurrence::List effectiveNonRepeatingEvents( const QDateTime& start )const;
 
     /**
      * Common and probably inefficent implementation
      * for queryByExample, sorted
      * and occurrences
      */
 //@{
-    UIDArray queryByExample( const OPimEvent&, int settings, const QDateTime& d = QDateTime() )const;
+    /**
+     *  Return all possible settings.
+     *  @return All settings provided by the current backend
+     * (i.e.: query_WildCards & query_IgnoreCase)
+     */
+    const uint querySettings() const;
+
+    /**
+     * Check whether settings are correct.
+     * @return <i>true</i> if the given settings are correct and possible.
+     */
+    bool hasQuerySettings (uint querySettings) const;
+
+    UIDArray queryByExample( const UIDArray& uidlist, const OPimEvent&, int settings, const QDateTime& d = QDateTime() )const;
     UIDArray sorted( const UIDArray&, bool asc, int, int, const QArray<int>& )const;
     OPimBackendOccurrence::List occurrences( const QDate&, const QDate& end )const;
     OPimBackendOccurrence::List occurrences( const QDateTime& )const;
 //@}
 
 protected:
     static OPimBackendOccurrence::List filterOccurrences(const OPimBackendOccurrence::List,
                                                          const QDateTime& time );
 private:
     class Private;
     Private *d;
 
diff --git a/libopie2/opiepim/backend/opimaccessbackend.h b/libopie2/opiepim/backend/opimaccessbackend.h
index 7321758..6666fd6 100644
--- a/libopie2/opiepim/backend/opimaccessbackend.h
+++ b/libopie2/opiepim/backend/opimaccessbackend.h
@@ -66,40 +66,40 @@ public:
     virtual void clear() = 0;
     //@}
 
     //@{
     // FIXME: Uncommented some of the abstract functions below. This should be removed as they are implemented in 
     // all typespecifc backenends (eilers) 
     /**
      *  Return all possible settings for queryByExample()
      *  @return All settings provided by the current backend
      *  (i.e.: query_WildCards & query_IgnoreCase)
      *  See implementation in the specific backends for contacts, todo and dates.
      */
-    virtual const uint querySettings() const { return 0; } /* FIXME: Make Abstrakt !! = 0; */ 
+    virtual const uint querySettings() const = 0;
 
     /**
      * Check whether settings are correct for queryByExample()
      * See implementation in the specific backends for OPimContactAccess, OPimTodoAccess and ODateBookAccess.
      * @return <i>true</i> if the given settings are correct and possible.
      */
-    virtual bool hasQuerySettings (uint querySettings) const { return false; } /* FIXME: Make Abstrakt !! = 0; */
+    virtual bool hasQuerySettings (uint querySettings) const = 0;
     //@}
 
 
     //@{
     virtual UIDArray allRecords()const = 0;
     virtual UIDArray matchRegexp(const QRegExp &r) const;
     virtual UIDArray queryByExample( const UIDArray&, const T& t, 
-				     int settings, const QDateTime& d = QDateTime() )const  { return UIDArray(); } /* FIXME: Make Abstrakt !! = 0; */
+				     int settings, const QDateTime& d = QDateTime() )const = 0;
     virtual UIDArray queryByExample( const T& t, int settings, const QDateTime& d = QDateTime() )const;
     virtual UIDArray queryByExample( const OPimRecord* rec, int settings, const QDateTime& d = QDateTime() )const;
     virtual UIDArray sorted( const UIDArray&, bool asc, int sortOrder, int sortFilter,  const QArray<int>& cats )const = 0;
     virtual UIDArray sorted( bool asc, int sortOrder, int sortFilter, const QArray<int>& cats )const;
     virtual OPimBackendOccurrence::List occurrences( const QDate& start, const QDate& end)const;
     virtual OPimBackendOccurrence::List occurrences( const QDateTime& dt )const;
     //@}
 
 
     //@{
     virtual T find(UID uid )const  = 0;
     virtual T find(UID uid, const QArray<UID>& items,
diff --git a/libopie2/opiepim/backend/otodoaccessbackend.cpp b/libopie2/opiepim/backend/otodoaccessbackend.cpp
index 5f86be9..f979976 100644
--- a/libopie2/opiepim/backend/otodoaccessbackend.cpp
+++ b/libopie2/opiepim/backend/otodoaccessbackend.cpp
@@ -33,27 +33,53 @@
 
 #include <qintdict.h>
 
 namespace Opie {
 OPimTodoAccessBackend::OPimTodoAccessBackend()
     : OPimAccessBackend<OPimTodo>()
 {
 }
 OPimTodoAccessBackend::~OPimTodoAccessBackend() {
 
 }
 
-UIDArray OPimTodoAccessBackend::queryByExample( const OPimTodo&, int settings,
-                                                 const QDateTime& d)const {
-    return UIDArray();
+const uint OPimTodoAccessBackend::querySettings() const
+{
+	return 0;
+}
+
+bool OPimTodoAccessBackend::hasQuerySettings (uint querySettings) const
+{
+	return false;
+}
+
+
+UIDArray OPimTodoAccessBackend::queryByExample( const UIDArray& uidlist, const OPimTodo& query, int settings,
+                                                 const QDateTime& endperiod )const 
+{
+	qDebug( "Accessing OPimTodoAccessBackend::queryByExample() which is not implemented!" );
+	return UIDArray();
+    
+//     odebug << "Using Unaccelerated OPimContactAccessBackend implementation of queryByExample!" << oendl;
+
+//     UIDArray m_currentQuery( uid_array.count() );
+//     uint arraycounter = 0;
+
+//     for( uint it = 0; it < uid_array.count(); ++it ){
+// 	    /* Search all fields and compare them with query object. Store them into list
+// 	     * if all fields matches.
+// 	     */
+//     }
+
+
 }
 
 UIDArray OPimTodoAccessBackend::sorted( const UIDArray& events, bool asc,
                                         int sortOrder, int sortFilter,
                                         const QArray<int>& categories )const {
     odebug << "Using Unaccelerated TodoList sorted Implementation" << oendl;
     Internal::OPimTodoSortVector vector(events.count(), asc,sortOrder );
     int item = 0;
 
     bool bCat = sortFilter  & OPimTodoAccess::FilterCategory ? true : false;
     bool bOnly = sortFilter & OPimTodoAccess::OnlyOverDue ? true : false;
     bool comp = sortFilter  & OPimTodoAccess::DoNotShowCompleted ? true : false;
diff --git a/libopie2/opiepim/backend/otodoaccessbackend.h b/libopie2/opiepim/backend/otodoaccessbackend.h
index 66297bb..870ee57 100644
--- a/libopie2/opiepim/backend/otodoaccessbackend.h
+++ b/libopie2/opiepim/backend/otodoaccessbackend.h
@@ -42,25 +42,38 @@ public:
     virtual UIDArray effectiveToDos( const QDate& start,
                                      const QDate& end,
                                      bool includeNoDates )const = 0;
     virtual UIDArray overDue()const = 0;
     virtual void removeAllCompleted() = 0;
 
     /**
      * Common and probably inefficent implementation
      * for queryByExample, matchRegexp, sorted
      * and occurrences
      */
     //@{
-    UIDArray queryByExample( const OPimTodo&, int settings, const QDateTime& d = QDateTime() )const;
+    /**
+     *  Return all possible settings.
+     *  @return All settings provided by the current backend
+     * (i.e.: query_WildCards & query_IgnoreCase)
+     */
+    const uint querySettings() const;
+
+    /**
+     * Check whether settings are correct.
+     * @return <i>true</i> if the given settings are correct and possible.
+     */
+    bool hasQuerySettings (uint querySettings) const;
+
+    UIDArray queryByExample( const UIDArray& uidlist, const OPimTodo& query, int settings, const QDateTime& endperiod = QDateTime() )const;
     UIDArray sorted( const UIDArray&, bool asc, int, int, const QArray<int>& )const;
     OPimBackendOccurrence::List occurrences( const QDate&, const QDate& )const;
     //@}
 
 private:
     class Private;
     Private *d;
 
 };
 }
 
 
diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
index 2bcab29..70e40e4 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.cpp
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -292,47 +292,57 @@ namespace {
             + ",'"
             + it.data()
             + "');";
     }
 
 
         odebug << "add " << qu << "" << oendl;
         return qu;
     }
 
     RemoveQuery::RemoveQuery(int uid )
         : OSQLQuery(), m_uid( uid ) {}
+
     RemoveQuery::~RemoveQuery() {}
+
     QString RemoveQuery::query()const {
         QString qu = "DELETE FROM todolist WHERE uid = " + QString::number(m_uid) + " ;";
-    qu += "DELETE FROM custom_data WHERE uid = " + QString::number(m_uid);
+	qu += "DELETE FROM custom_data WHERE uid = " + QString::number(m_uid);
         return qu;
     }
 
 
     ClearQuery::ClearQuery()
         : OSQLQuery() {}
     ClearQuery::~ClearQuery() {}
-    QString ClearQuery::query()const {
-        QString qu = "drop table todolist";
-        return qu;
+    QString ClearQuery::query()const 
+    {
+	    QString qu = "drop table todolist";
+	    return qu;
     }
+
     FindQuery::FindQuery(int uid)
-        : OSQLQuery(), m_uid(uid ) {
+        : OSQLQuery(), m_uid(uid ) 
+    {
     }
+    
     FindQuery::FindQuery(const QArray<int>& ints)
-        : OSQLQuery(), m_uids(ints){
+	    : OSQLQuery(), m_uids(ints)
+    {
     }
-    FindQuery::~FindQuery() {
+
+    FindQuery::~FindQuery() 
+    {
     }
+
     QString FindQuery::query()const{
         if (m_uids.count() == 0 )
             return single();
         else
             return multi();
     }
     QString FindQuery::single()const{
         QString qu = "select * from todolist where uid = " + QString::number(m_uid);
         return qu;
     }
     QString FindQuery::multi()const {
         QString qu = "select * from todolist where ";
@@ -439,28 +449,28 @@ bool OPimTodoAccessBackendSQL::reload(){
     return load();
 }
 
 bool OPimTodoAccessBackendSQL::save(){
     return m_driver->close();  // Shouldn't m_driver->sync be better than close ? (eilers)
 }
 QArray<int> OPimTodoAccessBackendSQL::allRecords()const {
     if (m_dirty )
         update();
 
     return m_uids;
 }
-QArray<int> OPimTodoAccessBackendSQL::queryByExample( const OPimTodo& , int, const QDateTime& ){
-    QArray<int> ints(0);
-    return ints;
-}
+// QArray<int> OPimTodoAccessBackendSQL::queryByExample( const UIDArray& uidlist, const OPimTodo& , int, const QDateTime& ){
+//     QArray<int> ints(0);
+//     return ints;
+// }
 OPimTodo OPimTodoAccessBackendSQL::find(int uid ) const{
     FindQuery query( uid );
     return parseResultAndCache( uid, m_driver->query(&query) );
 }
 
 // Remember: uid is already in the list of uids, called ints !
 OPimTodo OPimTodoAccessBackendSQL::find( int uid, const QArray<int>& ints,
                                    uint cur, Frontend::CacheDirection dir ) const{
     uint CACHE = readAhead();
     odebug << "searching for " << uid << "" << oendl;
     QArray<int> search( CACHE );
     uint size =0;
@@ -610,25 +620,25 @@ QArray<int> OPimTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
     if ( !asc )
         query += " DESC";
 
 
     odebug << query << oendl;
     OSQLRawQuery raw(query );
     return uids( m_driver->query(&raw) );
 }
 #endif
 
 
 bool OPimTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{
-    if ( str == "0-0-0" )
+    if ( str == "0000-00-00" )
         return false;
     else{
         int day, year, month;
         QStringList list = QStringList::split("-", str );
         year = list[0].toInt();
         month = list[1].toInt();
         day = list[2].toInt();
         da.setYMD( year, month, day );
         return true;
     }
 }
 
diff --git a/libopie2/opiepim/backend/otodoaccesssql.h b/libopie2/opiepim/backend/otodoaccesssql.h
index 0ba8f3a..ac3476a 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.h
+++ b/libopie2/opiepim/backend/otodoaccesssql.h
@@ -44,25 +44,25 @@ class OSQLResultItem;
 namespace Opie {
 
 class OPimTodoAccessBackendSQL : public OPimTodoAccessBackend {
 public:
     OPimTodoAccessBackendSQL( const QString& file );
     ~OPimTodoAccessBackendSQL();
 
     bool load();
     bool reload();
     bool save();
     QArray<UID> allRecords()const;
 
-    QArray<UID> queryByExample( const OPimTodo& t, int settings, const QDateTime& d = QDateTime() );
+/*     QArray<UID> queryByExample( const UIDArray& uidlist, const OPimTodo& t, int settings, const QDateTime& d = QDateTime() ); */
     OPimTodo find(UID uid)const;
     OPimTodo find(UID uid, const QArray<int>&, uint cur, Frontend::CacheDirection )const;
     void clear();
     bool add( const OPimTodo& t );
     bool remove( UID uid );
     bool replace( const OPimTodo& t );
 
     QArray<UID> overDue()const;
     QArray<UID> effectiveToDos( const QDate& start,
                                 const QDate& end, bool includeNoDates )const;
     QArray<UID> matchRegexp(  const QRegExp &r ) const;
     void removeAllCompleted();
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 273f91a..ab50604 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -317,28 +317,25 @@ bool OPimTodoAccessXML::save() {
 }
 QArray<int> OPimTodoAccessXML::allRecords()const {
     QArray<int> ids( m_events.count() );
     QMap<int, OPimTodo>::ConstIterator it;
     int i = 0;
 
     for ( it = m_events.begin(); it != m_events.end(); ++it )
         ids[i++] = it.key();
 
 
     return ids;
 }
-QArray<int> OPimTodoAccessXML::queryByExample( const OPimTodo&, int, const QDateTime& ) {
-    QArray<int> ids(0);
-    return ids;
-}
+
 OPimTodo OPimTodoAccessXML::find( int uid )const {
     OPimTodo todo;
     todo.setUid( 0 ); // isEmpty()
     QMap<int, OPimTodo>::ConstIterator it = m_events.find( uid );
     if ( it != m_events.end() )
         todo = it.data();
 
     return todo;
 }
 void OPimTodoAccessXML::clear() {
     if (m_opened )
         m_changed = true;
diff --git a/libopie2/opiepim/backend/otodoaccessxml.h b/libopie2/opiepim/backend/otodoaccessxml.h
index 134a21a..8a71bb7 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.h
+++ b/libopie2/opiepim/backend/otodoaccessxml.h
@@ -43,25 +43,24 @@ public:
      * fileName if Empty we will use the default path
      */
     OPimTodoAccessXML( const QString& appName,
                     const QString& fileName = QString::null );
     ~OPimTodoAccessXML();
 
     bool load();
     bool reload();
     bool save();
 
     QArray<int> allRecords()const;
     QArray<int> matchRegexp(const QRegExp &r) const;
-    QArray<int> queryByExample( const OPimTodo&, int querysettings, const QDateTime& d = QDateTime() );
     OPimTodo find( int uid )const;
     void clear();
     bool add( const OPimTodo& );
     bool remove( int uid );
     void removeAllCompleted();
     bool replace( const OPimTodo& );
 
     /* our functions */
     QArray<int> effectiveToDos( const QDate& start,
                                 const QDate& end,
                                 bool includeNoDates )const;
     QArray<int> overDue()const;