2 files changed, 23 insertions, 2 deletions

diff --git a/libopie/todoevent.cpp b/libopie/todoevent.cpp
index daa25f4..7dbf907 100644
--- a/libopie/todoevent.cpp
+++ b/libopie/todoevent.cpp
@@ -1,44 +1,61 @@
 
 #include <opie/todoevent.h>
 #include <qpe/palmtopuidgen.h>
 #include <qpe/stringutil.h>
-//#include <qpe/palmtoprecord.h>
+#include <qpe/palmtoprecord.h>
 
 ToDoEvent::ToDoEvent(const ToDoEvent &event )
 {
   *this = event;
 }
 
 ToDoEvent::ToDoEvent(bool completed, int priority, const QString &category, 
 	       const QString &description, bool hasDate, QDate date, int uid )
 {
     qWarning("todoEvent c'tor" );
     m_date = date;
     m_isCompleted = completed;
     m_hasDate = hasDate;
     m_priority = priority;
     m_category = category;
     m_desc = Qtopia::simplifyMultiLineSpace(description );
     if (uid == -1 ) {
 	Qtopia::UidGen *uidgen = new Qtopia::UidGen();
 	uid = uidgen->generate();
 	delete uidgen;
     }// generate the ids
     m_uid = uid; 
 }
+QArray<int> ToDoEvent::categories()const
+{
+  QArray<int> array(1); // currently the datebook can be only in one category
+  array = Qtopia::Record::idsFromString( category() );
+  return array;
+}
+bool ToDoEvent::match( const QRegExp &regExp )const
+{
+  if( QString::number( m_priority ).find( regExp ) != -1 ){
+    return true;
+  }else if( m_hasDate && m_date.toString().find( regExp) != -1 ){
+    return true;
+  }else if(m_desc.find( regExp ) != -1 ){
+    return true;
+  }
+  return false;
+}
 bool ToDoEvent::isCompleted() const
 {
     return m_isCompleted;
 }
 bool ToDoEvent::hasDate() const
 {
     return m_hasDate;
 }
 int ToDoEvent::priority()const
 {
     return m_priority;
 }
 QString ToDoEvent::category()const
 {
     return m_category;
 }
@@ -51,33 +68,34 @@ QString ToDoEvent::description()const
     return m_desc;
 }
 void ToDoEvent::setCompleted( bool completed )
 {
     m_isCompleted = completed;
 }
 void ToDoEvent::setHasDate( bool hasDate )
 {
     m_hasDate = hasDate;
 }
 void ToDoEvent::setDescription(const QString &desc )
 {
     m_desc = Qtopia::simplifyMultiLineSpace(desc );
 }
 void ToDoEvent::setCategory( const QString &cat )
 {
-    m_category = cat;
+  qWarning("setCategory %s", cat.latin1() );
+  m_category = cat;
 }
 void ToDoEvent::setPriority(int prio )
 {
     m_priority = prio;
 }
 void ToDoEvent::setDate( QDate date )
 {
     m_date = date;
 }
 bool ToDoEvent::isOverdue( )
 {
     if( m_hasDate )
 	return QDate::currentDate() > m_date;
     return false;
 }
 bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{
diff --git a/libopie/todoevent.h b/libopie/todoevent.h
index bca7f6e..ac996a1 100644
--- a/libopie/todoevent.h
+++ b/libopie/todoevent.h
@@ -4,45 +4,48 @@
 
 #include <qdatetime.h>
 
 class ToDoEvent {
     friend class ToDoDB;
  public:
     enum Priority { VERYHIGH=1, HIGH, NORMAL, LOW, VERYLOW };
     ToDoEvent( bool completed = false, int priority = NORMAL, 
 	       const QString &category = QString::null, 
 	       const QString &description = QString::null , 
 	       bool hasDate = false, QDate date = QDate::currentDate(), int uid = -1 );
     ToDoEvent(const ToDoEvent & );
     bool isCompleted() const;
     bool hasDate() const;
     int priority()const ;
     QString category()const;
+    QArray<int> categories() const;
     QDate date()const;
     QString description()const;
 
     int uid()const { return m_uid;};
     void setCompleted(bool completed );
     void setHasDate( bool hasDate );
     // if the category doesn't exist we will create it 
     void setCategory( const QString &category );
     void setPriority(int priority );
     void setDate( QDate date );
     void setDescription(const QString& );
     bool isOverdue();
 
+    bool match( const QRegExp &r )const;
+
     void setUid(int id) {m_uid = id; };
     bool operator<(const ToDoEvent &toDoEvent )const;
     bool operator<=(const ToDoEvent &toDoEvent )const;
     bool operator!=(const ToDoEvent &toDoEvent )const { return !(*this == toDoEvent); };
     bool operator>(const ToDoEvent &toDoEvent )const;
     bool operator>=(const ToDoEvent &toDoEvent)const;
     bool operator==(const ToDoEvent &toDoEvent )const;
     ToDoEvent &operator=(const ToDoEvent &toDoEvent );
  private:
     class ToDoEventPrivate;
     ToDoEventPrivate *d;
     QDate m_date;
     bool m_isCompleted:1;
     bool m_hasDate:1;
     int m_priority;
     QString m_category;