Moved getEvent(uid) into some hack DateBookDBHack::eventByUID(uid) in the datbeook that might work as long as the QDate implementation are not chnaged.

4 files changed, 29 insertions, 18 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 97c305c..c23129a 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -1,967 +1,988 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 ** $Id$
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_FD
 
 #include "datebook.h"
 #include "datebookday.h"
 #include "datebooksettings.h"
 #include "datebookweek.h"
 #include "datebookweeklst.h"
 #include "dateentryimpl.h"
 
 #include <qpe/datebookmonth.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/qpedebug.h>
 #include <qpe/event.h>
 #include <qpe/finddialog.h>
 #include <qpe/ir.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/timestring.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/tzselect.h>
 #include <qpe/xmlreader.h>
 
 #include <qaction.h>
 #include <qcopchannel_qws.h>
 #include <qdatetime.h>
 #include <qdialog.h>
 #include <qfile.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qtextcodec.h>
 #include <qtextstream.h>
 #include <qtl.h>
 #include <qwidgetstack.h>
 #include <qwindowsystem_qws.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 
 #define DAY 1
 #define WEEK 2
 #define WEEKLST 4
 #define MONTH 3
 
 
 DateBook::DateBook( QWidget *parent, const char *, WFlags f )
     : QMainWindow( parent, "datebook", f ),
       aPreset( FALSE ),
       presetTime( -1 ),
       startTime( 8 ), // an acceptable default
       syncing(FALSE),
       inSearch(FALSE)
 {
     QTime t;
     t.start();
-    db = new DateBookDB;
+    db = new DateBookDBHack;
     qDebug("loading db t=%d", t.elapsed() );
     loadSettings();
     setCaption( tr("Calendar") );
     setIcon( Resource::loadPixmap( "datebook_icon" ) );
 
     setToolBarsMovable( FALSE );
 
     views = new QWidgetStack( this );
     setCentralWidget( views );
 
     dayView = 0;
     weekView = 0;
     weekLstView = 0;
     monthView = 0;
 
     QPEToolBar *bar = new QPEToolBar( this );
     bar->setHorizontalStretchable( TRUE );
 
     QPEMenuBar *mb = new QPEMenuBar( bar );
     mb->setMargin( 0 );
 
     QPEToolBar *sub_bar = new QPEToolBar(this);
 
     QPopupMenu *view = new QPopupMenu( this );
     QPopupMenu *settings = new QPopupMenu( this );
 
     mb->insertItem( tr( "View" ), view );
     mb->insertItem( tr( "Settings" ), settings );
 
     QActionGroup *g = new QActionGroup( this );
     g->setExclusive( TRUE );
 
     QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ),
                               QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
     a->addTo( sub_bar );
 
     a = new QAction( tr( "Today" ), Resource::loadPixmap( "to_day" ),  QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( slotToday() ) );
     a->addTo( sub_bar );
     a->addTo( view );
    
     a = new QAction( tr( "Day" ), Resource::loadPixmap( "day" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewDay() ) );
     a->addTo( sub_bar );
     a->addTo( view );
     a->setToggleAction( TRUE );
     a->setOn( TRUE );
     dayAction = a;
 
     a = new QAction( tr( "Week" ), Resource::loadPixmap( "week" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewWeek() ) );
     a->addTo( sub_bar );
     a->addTo( view );
     a->setToggleAction( TRUE );
     weekAction = a;
 
     a = new QAction( tr( "WeekLst" ), Resource::loadPixmap( "weeklst" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewWeekLst() ) );
     a->addTo( sub_bar );
     a->addTo( view );
     a->setToggleAction( TRUE );
     weekLstAction = a;
 
     a = new QAction( tr( "Month" ), Resource::loadPixmap( "month" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewMonth() ) );
     a->addTo( sub_bar );
     a->addTo( view );
     a->setToggleAction( TRUE );
     monthAction = a;
 
     a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );
     a->addTo( sub_bar );
 
     a = new QAction( tr( "Alarm and Start Time..." ), QString::null, 0, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) );
     a->addTo( settings );
 
     QPopupMenu *default_view = new QPopupMenu(this);
     settings->insertItem( tr( "Default View" ),default_view );
     default_view->setCheckable(TRUE);
 
     Config config("DateBook");
     config.setGroup("Main");
     int current=config.readNumEntry("defaultview", DAY);
     
     QActionGroup *ag = new QActionGroup(this);
     a = new QAction( tr( "Day" ), QString::null, 0, 0, 0, true );
     if (current==DAY) a->setOn(true), viewDay();
     ag->insert(a);
     a = new QAction( tr( "Week" ), QString::null, 0, 0, 0, true );
     if (current==WEEK) a->setOn(true), viewWeek();
     ag->insert(a);
     a = new QAction( tr( "WeekLst" ), QString::null, 0, 0, 0, true );
     if (current==WEEKLST) a->setOn(true), viewWeekLst();
     ag->insert(a);
     a = new QAction( tr( "Month" ), QString::null, 0, 0, 0, true );
     if (current==MONTH) a->setOn(true), viewMonth();
     ag->insert(a);
     
     ag->addTo(default_view);
     connect(ag, SIGNAL( selected ( QAction * ) ), 
 	    this, SLOT( newDefaultView(QAction *) ) 
 	    );
     
     connect( qApp, SIGNAL(clockChanged(bool)),
              this, SLOT(changeClock(bool)) );
     connect( qApp, SIGNAL(weekChanged(bool)),
              this, SLOT(changeWeek(bool)) );
     
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
 	     this, SLOT(appMessage(const QCString&, const QByteArray&)) );
 #endif
     
     // listen on QPE/System
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
     QCopChannel *channel = new QCopChannel( "QPE/System", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
 	     this, SLOT(receive(const QCString&, const QByteArray&)) );
     channel = new QCopChannel( "QPE/Datebook", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
 	     this, SLOT(receive(const QCString&, const QByteArray&)) );
     qDebug("olle\n"); 
 #endif
 #endif
     
     qDebug("done t=%d", t.elapsed() );
 
 }
 
 void DateBook::receive( const QCString &msg, const QByteArray &data )
 {
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "timeChange(QString)" ) {
 	// update active view!
 	if ( dayAction->isOn() )
 	    viewDay();
 	else if ( weekAction->isOn() )
 	    viewWeek();
 	else if ( monthAction->isOn() )
 	    viewMonth();
     }
     else if (msg == "editEvent(int)") {
 	int uid;
 	stream >> uid;
-	Event e=db->getEvent(uid);
+	Event e=db->eventByUID(uid);
 	editEvent(e);
     }
 }
 
 DateBook::~DateBook()
 {
 }
 
 void DateBook::slotSettings()
 {
     DateBookSettings frmSettings( ampm, this );
     frmSettings.setStartTime( startTime );
     frmSettings.setAlarmPreset( aPreset, presetTime );
 #if defined (Q_WS_QWS) || defined(_WS_QWS_)
     frmSettings.showMaximized();
 #endif
 
     if ( frmSettings.exec() ) {
 	aPreset = frmSettings.alarmPreset();
 	presetTime = frmSettings.presetTime();
 	startTime = frmSettings.startTime();
 	if ( dayView )
 	    dayView->setStartViewTime( startTime );
 	if ( weekView )
 	    weekView->setStartViewTime( startTime );
 	saveSettings();
 
 	// make the change obvious
 	if ( views->visibleWidget() ) {
 	    if ( views->visibleWidget() == dayView )
 		dayView->redraw();
 	    else if ( views->visibleWidget() == weekView )
 		weekView->redraw();
 	}
     }
 }
 
 void DateBook::fileNew()
 {
     slotNewEventFromKey("");
 }
 
 QString DateBook::checkEvent(const Event &e)
 {
     /* check if overlaps with itself */
     bool checkFailed = FALSE;
 
     /* check the next 12 repeats. should catch most problems */
     QDate current_date = e.start().date();
     Event previous = e;
     for(int i = 0; i < 12; i++)
     {
 	QDateTime next;
 	if (!nextOccurance(previous, current_date.addDays(1), next)) {
 	    break;  // no more repeats
 	}
 	if(next < previous.end()) {
 	    checkFailed = TRUE;
 	    break;
 	}
 	current_date = next.date();
     }
 
     if(checkFailed)
 	return tr("Event duration is potentially longer\n"
 		  "than interval between repeats.");
 
     return QString::null;
 }
 
 QDate DateBook::currentDate()
 {
     QDate d = QDate::currentDate();
     
     if ( dayView && views->visibleWidget() == dayView ) {
 	d = dayView->date();
     } else if ( weekView && views->visibleWidget() == weekView ) {
         d = weekView->date();
     } else if ( weekLstView && views->visibleWidget() == weekLstView ) {
         d = weekLstView->date();
     } else if ( monthView && views->visibleWidget() == monthView ) {
 	d = monthView->selectedDate();
     }
 
     return d;
 }
 
 void DateBook::view(int v, const QDate &d) {
     if (v==DAY) {
 	initDay();
 	dayAction->setOn( TRUE );
 	dayView->setDate( d );
 	views->raiseWidget( dayView );
 	dayView->redraw();
     } else if (v==WEEK) {
 	initWeek();
 	weekAction->setOn( TRUE );
 	weekView->setDate( d );
 	views->raiseWidget( weekView );
 	weekView->redraw();
     } else if (v==WEEKLST) {
 	initWeekLst();
 	weekLstAction->setOn( TRUE );
 	weekLstView->setDate(d);
 	views->raiseWidget( weekLstView );
 	weekLstView->redraw();
     } else if (v==MONTH) {
 	initMonth();
 	monthAction->setOn( TRUE );
 	monthView->setDate( d.year(), d.month(), d.day() );
 	views->raiseWidget( monthView );
 	monthView->redraw();
     }
 }
 
 void DateBook::viewDefault(const QDate &d) {
   Config config("DateBook");
   config.setGroup("Main");
   int current=config.readNumEntry("defaultview", DAY);
 
   view(current,d);
 }
 
 void DateBook::viewDay() {
   view(DAY,currentDate());
 }
 
 void DateBook::viewWeek() {
     view(WEEK,currentDate());
 }
 
 void DateBook::viewWeekLst() {
     view(WEEKLST,currentDate());
 }
 
 void DateBook::viewMonth() {
     view(MONTH,currentDate());
 }
 
 void DateBook::editEvent( const Event &e )
 {
     if (syncing) {
 	QMessageBox::warning( this, tr("Calendar"),
 	                      tr( "Can not edit data, currently syncing") );
 	return;
     }
 
     // workaround added for text input.
     QDialog editDlg( this, 0, TRUE );
     DateEntry *entry;
     editDlg.setCaption( tr("Edit Event") );
     QVBoxLayout *vb = new QVBoxLayout( &editDlg );
     QScrollView *sv = new QScrollView( &editDlg, "scrollview" );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     // KLUDGE!!!
     sv->setHScrollBarMode( QScrollView::AlwaysOff );
     vb->addWidget( sv );
     entry = new DateEntry( onMonday, e, ampm, &editDlg, "editor" );
     entry->timezone->setEnabled( FALSE );
     sv->addChild( entry );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     editDlg.showMaximized();
 #endif
     while (editDlg.exec() ) {
 	Event newEv = entry->event();
 	newEv.setUid(e.uid()); // FIXME: Hack not to clear uid
 	QString error = checkEvent(newEv);
 	if (!error.isNull()) {
 	    if (QMessageBox::warning(this, "error box",
 				     error, "Fix it", "Continue", 
 				     0, 0, 1) == 0)
 		continue;
 	}
 	db->editEvent(e, newEv);
 	emit newEvent();
 	break;
     }
 }
 
 void DateBook::removeEvent( const Event &e )
 {
     if (syncing) {
 	QMessageBox::warning( this, tr("Calendar"),
 	                      tr( "Can not edit data, currently syncing") );
 	return;
     }
 
     QString strName = e.description();
 
     if ( !QPEMessageBox::confirmDelete( this, tr( "Calendar" ),strName ) )
 	return;
 
     db->removeEvent( e );
     if ( views->visibleWidget() == dayView && dayView )
         dayView->redraw();
 }
 
 void DateBook::addEvent( const Event &e )
 {
     QDate d = e.start().date();
     initDay();
     dayView->setDate( d );
 }
 
 void DateBook::showDay( int year, int month, int day )
 {
     QDate d(year, month, day);
     view(DAY,d);
 }
 
 void DateBook::initDay()
 {
     if ( !dayView ) {
 	dayView = new DateBookDay( ampm, onMonday, db, views, "day view" );
 	views->addWidget( dayView, DAY );
 	dayView->setStartViewTime( startTime );
 	connect( this, SIGNAL( newEvent() ),
 		 dayView, SLOT( redraw() ) );
 	connect( dayView, SIGNAL( newEvent() ),
 		 this, SLOT( fileNew() ) );
 	connect( dayView, SIGNAL( removeEvent( const Event & ) ),
 		 this, SLOT( removeEvent( const Event & ) ) );
 	connect( dayView, SIGNAL( editEvent( const Event & ) ),
 		 this, SLOT( editEvent( const Event & ) ) );
 	connect( dayView, SIGNAL( beamEvent( const Event & ) ),
 		 this, SLOT( beamEvent( const Event & ) ) );
 	connect( dayView, SIGNAL(sigNewEvent(const QString &)),
 		 this, SLOT(slotNewEventFromKey(const QString &)) );
     }
 }
 
 void DateBook::initWeek()
 {
     if ( !weekView ) {
 	weekView = new DateBookWeek( ampm, onMonday, db, views, "week view" );
 	weekView->setStartViewTime( startTime );
 	views->addWidget( weekView, WEEK );
 	connect( weekView, SIGNAL( showDate( int, int, int ) ),
 		 this, SLOT( showDay( int, int, int ) ) );
 	connect( this, SIGNAL( newEvent() ),
 		 weekView, SLOT( redraw() ) );
     }
     //But also get it right: the year that we display can be different
     //from the year of the current date. So, first find the year
     //number of the current week.
 
     int yearNumber, totWeeks;
     calcWeek( currentDate(), totWeeks, yearNumber, onMonday );
 
     QDate d = QDate( yearNumber, 12, 31 );
     calcWeek( d, totWeeks, yearNumber, onMonday );
     
     while ( totWeeks == 1 ) {
 	d = d.addDays( -1 );
 	calcWeek( d, totWeeks, yearNumber, onMonday );
     }
     if ( totWeeks != weekView->totalWeeks() )
 	weekView->setTotalWeeks( totWeeks );
 }
 void DateBook::initWeekLst() {
   if ( !weekLstView ) {
       weekLstView = new DateBookWeekLst( ampm, onMonday, db, 
 					 views, "weeklst view" );
       views->addWidget( weekLstView, WEEKLST );
     
       //weekLstView->setStartViewTime( startTime );
       connect( weekLstView, SIGNAL( showDate( int, int, int ) ),
 	       this, SLOT( showDay( int, int, int ) ) );
       connect( weekLstView, SIGNAL( addEvent( const QDateTime &, 
 					      const QDateTime &, 
 					      const QString & ) ),
 	       this, SLOT( slotNewEntry( const QDateTime &, 
 					 const QDateTime &, 
 					 const QString & ) ) );
       connect( this, SIGNAL( newEvent() ),
 	       weekLstView, SLOT( redraw() ) );
       connect( weekLstView, SIGNAL( editEvent( const Event & ) ),
 	       this, SLOT( editEvent( const Event & ) ) );
   }
 }
 
 
 void DateBook::initMonth()
 {
     if ( !monthView ) {
 	monthView = new DateBookMonth( views, "month view", FALSE, db );
 	views->addWidget( monthView, MONTH );
 	connect( monthView, SIGNAL( dateClicked( int, int, int ) ),
              this, SLOT( showDay( int, int, int ) ) );
 	connect( this, SIGNAL( newEvent() ),
 		 monthView, SLOT( redraw() ) );
 	qApp->processEvents();
     }
 }
 
 void DateBook::loadSettings()
 {
     {
 	Config config( "qpe" );
 	config.setGroup("Time");
 	ampm = config.readBoolEntry( "AMPM", TRUE );
 	onMonday = config.readBoolEntry( "MONDAY" );
     }
     
     {
 	Config config("DateBook");
 	config.setGroup("Main");
 	startTime = config.readNumEntry("startviewtime", 8);
 	aPreset = config.readBoolEntry("alarmpreset");
 	presetTime = config.readNumEntry("presettime");
     }
 }
 
 void DateBook::saveSettings()
 {
     Config config( "qpe" );
     Config configDB( "DateBook" );
     configDB.setGroup( "Main" );
     configDB.writeEntry("startviewtime",startTime);
     configDB.writeEntry("alarmpreset",aPreset);
     configDB.writeEntry("presettime",presetTime);
 }
 
 void DateBook::newDefaultView(QAction *a) {
     int val=DAY;
     if (a->text() == "Day") val=DAY;
     if (a->text() == "Week") val=WEEK;
     if (a->text() == "WeekLst") val=WEEKLST;
     if (a->text() == "Month") val=MONTH;
     
     Config configDB( "DateBook" );
     configDB.setGroup( "Main" );
     configDB.writeEntry("defaultview",val);
 }
 
 void DateBook::appMessage(const QCString& msg, const QByteArray& data)
 {
     bool needShow = FALSE;
     if ( msg == "alarm(QDateTime,int)" ) {
 	QDataStream ds(data,IO_ReadOnly);
 	QDateTime when; int warn;
 	ds >> when >> warn;
 
 	// check to make it's okay to continue,
 	// this is the case that the time was set ahead, and
 	// we are forced given a stale alarm...
 	QDateTime current = QDateTime::currentDateTime();
 	if ( current.time().hour() != when.time().hour()
 	     && current.time().minute() != when.time().minute() )
 	    return;
 
 	QValueList<EffectiveEvent> list = db->getEffectiveEvents(when.addSecs(warn*60));
 	if ( list.count() > 0 ) {
 	    QString msg;
 	    bool bSound = FALSE;
 	    int stopTimer = 0;
 	    bool found = FALSE;
 	    for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin();
 		  it!=list.end(); ++it ) {
 		if ( (*it).event().hasAlarm() ) {
 		    found = TRUE;
 		    msg += "<CENTER><B>" + (*it).description() + "</B>"
 			   + "<BR>" + (*it).location() + "<BR>"
 			   + TimeString::dateString((*it).event().start(),ampm)
 			   + (warn
 			      ? tr(" (in " + QString::number(warn)
 				   + tr(" minutes)"))
 			      : QString(""))
 			   + "<BR>"
 			   + (*it).notes() + "</CENTER>";
 		    if ( (*it).event().alarmSound() != Event::Silent ) {
 			bSound = TRUE;
 		    }
 		}
 	    }
 	    if ( found ) {
 		if ( bSound ) {
 		    Sound::soundAlarm();
 		    stopTimer = startTimer( 5000 );
 		}
 
 		QDialog dlg( this, 0, TRUE );
 		QVBoxLayout *vb = new QVBoxLayout( &dlg );
 		QScrollView *view = new QScrollView( &dlg, "scrollView");
 		view->setResizePolicy( QScrollView::AutoOneFit );
 		vb->addWidget( view );
 		QLabel *lblMsg = new QLabel( msg, &dlg );
 		view->addChild( lblMsg );
 		QPushButton *cmdOk = new QPushButton( tr("OK"), &dlg );
 		connect( cmdOk, SIGNAL(clicked()), &dlg, SLOT(accept()) );
 		vb->addWidget( cmdOk );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 		dlg.showMaximized();
 #endif
 		needShow = dlg.exec();
 
 		if ( bSound )
 		    killTimer( stopTimer );
 	    }
 	}
     } else if ( msg == "nextView()" ) {
 	QWidget* cur = views->visibleWidget();
 	if ( cur ) {
 	    if ( cur == dayView )
 		viewWeek();
 	    else if ( cur == weekView )
 		viewWeekLst();
 	    else if ( cur == weekLstView )
 		viewMonth();
 	    else if ( cur == monthView )
 		viewDay();
 	    needShow = TRUE;
 	}
     }
     if ( needShow ) {
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 	showMaximized();
 #else
 	show();
 #endif
 	raise();
 	QPEApplication::setKeepRunning();
 	setActiveWindow();
     }
 }
 
 void DateBook::reload()
 {
     db->reload();
     if ( dayAction->isOn() )
 	viewDay();
     else if ( weekAction->isOn() )
 	viewWeek();
     else if ( monthAction->isOn() )
 	viewMonth();
     syncing = FALSE;
 }
 
 void DateBook::flush()
 {
     syncing = TRUE;
     db->save();
 }
 
 void DateBook::timerEvent( QTimerEvent *e )
 {
     static int stop = 0;
     if ( stop < 10 ) {
 	Sound::soundAlarm();
 	stop++;
     } else {
 	stop = 0;
 	killTimer( e->timerId() );
     }
 }
 
 void DateBook::changeClock( bool newClock )
 {
     ampm = newClock;
     // repaint the affected objects...
     if (dayView) dayView->redraw();
     if (weekView) weekView->redraw();
     if (weekLstView) weekLstView->redraw();
 }
 
 void DateBook::changeWeek( bool m )
 {
     /* no need to redraw, each widget catches.  Do need to
        store though for widgets we haven't made yet */
     onMonday = m;
 }
 
 void DateBook::slotToday()
 {
     // we need to view today using default view
     viewDefault(QDate::currentDate());
 }
 
 void DateBook::closeEvent( QCloseEvent *e )
 {
     if(syncing) {
 	/* no need to save, did that at flush */
 	e->accept();
 	return;
     }
 
     // save settings will generate it's own error messages, no
     // need to do checking ourselves.
     saveSettings();
     if ( db->save() )
 	e->accept();
     else {
 	if ( QMessageBox::critical( this, tr( "Out of space" ),
 				    tr("Calendar was unable to save\n"
 				       "your changes.\n"
 				       "Free up some space and try again.\n"
 				       "\nQuit anyway?"),
 				    QMessageBox::Yes|QMessageBox::Escape,
 				    QMessageBox::No|QMessageBox::Default )
 	     != QMessageBox::No )
 	    e->accept();
 	else
 	    e->ignore();
     }
 }
 
 // Entering directly from the "keyboard"
 void DateBook::slotNewEventFromKey( const QString &str )
 {
     if (syncing) {
 	QMessageBox::warning( this, tr("Calendar"),
 	                      tr( "Can not edit data, currently syncing") );
 	return;
     }
 
     // We get to here from a key pressed in the Day View
     // So we can assume some things.  We want the string
     // passed in to be part of the description.
     QDateTime start, end;
     if ( views->visibleWidget() == dayView ) {
 	dayView->selectedDates( start, end );
     } else if ( views->visibleWidget() == monthView ) {
 	QDate d = monthView->selectedDate();
 	start = end = d;
 	start.setTime( QTime( 10, 0 ) );
 	end.setTime( QTime( 12, 0 ) );
     } else if ( views->visibleWidget() == weekView ) {
 	QDate d = weekView->date();
 	start = end = d;
 	start.setTime( QTime( 10, 0 ) );
 	end.setTime( QTime( 12, 0 ) );
     }
     slotNewEntry(start, end, str);
 }
 void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str) {
     // argh!  This really needs to be encapsulated in a class
     // or function.
     QDialog newDlg( this, 0, TRUE );
     newDlg.setCaption( DateEntryBase::tr("New Event") );
     DateEntry *e;
     QVBoxLayout *vb = new QVBoxLayout( &newDlg );
     QScrollView *sv = new QScrollView( &newDlg );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
     sv->setHScrollBarMode( QScrollView::AlwaysOff );
     vb->addWidget( sv );
 
     Event ev;
     ev.setDescription(  str );
     // When the new gui comes in, change this...
     ev.setLocation( tr("(Unknown)") );
     ev.setStart( start );
     ev.setEnd( end );
 
     e = new DateEntry( onMonday, ev, ampm, &newDlg );
     e->setAlarmEnabled( aPreset, presetTime, Event::Loud );
     sv->addChild( e );
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     newDlg.showMaximized();
 #endif
     while (newDlg.exec()) {
 	ev = e->event();
 	ev.assignUid();
 	QString error = checkEvent( ev );
 	if ( !error.isNull() ) {
 	    if ( QMessageBox::warning( this, tr("Error!"),
 				       error, tr("Fix it"), tr("Continue"), 0, 0, 1 ) == 0 )
 		continue;
 	}
 	db->addEvent( ev );
 	emit newEvent();
 	break;
     }
 }
 
 void DateBook::setDocument( const QString &filename )
 {
     if ( filename.find(".vcs") != int(filename.length()) - 4 ) return;
 
     QValueList<Event> tl = Event::readVCalendar( filename );
     for( QValueList<Event>::Iterator it = tl.begin(); it != tl.end(); ++it ) {
 	db->addEvent( *it );
     }
 }
 
 static const char * beamfile = "/tmp/obex/event.vcs";
 
 void DateBook::beamEvent( const Event &e )
 {
     qDebug("trying to beamn");
     unlink( beamfile ); // delete if exists
     mkdir("/tmp/obex/", 0755);
     Event::writeVCalendar( beamfile, e );
     Ir *ir = new Ir( this );
     connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
     QString description = e.description();
     ir->send( beamfile, description, "text/x-vCalendar" );
 }
 
 void DateBook::beamDone( Ir *ir )
 {
     delete ir;
     unlink( beamfile );
 }
 
 void DateBook::slotFind()
 {
     // move it to the day view...
     viewDay();
     FindDialog frmFind( "Calendar", this );
     frmFind.setUseDate( true );
     frmFind.setDate( currentDate() );
     QObject::connect( &frmFind,
                       SIGNAL(signalFindClicked(const QString&, const QDate&,
 					       bool, bool, int)),
 		      this,
 		      SLOT(slotDoFind(const QString&, const QDate&,
 				      bool, bool, int)) );
     QObject::connect( this,
 		      SIGNAL(signalNotFound()),
 		      &frmFind,
 		      SLOT(slotNotFound()) );
     QObject::connect( this,
 		      SIGNAL(signalWrapAround()),
 		      &frmFind,
 		      SLOT(slotWrapAround()) );
     frmFind.exec();
     inSearch = false;
 }
 
 bool catComp( QArray<int> cats, int category )
 {
     bool returnMe;
     int i,
 	count;
 
     count = int(cats.count());
     returnMe = false;
     if ( (category == -1 && count == 0) || category == -2 )
 	returnMe = true;
     else {
 	for ( i = 0; i < count; i++ ) {
 	    if ( category == cats[i] ) {
 		returnMe = true;
 		break;
 	    }
 	}
     }
     return returnMe;
 }
 
 
 void DateBook::slotDoFind( const QString& txt, const QDate &dt,
 			   bool caseSensitive, bool /*backwards*/,
 			   int category )
 {
     QDateTime dtEnd( QDate(3001, 1, 1), QTime(0, 0, 0) ),
 	next;
 
     QRegExp r( txt );
     r.setCaseSensitive( caseSensitive );
 
 
     static Event rev,
 	nonrev;
     if ( !inSearch ) {
 	rev.setStart( QDateTime(QDate(1960, 1, 1), QTime(0, 0, 0)) );
 	nonrev.setStart( rev.start() );
 	inSearch = true;
     }
     static QDate searchDate = dt;
     static bool wrapAround = true;
     bool candidtate;
     candidtate = false;
 
     QValueList<Event> repeats = db->getRawRepeats();
 
     // find the candidate for the first repeat that matches...
     QValueListConstIterator<Event> it;
     QDate start = dt;
     for ( it = repeats.begin(); it != repeats.end(); ++it ) {
 	if ( catComp( (*it).categories(), category ) ) {
 	    while ( nextOccurance( *it, start, next ) ) {
 		if ( next < dtEnd ) {
 		    if ( (*it).match( r ) && !(next <= rev.start()) ) {
 			rev = *it;
 			dtEnd = next;
 			rev.setStart( next );
 			candidtate = true;
 			wrapAround = true;
 			start = dt;
 			break;
 		    } else
 			start = next.date().addDays( 1 );
 		}
 	    }
 	}
     }
 
     // now the for first non repeat...
     QValueList<Event> nonRepeats = db->getNonRepeatingEvents( dt, dtEnd.date() );
     qHeapSort( nonRepeats.begin(), nonRepeats.end() );
     for ( it = nonRepeats.begin(); it != nonRepeats.end(); ++it ) {
 	if ( catComp( (*it).categories(), category ) ) {
 	    if ( (*it).start() < dtEnd ) {
 		if ( (*it).match( r ) && !(*it <= nonrev) ) {
 		    nonrev = *it;
 		    dtEnd = nonrev.start();
 		    candidtate = true;
 		    wrapAround = true;
 		    break;
 		}
 	    }
 	}
     }
     if ( candidtate ) {
 	dayView->setStartViewTime( dtEnd.time().hour() );
 	dayView->setDate( dtEnd.date().year(), dtEnd.date().month(),
 			  dtEnd.date().day() );
     } else {
 	if ( wrapAround ) {
 	    emit signalWrapAround();
 	    rev.setStart( QDateTime(QDate(1960, 1, 1), QTime(0, 0, 0)) );
 	    nonrev.setStart( rev.start() );
 	} else
 	    emit signalNotFound();
 	wrapAround = !wrapAround;
     }
 }
+
+Event DateBookDBHack::eventByUID(int uid) {
+
+    // FIXME: Dirty Hacks to get hold of the private event lists
+    QDate start;
+    QDate end=start.addDays(-1);
+    QValueList<Event> myEventList=getNonRepeatingEvents(start,end);
+    QValueList<Event> myRepeatEvents=getRawRepeats();
+
+    QValueList<Event>::ConstIterator it;
+    
+    for (it = myEventList.begin(); it != myEventList.end(); it++) {
+	if ((*it).uid() == uid) return *it;
+    }
+    for (it = myRepeatEvents.begin(); it != myRepeatEvents.end(); it++) {
+	if ((*it).uid() == uid) return *it;
+    }
+
+    qDebug("Event not found: uid=%d\n", uid);
+}
+
diff --git a/core/pim/datebook/datebook.h b/core/pim/datebook/datebook.h
index 2ffcdbe..d1fe90d 100644
--- a/core/pim/datebook/datebook.h
+++ b/core/pim/datebook/datebook.h
@@ -1,121 +1,126 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef DATEBOOK_H
 #define DATEBOOK_H
 
 #include <qpe/datebookdb.h>
 
 #include <qmainwindow.h>
 
 class QAction;
 class QWidgetStack;
 class DateBookDay;
 class DateBookWeek;
 class DateBookWeekLst;
 class DateBookMonth;
 class Event;
 class QDate;
 class Ir;
 
+class DateBookDBHack : public DateBookDB {
+ public:
+  Event eventByUID(int id);
+};
+
 class DateBook : public QMainWindow
 {
     Q_OBJECT
 
 public:
     DateBook( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     ~DateBook();
 
 signals:
     void newEvent();
     void signalNotFound();
     void signalWrapAround();
 
 protected:
     QDate currentDate();
     void timerEvent( QTimerEvent *e );
     void closeEvent( QCloseEvent *e );
 
     void view(int v, const QDate &d);
 
 public slots:
     void flush();
     void reload();
 
 private slots:
     void fileNew();
     void slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str);
     void slotSettings();
     void newDefaultView(QAction *a);
     void slotToday();	// view today
     void changeClock( bool newClock );
     void changeWeek( bool newDay );
     void appMessage(const QCString& msg, const QByteArray& data);
     // handle key events in the day view...
     void slotNewEventFromKey( const QString &str );
     void slotFind();
     void slotDoFind( const QString &, const QDate &, bool, bool, int );
 
     void viewDefault(const QDate &d);
 
     void viewDay();
     void viewWeek();
     void viewWeekLst();
     void viewMonth();
 
     void showDay( int y, int m, int d );
 
     void editEvent( const Event &e );
     void removeEvent( const Event &e );
 
     void receive( const QCString &msg, const QByteArray &data );
     void setDocument( const QString & );
     void beamEvent( const Event &e );
     void beamDone( Ir *ir );
 
 private:
     void addEvent( const Event &e );
     void initDay();
     void initWeek();
     void initWeekLst();
     void initMonth();
     void loadSettings();
     void saveSettings();
 
 private:
-    DateBookDB *db;
+    DateBookDBHack *db;
     QWidgetStack *views;
     DateBookDay *dayView;
     DateBookWeek *weekView;
     DateBookMonth *monthView;
     DateBookWeekLst *weekLstView;
     QAction *dayAction, *weekAction, *weekLstAction, *monthAction;
     bool aPreset;    // have everything set to alarm?
     int presetTime;  // the standard time for the alarm
     int startTime;
     bool ampm;
     bool onMonday;
 
     bool syncing;
     bool inSearch;
 
     QString checkEvent(const Event &);
 };
 
 #endif
diff --git a/library/datebookdb.cpp b/library/datebookdb.cpp
index da5a797..2ac9a0c 100644
--- a/library/datebookdb.cpp
+++ b/library/datebookdb.cpp
@@ -206,782 +206,768 @@ bool nextOccurance(const Event &e, const QDate &from, QDateTime &next)
 		tmpDate = QDate( iyear, imonth, 1 );
 		/* these loops could go for a while, check end case now */
 		if ((tmpDate > e.repeatPattern().endDate()) && e.repeatPattern().hasEndDate)
 		    return FALSE;
 		iday = 1;
 		iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7;
 		iday += 7 * weekOfMonth;
 	    } while (iday > tmpDate.daysInMonth());
 	    tmpDate = QDate(iyear, imonth, iday);
 
 	    next = QDateTime(tmpDate, e.start().time());
 	    if ((next.date() > e.repeatPattern().endDate()) && e.repeatPattern().hasEndDate)
 		return FALSE;
 	    return TRUE;
 	case Event::MonthlyDate:
 	    iday = e.start().date().day();
 	    iyear = from.year();
 	    imonth = from.month();
 
 	    a = from.year() - e.start().date().year();
 	    a *= 12;
 	    a = a + (imonth - e.start().date().month());
 	    /* a is e.start()monthsFrom(from); */
 	    if(a % freq) {
 		a = freq - (a % freq);
 		imonth = from.month() + a;
 		if (imonth > 12) {
 		    imonth--;
 		    iyear += imonth / 12;
 		    imonth = imonth % 12;
 		    imonth++;
 		}
 	    }
 	    /* imonth is now the first month after or on
 	       from that matches the frequencey given */
 
 	    /* this could go for a while, worse case, 4*12 iterations, probably */
 	    while(!QDate::isValid(iyear, imonth, iday) ) {
 		imonth += freq;
 		if (imonth > 12) {
 		    imonth--;
 		    iyear += imonth / 12;
 		    imonth = imonth % 12;
 		    imonth++;
 		}
 		/* these loops could go for a while, check end case now */
 		if ((QDate(iyear, imonth, 1) > e.repeatPattern().endDate()) && e.repeatPattern().hasEndDate)
 		    return FALSE;
 	    }
 
 	    if(QDate(iyear, imonth, iday) >= from) {
 		/* done */
 		next = QDateTime(QDate(iyear, imonth, iday),
 			e.start().time());
 		if ((next.date() > e.repeatPattern().endDate()) && e.repeatPattern().hasEndDate)
 		    return FALSE;
 		return TRUE;
 	    }
 
 	    /* ok, need to cycle */
 	    imonth += freq;
 	    imonth--;
 	    iyear += imonth / 12;
 	    imonth = imonth % 12;
 	    imonth++;
 
 	    while(!QDate::isValid(iyear, imonth, iday) ) {
 		imonth += freq;
 		imonth--;
 		iyear += imonth / 12;
 		imonth = imonth % 12;
 		imonth++;
 		if ((QDate(iyear, imonth, 1) > e.repeatPattern().endDate()) && e.repeatPattern().hasEndDate)
 		    return FALSE;
 	    }
 
 	    next = QDateTime(QDate(iyear, imonth, iday), e.start().time());
 	    if ((next.date() > e.repeatPattern().endDate()) && e.repeatPattern().hasEndDate)
 		return FALSE;
 	    return TRUE;
 	case Event::Yearly:
 	    iday = e.start().date().day();
 	    imonth = e.start().date().month();
 	    iyear = from.year(); // after all, we want to start in this year
 
 	    diff = 1;
 	    if(imonth == 2 && iday > 28) {
 		/* leap year, and it counts, calculate actual frequency */
 		if(freq % 4)
 		    if (freq % 2)
 			freq = freq * 4;
 		    else
 			freq = freq * 2;
 		/* else divides by 4 already, leave freq alone */
 		diff = 4;
 	    }
 
 	    a = from.year() - e.start().date().year();
 	    if(a % freq) {
 		a = freq - (a % freq);
 		iyear = iyear + a;
 	    }
 
 	    /* under the assumption we won't hit one of the special not-leap years twice */
 	    if(!QDate::isValid(iyear, imonth, iday)) {
 		/* must have been skipping by leap years and hit one that wasn't, (e.g. 2100) */
 		iyear += freq;
 	    }
 
 	    if(QDate(iyear, imonth, iday) >= from) {
 		next = QDateTime(QDate(iyear, imonth, iday),
 			e.start().time());
 		if ((next.date() > e.repeatPattern().endDate()) && e.repeatPattern().hasEndDate)
 		    return FALSE;
 		return TRUE;
 	    }
 	    /* iyear == from.year(), need to advance again */
 	    iyear += freq;
 	    /* under the assumption we won't hit one of the special not-leap years twice */
 	    if(!QDate::isValid(iyear, imonth, iday)) {
 		/* must have been skipping by leap years and hit one that wasn't, (e.g. 2100) */
 		iyear += freq;
 	    }
 
 	    next = QDateTime(QDate(iyear, imonth, iday), e.start().time());
 	    if ((next.date() > e.repeatPattern().endDate()) && e.repeatPattern().hasEndDate)
 		return FALSE;
 	    return TRUE;
 	default:
 	    return FALSE;
     }
 }
 
 static bool nextAlarm( const Event &ev, QDateTime& when, int& warn)
 {
     QDateTime now = QDateTime::currentDateTime();
     if ( ev.hasRepeat() ) {
 	QDateTime ralarm;
 	if (nextOccurance(ev, now.date(), ralarm)) {
 	    ralarm = ralarm.addSecs(-ev.alarmTime()*60);
 	    if ( ralarm > now ) {
 		when = ralarm;
 		warn = ev.alarmTime();
 	    } else if ( nextOccurance(ev, now.date().addDays(1), ralarm) ) {
 		ralarm = ralarm.addSecs( -ev.alarmTime()*60 );
 		if ( ralarm > now ) {
 		    when = ralarm;
 		    warn = ev.alarmTime();
 		}
 	    }
 	}
     } else {
 	warn = ev.alarmTime();
 	when = ev.start().addSecs( -ev.alarmTime()*60 );
     }
     return when > now;
 }
 
 static void addEventAlarm( const Event &ev )
 {
     QDateTime when;
     int warn;
     if ( nextAlarm(ev,when,warn) )
 	AlarmServer::addAlarm( when,
 			       "QPE/Application/datebook",
 			       "alarm(QDateTime,int)", warn );
 }
 
 static void delEventAlarm( const Event &ev )
 {
     QDateTime when;
     int warn;
     if ( nextAlarm(ev,when,warn) )
 	AlarmServer::deleteAlarm( when,
 				  "QPE/Application/datebook",
 				  "alarm(QDateTime,int)", warn );
 }
 
 
 DateBookDB::DateBookDB()
 {
     init();
 }
 
 DateBookDB::~DateBookDB()
 {
     save();
     eventList.clear();
     repeatEvents.clear();
 }
 
 
 //#### Why is this code duplicated in getEffectiveEvents ?????
 //#### Addendum.  Don't use this function, lets faze it out if we can.
 QValueList<Event> DateBookDB::getEvents( const QDate &from, const QDate &to )
 {
     QValueList<Event> tmpList;
     tmpList = getNonRepeatingEvents( from, to );
 
     // check for repeating events...
     for (QValueList<Event>::ConstIterator it = repeatEvents.begin();
 	 it != repeatEvents.end(); ++it) {
 	QDate itDate = from;
 	QDateTime due;
 
 	/* create a false end date, to short circuit on hard
 	   MonthlyDay recurences */
 	Event dummy_event = *it;
 	Event::RepeatPattern r = dummy_event.repeatPattern();
 	if ( !r.hasEndDate || r.endDate() > to ) {
 	    r.setEndDate( to );
 	    r.hasEndDate = TRUE;
 	}
 	dummy_event.setRepeat(TRUE, r);
 
 	while (nextOccurance(dummy_event, itDate, due)) {
 	    if (due.date() > to)
 		break;
 	    Event newEvent = *it;
 	    newEvent.setStart(due);
 	    newEvent.setEnd(due.addSecs((*it).start().secsTo((*it).end())));
 
 	    tmpList.append(newEvent);
 	    itDate = due.date().addDays(1);  /* the next event */
 	}
     }
     qHeapSort(tmpList);
     return tmpList;
 }
 
 QValueList<Event> DateBookDB::getEvents( const QDateTime &start )
 {
     QValueList<Event> day = getEvents(start.date(),start.date());
 
     QValueListConstIterator<Event> it;
     QDateTime dtTmp;
     QValueList<Event> tmpList;
     for (it = day.begin(); it != day.end(); ++it ) {
         dtTmp = (*it).start(TRUE);
         if ( dtTmp == start )
             tmpList.append( *it );
     }
     return tmpList;
 }
 
 //#### Why is this code duplicated in getEvents ?????
 
 QValueList<EffectiveEvent> DateBookDB::getEffectiveEvents( const QDate &from,
 							   const QDate &to )
 {
     QValueList<EffectiveEvent> tmpList;
     QValueListIterator<Event> it;
 
     EffectiveEvent effEv;
     QDateTime dtTmp,
 	      dtEnd;
 
     for (it = eventList.begin(); it != eventList.end(); ++it ) {
 	if (!(*it).isValidUid()) 
 	    (*it).assignUid(); // FIXME: Hack to restore cleared uids
 
         dtTmp = (*it).start(TRUE);
 	dtEnd = (*it).end(TRUE);
 
         if ( dtTmp.date() >= from && dtTmp.date() <= to ) {
 	    Event tmpEv = *it;
 	    effEv.setEvent(tmpEv);
 	    effEv.setDate( dtTmp.date() );
 	    effEv.setStart( dtTmp.time() );
 	    if ( dtTmp.date() != dtEnd.date() )
 		effEv.setEnd( QTime(23, 59, 0) );
 	    else
 		effEv.setEnd( dtEnd.time() );
             tmpList.append( effEv );
 	}
 	// we must also check for end date information...
 	if ( dtEnd.date() != dtTmp.date() && dtEnd.date() >= from ) {
 	    QDateTime dt = dtTmp.addDays( 1 );
 	    dt.setTime( QTime(0, 0, 0) );
 	    QDateTime dtStop;
 	    if ( dtEnd > to ) {
 		dtStop = to;
 	    } else
 		dtStop = dtEnd;
 	    while ( dt <= dtStop ) {
 		Event tmpEv = *it;
 		effEv.setEvent( tmpEv );
 		effEv.setDate( dt.date() );
 		if ( dt >= from ) {
 		    effEv.setStart( QTime(0, 0, 0) );
 		    if ( dt.date() == dtEnd.date() )
 			effEv.setEnd( dtEnd.time() );
 		    else
 			effEv.setEnd( QTime(23, 59, 59) );
 		    tmpList.append( effEv );
 		}
 		dt = dt.addDays( 1 );
 	    }
 	}
     }
     // check for repeating events...
     QDateTime repeat;
     for ( it = repeatEvents.begin(); it != repeatEvents.end(); ++it ) {
 	if (!(*it).isValidUid()) 
 	    (*it).assignUid(); // FIXME: Hack to restore cleared uids
 
 	/* create a false end date, to short circuit on hard
 	   MonthlyDay recurences */
 	Event dummy_event = *it;
 	int duration = (*it).start().date().daysTo( (*it).end().date() );
 	QDate itDate = from.addDays(-duration);
 
 	Event::RepeatPattern r = dummy_event.repeatPattern();
 	if ( !r.hasEndDate || r.endDate() > to ) {
 	    r.setEndDate( to );
 	    r.hasEndDate = TRUE;
 	}
 	dummy_event.setRepeat(TRUE, r);
 
 	while (nextOccurance(dummy_event, itDate, repeat)) {
 	    if(repeat.date() > to)
 		break;
 	    effEv.setDate( repeat.date() );
 	    if ((*it).type() == Event::AllDay) {
 		effEv.setStart( QTime(0,0,0) );
 		effEv.setEnd( QTime(23,59,59) );
 	    } else {
 		/* we only occur by days, not hours/minutes/seconds.  Hence
 		   the actual end and start times will be the same for
 		   every repeated event.  For multi day events this is
 		   fixed up later if on wronge day span */
 		effEv.setStart( (*it).start().time() );
 		effEv.setEnd( (*it).end().time() );
 	    }
 	    if ( duration != 0 ) {
 		// multi-day repeating events
 		QDate sub_it = QMAX( repeat.date(), from );
 		QDate startDate = repeat.date();
 		QDate endDate = startDate.addDays( duration );
 
 		while ( sub_it <= endDate && sub_it  <= to ) {
 		    EffectiveEvent tmpEffEv = effEv;
 		    Event tmpEv = *it;
 		    tmpEffEv.setEvent( tmpEv );
 
 		    if ( sub_it != startDate )
 			tmpEffEv.setStart( QTime(0,0,0) );
 		    if ( sub_it != endDate )
 			tmpEffEv.setEnd( QTime(23,59,59) );
 		    tmpEffEv.setDate( sub_it );
 		    tmpEffEv.setEffectiveDates( startDate, endDate );
 		    tmpList.append( tmpEffEv );
 		    sub_it = sub_it.addDays( 1 );
 		}
 		itDate = endDate;
 	    } else {
 		Event tmpEv = *it;
 		effEv.setEvent( tmpEv );
 		tmpList.append( effEv );
 		itDate = repeat.date().addDays( 1 );
 	    }
 	}
     }
 
     qHeapSort( tmpList );
     return tmpList;
 }
 
 QValueList<EffectiveEvent> DateBookDB::getEffectiveEvents( const QDateTime &dt)
 {
     QValueList<EffectiveEvent> day = getEffectiveEvents(dt.date(), dt.date());
     QValueListConstIterator<EffectiveEvent> it;
     QValueList<EffectiveEvent> tmpList;
     QDateTime dtTmp;
 
     for (it = day.begin(); it != day.end(); ++it ) {
         dtTmp = QDateTime( (*it).date(), (*it).start() );
 	// at the moment we don't have second granularity, be nice about that..
         if ( QABS(dt.secsTo(dtTmp)) < 60 )
             tmpList.append( *it );
     }
     return tmpList;
 }
 
-Event DateBookDB::getEvent( int uid ) {
-    QValueList<Event>::ConstIterator it;
-    
-    for (it = eventList.begin(); it != eventList.end(); it++) {
-	if ((*it).uid() == uid) return *it;
-    }
-    for (it = repeatEvents.begin(); it != repeatEvents.end(); it++) {
-	if ((*it).uid() == uid) return *it;
-    }
-
-    qDebug("Event not found: uid=%d\n", uid);
-}
-
-
 void DateBookDB::addEvent( const Event &ev, bool doalarm )
 {
     // write to the journal...
     saveJournalEntry( ev, ACTION_ADD, -1, false );
     addJFEvent( ev, doalarm );
     d->clean = false;
 }
 
 void DateBookDB::addJFEvent( const Event &ev, bool doalarm )
 {
     if ( doalarm && ev.hasAlarm() )
 	addEventAlarm( ev );
     if ( ev.hasRepeat() )
 	repeatEvents.append( ev );
     else
 	eventList.append( ev );
 }
 
 void DateBookDB::editEvent( const Event &old, Event &editedEv )
 {
     int oldIndex=0;
     bool oldHadRepeat = old.hasRepeat();
     Event orig;
 
     // write to the journal...
     if ( oldHadRepeat ) {
 	if ( origRepeat( old, orig ) ) // should work always...
 	    oldIndex = repeatEvents.findIndex( orig );
     } else
 	oldIndex = eventList.findIndex( old );
     saveJournalEntry( editedEv, ACTION_REPLACE, oldIndex, oldHadRepeat );
 
     // Delete old event
     if ( old.hasAlarm() )
 	delEventAlarm( old );
     if ( oldHadRepeat ) {
 	if ( editedEv.hasRepeat() ) { // This mean that origRepeat was run above and 
  	                              // orig is initialized
 	    // assumption, when someone edits a repeating event, they
 	    // want to change them all, maybe not perfect, but it works
 	    // for the moment...
 	    repeatEvents.remove( orig );
 	} else
 	    removeRepeat( old );
     } else {
 	QValueList<Event>::Iterator it = eventList.find( old );
 	if ( it != eventList.end() )
 	    eventList.remove( it );
     }
 
     // Add new event
     if ( editedEv.hasAlarm() )
 	addEventAlarm( editedEv );
     if ( editedEv.hasRepeat() )
 	repeatEvents.append( editedEv );
     else
 	eventList.append( editedEv );
 
     d->clean = false;
 }
 
 void DateBookDB::removeEvent( const Event &ev )
 {
     // write to the journal...
     saveJournalEntry( ev, ACTION_REMOVE, -1, false );
     removeJFEvent( ev );
     d->clean = false;
 }
 
 void DateBookDB::removeJFEvent( const Event&ev )
 {
     if ( ev.hasAlarm() )
 	delEventAlarm( ev );
     if ( ev.hasRepeat() ) {
 	removeRepeat( ev );
     } else {
 	QValueList<Event>::Iterator it = eventList.find( ev );
 	if ( it != eventList.end() )
 	    eventList.remove( it );
     }
 }
 
 // also handles journaling...
 void DateBookDB::loadFile( const QString &strFile )
 {
     
     QFile f( strFile );
     if ( !f.open( IO_ReadOnly ) )
 	return;
 
     enum Attribute {
 	FDescription = 0,
 	FLocation,
 	FCategories,
 	FUid,
 	FType,
 	FAlarm,
 	FSound,
 	FRType,
 	FRWeekdays,
 	FRPosition,
 	FRFreq,
 	FRHasEndDate,
 	FREndDate,
 	FRStart,
 	FREnd,
 	FNote,
 	FCreated,
 	FAction,
 	FActionKey,
 	FJournalOrigHadRepeat
     };
 
     QAsciiDict<int> dict( 97 );
     dict.setAutoDelete( TRUE );
     dict.insert( "description", new int(FDescription) );
     dict.insert( "location", new int(FLocation) );
     dict.insert( "categories", new int(FCategories) );
     dict.insert( "uid", new int(FUid) );
     dict.insert( "type", new int(FType) );
     dict.insert( "alarm", new int(FAlarm) );
     dict.insert( "sound", new int(FSound) );
     dict.insert( "rtype", new int(FRType) );
     dict.insert( "rweekdays", new int(FRWeekdays) );
     dict.insert( "rposition", new int(FRPosition) );
     dict.insert( "rfreq", new int(FRFreq) );
     dict.insert( "rhasenddate", new int(FRHasEndDate) );
     dict.insert( "enddt", new int(FREndDate) );
     dict.insert( "start", new int(FRStart) );
     dict.insert( "end", new int(FREnd) );
     dict.insert( "note", new int(FNote) );
     dict.insert( "created", new int(FCreated) );
     dict.insert( "action", new int(FAction) );
     dict.insert( "actionkey", new int(FActionKey) );
     dict.insert( "actionorig", new int (FJournalOrigHadRepeat) );
 
     
     QByteArray ba = f.readAll();
     char* dt = ba.data();
     int len = ba.size();
     int currentAction,
 	journalKey,
 	origHadRepeat;  // should be bool, but we need tri-state(not being used)
 
     int i = 0;
     char *point;
     while ( ( point = strstr( dt+i, "<event " ) ) != 0 ) {
 	i = point - dt;
 	// if we are reading in events in the general case,
 	// we are just adding them, so let the actions represent that...
 	currentAction = ACTION_ADD;
 	journalKey = -1;
 	origHadRepeat = -1;
 	// some temporary variables for dates and times ...
 	//int startY = 0, startM = 0, startD = 0, starth = 0, startm = 0, starts = 0;
 	//int endY = 0, endM = 0, endD = 0, endh = 0, endm = 0, ends = 0;
 	//int enddtY = 0, enddtM = 0, enddtD = 0;
 
 	// ... for the alarm settings ...
 	int alarmTime = -1; Event::SoundTypeChoice alarmSound = Event::Silent;
 	// ... and for the recurrence
 	Event::RepeatPattern rp;
 	Event e;
 
 	i += 7;
 
 	while( 1 ) {
 	    while ( i < len && (dt[i] == ' ' || dt[i] == '\n' || dt[i] == '\r') )
 		++i;
 	    if ( i >= len-2 || (dt[i] == '/' && dt[i+1] == '>') )
 		break;
 	    // we have another attribute, read it.
 	    int j = i;
 	    while ( j < len && dt[j] != '=' )
 		++j;
 	    char *attr = dt+i;
 	    dt[j] = '\0';
 	    i = ++j; // skip =
 	    while ( i < len && dt[i] != '"' )
 		++i;
 	    j = ++i;
 	    bool haveAmp = FALSE;
 	    bool haveUtf = FALSE;
 	    while ( j < len && dt[j] != '"' ) {
 		if ( dt[j] == '&' )
 		    haveAmp = TRUE;
 		if ( ((unsigned char)dt[j]) > 0x7f )
 		    haveUtf = TRUE;
 		++j;
 	    }
 
 	    if ( i == j ) {
 		// leave out empty attributes
 		i = j + 1;
 		continue;
 	    }
 
 	    QString value = haveUtf ? QString::fromUtf8( dt+i, j-i )
 			    : QString::fromLatin1( dt+i, j-i );
 	    if ( haveAmp )
 		value = Qtopia::plainString( value );
 	    i = j + 1;
 
 	    //qDebug("attr='%s' value='%s'", attr.data(), value.latin1() );
 	    int * find = dict[ attr ];
 #if 1
 	    if ( !find ) {
 		// custom field
 		e.setCustomField(attr, value);
 		continue;
 	    }
 
 	    switch( *find ) {
 	    case FDescription:
 		e.setDescription( value );
 		break;
 	    case FLocation:
 		e.setLocation( value );
 		break;
 	    case FCategories:
 		e.setCategories( Qtopia::Record::idsFromString( value ) );
 		break;
 	    case FUid:
 		e.setUid( value.toInt() );
 		break;
 	    case FType:
 		if ( value == "AllDay" )
 		    e.setType( Event::AllDay );
 		else
 		    e.setType( Event::Normal );
 		break;
 	    case FAlarm:
 		alarmTime = value.toInt();
 		break;
 	    case FSound:
 		alarmSound = value == "loud" ? Event::Loud : Event::Silent;
 		break;
 		// recurrence stuff
 	    case FRType:
 		if ( value == "Daily" )
 		    rp.type = Event::Daily;
 		else if ( value == "Weekly" )
 		    rp.type = Event::Weekly;
 		else if ( value == "MonthlyDay" )
 		    rp.type = Event::MonthlyDay;
 		else if ( value == "MonthlyDate" )
 		    rp.type = Event::MonthlyDate;
 		else if ( value == "Yearly" )
 		    rp.type = Event::Yearly;
 		else
 		    rp.type = Event::NoRepeat;
 		break;
 	    case FRWeekdays:
 		rp.days = value.toInt();
 		break;
 	    case FRPosition:
 		rp.position = value.toInt();
 		break;
 	    case FRFreq:
 		rp.frequency = value.toInt();
 		break;
 	    case FRHasEndDate:
 		rp.hasEndDate = value.toInt();
 		break;
 		case FREndDate: {
 		rp.endDateUTC = (time_t) value.toLong();
 		break;
 		}
 		case FRStart: {
 		e.setStart( (time_t) value.toLong() );
 		break;
 		}
 		case FREnd: {
 		e.setEnd( (time_t) value.toLong() );
 		break;
 		}
 	    case FNote:
 		e.setNotes( value );
 		break;
 	    case FCreated:
 		rp.createTime = value.toInt();
 		break;
 	    case FAction:
 		currentAction = value.toInt();
 		break;
 	    case FActionKey:
 		journalKey = value.toInt();
 		break;
 	    case FJournalOrigHadRepeat:
 		origHadRepeat = value.toInt();
 		break;
 	    default:
 		qDebug( "huh??? missing enum? -- attr.: %s", attr );
 		break;
 	    }
 #endif
 	}
 	// "post processing" (dates, times, alarm, recurrence)
 	// start date/time
 	e.setRepeat( rp.type != Event::NoRepeat, rp );
 
 	if ( alarmTime != -1 )
 	    e.setAlarm( TRUE, alarmTime, alarmSound );
 
 	// now do our action based on the current action...
 	switch ( currentAction ) {
 	case ACTION_ADD:
 	    addJFEvent( e );
 	    break;
 	case ACTION_REMOVE:
 	    removeJFEvent( e );
 	    break;
 	case ACTION_REPLACE:
 	    // be a little bit careful,
 	    // in case of a messed up journal...
 	    if ( journalKey > -1 && origHadRepeat > -1 ) {
 		// get the original from proper list...
 		if ( origHadRepeat )
 		    removeJFEvent( *(repeatEvents.at(journalKey)) );
 		else
 		    removeJFEvent( *(eventList.at(journalKey)) );
 		addJFEvent( e );
 	    }
 	    break;
 	default:
 	    break;
 	}
     }
     f.close();
 }
 
 void DateBookDB::init()
 {
     d = new DateBookDBPrivate;
     d->clean = false;
     QString str = dateBookFilename();
     if ( str.isNull() ) {
 	QMessageBox::warning( 0, QObject::tr("Out of Space"),
 			      QObject::tr("Unable to create start up files\n"
 					  "Please free up some space\n"
 					  "before entering data") );
     }
     // continuing along, we call this datebook filename again,
     // because they may fix it before continuing, though it seems
     // pretty unlikely...
     loadFile( dateBookFilename() );
 
     if ( QFile::exists( dateBookJournalFile() ) ) {
 	// merge the journal
 	loadFile( dateBookJournalFile() );
 	// save in our changes and remove the journal...
 	save();
     }
     d->clean = true;
 }
 
 bool DateBookDB::save()
 {
     if ( d->clean == true )
 	return true;
     QValueListIterator<Event> it;
     int total_written;
     QString strFileNew = dateBookFilename() + ".new";
 
     QFile f( strFileNew );
     if ( !f.open( IO_WriteOnly|IO_Raw ) )
         return FALSE;
 
     QString buf( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" );
     buf += "<!DOCTYPE DATEBOOK><DATEBOOK>\n";
     buf += "<events>\n";
     QCString str = buf.utf8();
     total_written = f.writeBlock( str.data(), str.length() );
     if ( total_written != int(str.length()) ) {
 	f.close();
 	QFile::remove( strFileNew );
 	return false;
     }
 
     for ( it = eventList.begin(); it != eventList.end(); ++it ) {
 	buf = "<event";
         (*it).save( buf );
         buf += " />\n";
 	str = buf.utf8();
diff --git a/library/datebookdb.h b/library/datebookdb.h
index e4c251c..0add028 100644
--- a/library/datebookdb.h
+++ b/library/datebookdb.h
@@ -1,88 +1,87 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef DATEBOOKDB_H
 #define DATEBOOKDB_H
 
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qvaluelist.h>
 #include <qpe/event.h>
 
 // journal actions...
 enum journal_action { ACTION_ADD, ACTION_REMOVE, ACTION_REPLACE };
 
 class DateBookDBPrivate;
 class DateBookDB
 {
 public:
     DateBookDB();
     ~DateBookDB();
 
     // very depreciated now!!!
     QValueList<Event> getEvents( const QDate &from, const QDate &to );
     QValueList<Event> getEvents( const QDateTime &start );
 
     // USE THESE!!!
     QValueList<EffectiveEvent> getEffectiveEvents( const QDate &from,
 						   const QDate &to );
     QValueList<EffectiveEvent> getEffectiveEvents( const QDateTime &start );
-    Event getEvent( int uid );
 
     QValueList<Event> getRawRepeats() const;
     QValueList<Event> getNonRepeatingEvents( const QDate &from,
 					     const QDate &to ) const;
 
     // Use these when dealing with adding removing events...
     void addEvent( const Event &ev, bool doalarm=TRUE );
     void removeEvent( const Event &ev );
     void editEvent( const Event &old, Event &ev );
     // add/remove event without journaling ( these ended up in public by accident, never
     // use them unless you know what you are doing...),
     // please put them in private if we ever can change the class...
     void addJFEvent( const Event &ev, bool doalarm=TRUE );
     void removeJFEvent( const Event &ev );
 
     bool save();
     void reload();
 private:
     //find the real repeat...
     bool origRepeat( const Event &ev, Event &orig ) const;
     bool removeRepeat( const Event &ev );
     void init();
     void loadFile( const QString &strFile );
     // depreciated...
     void saveJournalEntry( const Event &ev, journal_action action );
     // new version, uncomment the "= -1" when we remove the above
     // function..
     bool saveJournalEntry( const Event &ev, journal_action action,
 			   int key/* = -1*/, bool origHadRepeat = false );
 
     QValueList<Event> eventList; // non-repeating events...
     QValueList<Event> repeatEvents; // the repeating events...
     DateBookDBPrivate *d;
     QFile journalFile;
 
     int	recordIdMax;  // ADDITION
 };
 
 /* helper functions, also useful to other apps. */
 bool nextOccurance( const Event &e, const QDate &from, QDateTime &next);
 #endif