10 files changed, 58 insertions, 60 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index af26302..3934411 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -68,202 +68,202 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 {
        bool needEvilHack= false; // if we need an Evil Hack
        QTime t;
        t.start();
        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;
 //    QToolBar *bar = new QToolBar( this );
 //    bar->setHorizontalStretchable( TRUE );
 //    QMenuBar *mb = new QMenuBar( bar );
 //    mb->setMargin( 0 );
 //    QPopupMenu *view = new QPopupMenu( this );
 //    mb->insertItem( tr( "View" ), view );
        QToolBar *sub_bar = new QToolBar(this);
        sub_bar->setHorizontalStretchable(TRUE);
        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 );
        sub_bar->addSeparator();
        a = new QAction( tr( "Today" ), Resource::loadPixmap( "datebook/to_day" ),  QString::null, 0, g, 0 );
        connect( a, SIGNAL( activated() ), this, SLOT( slotToday() ) );
        a->addTo( sub_bar );
        //a->addTo( view );
        sub_bar->addSeparator();
        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( "datebook/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;
        sub_bar->addSeparator();
        a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), QString::null, 0, this, 0 );
        connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );
        a->addTo( sub_bar );
        a = new QAction( tr( "Edit..." ), Resource::loadPixmap("SettingsIcon"), QString::null, 0, this, 0 );
        connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) );
        a->addTo( sub_bar );
        if(defaultView==DAY) viewDay();
                if(defaultView==WEEK) needEvilHack=true;// viewWeek();
        if(defaultView==WEEKLST) viewWeekLst();
        if(defaultView==MONTH) viewMonth();
        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&)) );
+        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&)) );
+        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&)) );
+        connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(receive(const QCString&,const QByteArray&)) );
 #endif
 #endif
        qDebug("done t=%d", t.elapsed() );
        connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
        connect( qApp, SIGNAL( reload()), this, SLOT( reload() ) );
    /*
     *  Here is a problem description:
     *  When Weekview is the default view
     *  a DateBookWeekView get's created
     *  redraw() get's called. So what?
     *  Remember that we're still in the c'tor
     *  and no final layout has happened? Ok
     *  now all Events get arranged. Their x
     *  position get's determined by a QHeader
     *  position. But the QHeader isn't layouted or
     *  at the right position. redraw() is a slot
     *  so we'll call it then via a singleShot
     *  from view()
     */
        if( needEvilHack ){
                QTimer::singleShot( 500, this, SLOT(viewWeek()) );
        }
 }
 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->eventByUID(uid);
        editEvent(e);
    }else if (msg == "viewDefault(QDate)"){
         QDate day;
         stream >> day;
         viewDefault(day);
     }
 }
 DateBook::~DateBook()
 {
 }
 void DateBook::slotSettings()
 {
        DateBookSettings frmSettings( ampm, this );
        frmSettings.setStartTime( startTime );
        frmSettings.setAlarmPreset( aPreset, presetTime );
        frmSettings.setJumpToCurTime( bJumpToCurTime );
        frmSettings.setRowStyle( rowStyle );
        frmSettings.comboDefaultView->setCurrentItem(defaultView-1);
        frmSettings.comboWeekListView->setCurrentItem(weeklistviewconfig);
        bool found=false;
        for (int i=0; i<(frmSettings.comboLocation->count()); i++) {
                if ( frmSettings.comboLocation->text(i) == defaultLocation ) {
                        frmSettings.comboLocation->setCurrentItem(i);
                        found=true;
                        break;
                }
        }
        if(!found) {
                frmSettings.comboLocation->insertItem(defaultLocation);
                frmSettings.comboLocation->setCurrentItem(frmSettings.comboLocation->count()-1);
        }
        frmSettings.comboCategory->setCategories(defaultCategories,"Calendar", tr("Calendar"));
        if ( QPEApplication::execDialog( &frmSettings ) ) {
                aPreset = frmSettings.alarmPreset();
                presetTime = frmSettings.presetTime();
                startTime = frmSettings.startTime();
                bJumpToCurTime = frmSettings.jumpToCurTime();
                rowStyle = frmSettings.rowStyle();
                defaultView=frmSettings.comboDefaultView->currentItem()+1;
                weeklistviewconfig=frmSettings.comboWeekListView->currentItem();
                defaultLocation=frmSettings.comboLocation->currentText();
                defaultCategories=frmSettings.comboCategory->currentCategories();
                if ( dayView ) {
                        dayView->setStartViewTime( startTime );
                        dayView->setJumpToCurTime( bJumpToCurTime );
                        dayView->setRowStyle( rowStyle );
                }
                if ( weekView ) {
                        weekView->setStartViewTime( startTime );
@@ -424,246 +424,246 @@ void DateBook::duplicateEvent( const Event &e )
                }
        /*
        * The problem:
        * DateBookDB does remove repeating events not by uid but by the time
        * the recurrence was created
        * so we need to update that time as well
        */
        Event::RepeatPattern rp = newEv.repeatPattern();
        rp.createTime = ::time( NULL );
        newEv.setRepeat( TRUE, rp ); // has repeat and repeatPattern...
                if( newEv.uid() == e.uid() || !newEv.isValidUid() )
                    newEv.assignUid();
                db->addEvent(newEv);
                emit newEvent();
                break;
        }
 }
 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 );
        while ( QPEApplication::execDialog( &editDlg ) ) {
                Event newEv = entry->event();
                if(newEv.description().isEmpty() && newEv.notes().isEmpty() )
                        break;
                newEv.setUid(e.uid()); // FIXME: Hack not to clear uid
                QString error = checkEvent(newEv);
                if (!error.isNull()) {
                        if (QMessageBox::warning(this, tr("error box"), error, tr("Fix it"), tr("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->setJumpToCurTime( bJumpToCurTime );
                dayView->setStartViewTime( startTime );
                dayView->setRowStyle( rowStyle );
                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( removeEvent(const Event&) ), this, SLOT( removeEvent(const Event&) ) );
-                connect( dayView, SIGNAL( editEvent( const Event & ) ), this, SLOT( editEvent( const Event & ) ) );
+                connect( dayView, SIGNAL( editEvent(const Event&) ), this, SLOT( editEvent(const Event&) ) );
-                connect( dayView, SIGNAL( duplicateEvent( const Event & ) ), this, SLOT( duplicateEvent( const Event & ) ) );
+                connect( dayView, SIGNAL( duplicateEvent(const Event&) ), this, SLOT( duplicateEvent(const Event&) ) );
-                connect( dayView, SIGNAL( beamEvent( const Event & ) ), this, SLOT( beamEvent( const Event & ) ) );
+                connect( dayView, SIGNAL( beamEvent(const Event&) ), this, SLOT( beamEvent(const Event&) ) );
-                connect( dayView, SIGNAL(sigNewEvent(const QString &)), this, SLOT(slotNewEventFromKey(const QString &)) );
+                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( 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 );
        }
 }
 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( showDate(int,int,int) ), this, SLOT( showDay(int,int,int) ) );
-                connect( weekLstView, SIGNAL( addEvent( const QDateTime &, const QDateTime &, const QString & , const QString &) ),
+                connect( weekLstView, SIGNAL( addEvent(const QDateTime&,const QDateTime&,const QString&, const QString&) ),
-                        this, SLOT( slotNewEntry( const QDateTime &, const QDateTime &, const QString & , const QString &) ) );
+                        this, SLOT( slotNewEntry(const QDateTime&,const QDateTime&,const QString&, const QString&) ) );
                connect( this, SIGNAL( newEvent() ), weekLstView, SLOT( redraw() ) );
-                connect( weekLstView, SIGNAL( editEvent( const Event & ) ), this, SLOT( editEvent( const Event & ) ) );
+                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( 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 qpeconfig( "qpe" );
        qpeconfig.setGroup("Time");
        ampm = qpeconfig.readBoolEntry( "AMPM", TRUE );
        onMonday = qpeconfig.readBoolEntry( "MONDAY" );
        Config config("DateBook");
        config.setGroup("Main");
        startTime = config.readNumEntry("startviewtime", 8);
        aPreset = config.readBoolEntry("alarmpreset");
        presetTime = config.readNumEntry("presettime");
        bJumpToCurTime = config.readBoolEntry("jumptocurtime");
        rowStyle = config.readNumEntry("rowstyle");
        defaultView = config.readNumEntry("defaultview",DAY);
        weeklistviewconfig = config.readNumEntry("weeklistviewconfig",NORMAL);
        defaultLocation=config.readEntry("defaultLocation");
        QString tmpString=config.readEntry("defaultCategories");
        QStringList tmpStringList=QStringList::split(",",tmpString);
        defaultCategories.truncate(0);
        for( QStringList::Iterator i=tmpStringList.begin(); i!=tmpStringList.end(); i++) {
                defaultCategories.resize(defaultCategories.count()+1);
                defaultCategories[defaultCategories.count()-1]=(*i).toInt();
        }
 }
 void DateBook::saveSettings()
 {
        Config config( "qpe" );
        Config configDB( "DateBook" );
        configDB.setGroup( "Main" );
        configDB.writeEntry("startviewtime",startTime);
        configDB.writeEntry("alarmpreset",aPreset);
        configDB.writeEntry("presettime",presetTime);
        configDB.writeEntry("jumptocurtime", bJumpToCurTime);
        configDB.writeEntry("rowstyle", rowStyle);
        configDB.writeEntry("defaultview",defaultView);
        configDB.writeEntry("weeklistviewconfig",weeklistviewconfig);
        configDB.writeEntry("defaultLocation",defaultLocation);
        QStringList tmpStringList;
        for( uint i=0; i<defaultCategories.count(); i++) {
                tmpStringList << QString::number(defaultCategories[i]);
        }
        configDB.writeEntry("defaultCategories",tmpStringList.join(","));
 }
 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();
                                        alarmCounter = 0;
@@ -812,216 +812,214 @@ 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 ) );
    } else if ( views->visibleWidget() == weekLstView ) {
        QDate d = weekLstView->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, const QString &location) {
        // 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...
        if(location==0) {
                if(defaultLocation.isEmpty()) {
                        ev.setLocation(tr("(Unknown)"));
                } else {
                        ev.setLocation( defaultLocation );
                }
        } else {
                ev.setLocation(location);
        }
        ev.setCategories(defaultCategories);
        ev.setStart( start );
        ev.setEnd( end );
        e = new DateEntry( onMonday, ev, ampm, &newDlg );
        e->setAlarmEnabled( aPreset, presetTime, Event::Loud );
        sv->addChild( e );
        while ( QPEApplication::execDialog( &newDlg ) ) {
                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 * ) ) );
+    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 ); // no tr needed
    frmFind.setUseDate( true );
    frmFind.setDate( currentDate() );
    QObject::connect( &frmFind,
-                      SIGNAL(signalFindClicked(const QString&, const QDate&,
+                      SIGNAL(signalFindClicked(const QString&,const QDate&,bool,bool,int)),
-                                               bool, bool, int)),
                      this,
-                      SLOT(slotDoFind(const QString&, const QDate&,
+                      SLOT(slotDoFind(const QString&,const QDate&,bool,bool,int)) );
-                                      bool, bool, int)) );
    QObject::connect( this,
                      SIGNAL(signalNotFound()),
                      &frmFind,
                      SLOT(slotNotFound()) );
    QObject::connect( this,
                      SIGNAL(signalWrapAround()),
                      &frmFind,
                      SLOT(slotWrapAround()) );
        frmFind.move(0,0);
    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;
    // if true at the end we will start at the begin again and afterwards
    // we will emit string not found
    static bool wrapAround = true;
    bool candidtate;
    candidtate = false;
    QValueList<Event> repeats = db->getRawRepeats();
    // find the candidate for the first repeat that matches...
    // first check if there can ever be a match and then compute
    // the next occurence from start. See if this event is  closer
    // to the beginning (start. next < dtEnd) and not smaller then the last
    // result. If we find a canditate we set the dtEnd to the time
    // of the ocurrence and rev to this occurence.
    // set wrap around to true because there might be more events coming
    // and we're not at the end.
    QValueListConstIterator<Event> it;
    QDate start = dt;
    for ( it = repeats.begin(); it != repeats.end(); ++it ) {
        if ( catComp( (*it).categories(), category ) ) {
            if ( (*it).match( r ) ) {
                if ( nextOccurance( *it, start, next ) ) {
                    if ( next < dtEnd && !(next <= rev.start() ) ) {
                        rev = *it;
                        dtEnd = next;
                        rev.setStart( next );
                        candidtate = true;
                        wrapAround = true;
                    }
                }
            }
        }
    }
    // now the for first non repeat...
    // dtEnd is set by the previous iteration of repeatingEvents
    // check if we find a closer item. Also set dtEnd to find even
    // more close occurrence
    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 ) {
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp
index 751a1da..ca63dc5 100644
--- a/core/pim/datebook/datebookday.cpp
+++ b/core/pim/datebook/datebookday.cpp
@@ -115,361 +115,361 @@ void DateBookDayView::moveUp()
        scrollBy(0, -20);
 }
 void DateBookDayView::moveDown()
 {
        scrollBy(0, 20);
 }
 void DateBookDayView::paintCell( QPainter *p, int, int, const QRect &cr, bool )
 {
        int w = cr.width();
        int h = cr.height();
        p->fillRect( 0, 0, w, h, colorGroup().brush( QColorGroup::Base ) );
        if ( showGrid() ) {
                // Draw our lines
                int x2 = w - 1;
                int y2 = h - 1;
                QPen pen( p->pen() );
                p->setPen( colorGroup().dark() );
                p->drawLine( x2, 0, x2, y2 );
                p->drawLine( 0, y2, x2, y2 );
                p->setPen( colorGroup().midlight() );
                p->drawLine( 0, y2 - h/2, x2, y2 - h/2);
                p->setPen( pen );
    }
 }
 void DateBookDayView::paintFocus( QPainter *, const QRect & )
 {
 }
 void DateBookDayView::resizeEvent( QResizeEvent *e )
 {
        QTable::resizeEvent( e );
        columnWidthChanged( 0 );
        emit sigColWidthChanged();
 }
 void DateBookDayView::keyPressEvent( QKeyEvent *e )
 {
        QString txt = e->text();
        if ( !txt.isNull() && txt[0] > ' ' && e->key() < 0x1000 ) {
                // we this is some sort of thing we know about...
                e->accept();
                emit sigCapturedKey( txt );
    } else {
                // I don't know what this key is, do you?
                e->ignore();
        }
 }
 void DateBookDayView::setRowStyle( int style )
 {
        if (style<0) style = 0;
        for (int i=0; i<numRows(); i++)
                setRowHeight(i, style*10+20);
 }
 void DateBookDayView::contentsMouseReleaseEvent( QMouseEvent* /* e */ )
 {
        int sh=99,eh=-1;
        for(int i=0;i<this->numSelections();i++) {
                QTableSelection sel = this->selection( i );
                sh = QMIN(sh,sel.topRow());
                eh = QMAX(sh,sel.bottomRow()+1);
        }
        if (sh > 23 || eh < 1) {
                sh=8;
                eh=9;
        }
        quickLineEdit=new DateBookDayViewQuickLineEdit(QDateTime(currDate,QTime(sh,0,0,0)),QDateTime(currDate,QTime(eh,0,0,0)),this->viewport(),"quickedit");
        quickLineEdit->setGeometry(0,0,this->columnWidth(0)-1,this->rowHeight(0));
        this->moveChild(quickLineEdit,0,sh*this->rowHeight(0));
        quickLineEdit->setFocus();
        quickLineEdit->show();
 }
 //===========================================================================
 DateBookDayViewQuickLineEdit::DateBookDayViewQuickLineEdit(const QDateTime &start, const QDateTime &end,QWidget * parent, const char *name) : QLineEdit(parent,name)
 {
        active=1;
        quickEvent.setStart(start);
        quickEvent.setEnd(end);
        connect(this,SIGNAL(returnPressed()),this,SLOT(slotReturnPressed()));
 }
 void DateBookDayViewQuickLineEdit::slotReturnPressed()
 {
                if(active && (!this->text().isEmpty())) {// Fix to avoid having this event beeing added multiple times.
                quickEvent.setDescription(this->text());
-                connect(this,SIGNAL(insertEvent(const Event &)),this->topLevelWidget(),SLOT(insertEvent(const Event &)));
+                connect(this,SIGNAL(insertEvent(const Event&)),this->topLevelWidget(),SLOT(insertEvent(const Event&)));
                emit(insertEvent(quickEvent));
                active=0;
        }
        /* we need to return to this object.. */
                QTimer::singleShot(500, this, SLOT(finallyCallClose())  );// Close and also delete this widget
 }
 void DateBookDayViewQuickLineEdit::finallyCallClose() {
    close(true); // also deletes this widget...
 }
 void DateBookDayViewQuickLineEdit::focusOutEvent ( QFocusEvent* /* e */)
 {
        slotReturnPressed(); // Reuse code to add event and close this widget.
 }
 //===========================================================================
 DateBookDay::DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb, QWidget *parent, const char *name )
    : QVBox( parent, name ), currDate( QDate::currentDate() ), db( newDb ), startTime( 0 )
 {
        widgetList.setAutoDelete( true );
        header = new DateBookDayHeader( startOnMonday, this, "day header" );
        header->setDate( currDate.year(), currDate.month(), currDate.day() );
        m_allDays = new DatebookdayAllday(newDb, this, "all day event list" );
        m_allDays->hide();
        view = new DateBookDayView( ampm, this, "day view" );
-        connect( header, SIGNAL( dateChanged( int, int, int ) ), this, SLOT( dateChanged( int, int, int ) ) );
+        connect( header, SIGNAL( dateChanged(int,int,int) ), this, SLOT( dateChanged(int,int,int) ) );
-        connect( header, SIGNAL( dateChanged( int, int, int ) ), view, SLOT( slotDateChanged( int, int, int ) ) );
+        connect( header, SIGNAL( dateChanged(int,int,int) ), view, SLOT( slotDateChanged(int,int,int) ) );
        connect( view, SIGNAL( sigColWidthChanged() ), this, SLOT( slotColWidthChanged() ) );
        connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(slotWeekChanged(bool)) );
-        connect( view, SIGNAL(sigCapturedKey(const QString &)), this, SIGNAL(sigNewEvent(const QString&)) );
+        connect( view, SIGNAL(sigCapturedKey(const QString&)), this, SIGNAL(sigNewEvent(const QString&)) );
        QTimer *timer = new QTimer( this );
                connect( timer, SIGNAL(timeout()), this, SLOT(updateView()) );//connect timer for updating timeMarker & daywidgetcolors
        timer->start( 1000*60*5, FALSE ); //update every 5min
        selectedWidget = 0;
        timeMarker =  new DateBookDayTimeMarker( this );
        timeMarker->setTime( QTime::currentTime() );
        rowStyle = -1; // initialize with bogus values
        jumpToCurTime = false;
 }
 void DateBookDay::setJumpToCurTime( bool bJump )
 {
        jumpToCurTime = bJump;
 }
 void DateBookDay::setRowStyle( int style )
 {
        if (rowStyle != style) view->setRowStyle( style );
        rowStyle = style;
 }
 void DateBookDay::updateView( void )
 {
        timeMarker->setTime( QTime::currentTime() );
        //need to find a way to update all DateBookDayWidgets
 }
 void DateBookDay::setSelectedWidget( DateBookDayWidget *w )
 {
        selectedWidget = w;
 }
 DateBookDayWidget * DateBookDay::getSelectedWidget( void )
 {
        return selectedWidget;
 }
 void DateBookDay::selectedDates( QDateTime &start, QDateTime &end )
 {
        start.setDate( currDate );
        end.setDate( currDate );
        int sh=99,eh=-1;
        int n = dayView()->numSelections();
        for (int i=0; i<n; i++) {
                QTableSelection sel = dayView()->selection( i );
                sh = QMIN(sh,sel.topRow());
                eh = QMAX(sh,sel.bottomRow()+1);
        }
        if (sh > 23 || eh < 1) {
                sh=8;
                eh=9;
        }
        start.setTime( QTime( sh, 0, 0 ) );
        end.setTime( QTime( eh, 0, 0 ) );
 }
 void DateBookDay::setDate( int y, int m, int d )
 {
        header->setDate( y, m, d );
        selectedWidget = 0;
 }
 void DateBookDay::setDate( QDate d)
 {
        header->setDate( d.year(), d.month(), d.day() );
        selectedWidget = 0;
 }
 void DateBookDay::dateChanged( int y, int m, int d )
 {
        QDate date( y, m, d );
        if ( currDate == date )
                return;
        currDate.setYMD( y, m, d );
        relayoutPage();
        dayView()->clearSelection();
        QTableSelection ts;
        if (jumpToCurTime && this->date() == QDate::currentDate())
        {
                ts.init( QTime::currentTime().hour(), 0);
                ts.expandTo( QTime::currentTime().hour(), 0);
        } else {
                ts.init( startTime, 0 );
                ts.expandTo( startTime, 0 );
        }
        dayView()->addSelection( ts );
        selectedWidget = 0;
 }
 void DateBookDay::redraw()
 {
        if ( isUpdatesEnabled() )
                relayoutPage();
 }
 void DateBookDay::getEvents()
 {
        widgetList.clear();
        /* clear the AllDay List */
        m_allDays->hide(); // just in case
        m_allDays->removeAllEvents();
        QValueList<EffectiveEvent> eventList = db->getEffectiveEvents( currDate, currDate );
        QValueListIterator<EffectiveEvent> it;
        QObject* object = 0;
        for ( it = eventList.begin(); it != eventList.end(); ++it ) {
                EffectiveEvent ev=*it;
                        if(!((ev.end().hour()==0) && (ev.end().minute()==0) && (ev.startDate()!=ev.date()))) {// Skip events ending at 00:00 starting at another day.
                    if (ev.event().type() == Event::AllDay ) {
                        object = m_allDays->addEvent( ev );
                        if (!object)
                            continue;
                    }else {
                        DateBookDayWidget* w = new DateBookDayWidget( *it, this );
                        widgetList.append( w );
                        object = w;
                    }
-                    connect( object, SIGNAL( deleteMe( const Event & ) ), this, SIGNAL( removeEvent( const Event & ) ) );
+                    connect( object, SIGNAL( deleteMe(const Event&) ), this, SIGNAL( removeEvent(const Event&) ) );
-                    connect( object, SIGNAL( duplicateMe( const Event & ) ), this, SIGNAL( duplicateEvent( const Event & ) ) );
+                    connect( object, SIGNAL( duplicateMe(const Event&) ), this, SIGNAL( duplicateEvent(const Event&) ) );
-                    connect( object, SIGNAL( editMe( const Event & ) ), this, SIGNAL( editEvent( const Event & ) ) );
+                    connect( object, SIGNAL( editMe(const Event&) ), this, SIGNAL( editEvent(const Event&) ) );
-                    connect( object, SIGNAL( beamMe( const Event & ) ), this, SIGNAL( beamEvent( const Event & ) ) );
+                    connect( object, SIGNAL( beamMe(const Event&) ), this, SIGNAL( beamEvent(const Event&) ) );
                }
        }
 }
 static int place( const DateBookDayWidget *item, bool *used, int maxn )
 {
        int place = 0;
        int start = item->event().start().hour();
        QTime e = item->event().end();
        int end = e.hour();
        if ( e.minute() < 5 )
                end--;
        if ( end < start )
                end = start;
        while ( place < maxn ) {
                bool free = TRUE;
                int s = start;
                while( s <= end ) {
                    if ( used[10*s+place] ) {
                                free = FALSE;
                                break;
                    }
                        s++;
                }
                if ( free )
                        break;
                place++;
        }
        if ( place == maxn ) {
                return -1;
        }
        while( start <= end ) {
                used[10*start+place] = TRUE;
                start++;
        }
        return place;
 }
 void DateBookDay::relayoutPage( bool fromResize )
 {
        setUpdatesEnabled( FALSE );
        if ( !fromResize ) {
                getEvents();    // no need we already have them!
                if (m_allDays->items() > 0 )
                    m_allDays->show();
                /*
                 * else if ( m_allDays->items() ==  0 ) already hide in getEvents
                 */
        }
        widgetList.sort();
        //sorts the widgetList by the heights of the widget so that the tallest widgets are at the beginning
        //this is needed for the simple algo below to work correctly, otherwise some widgets would be drawn outside the view
        int wCount = widgetList.count();
        int wid = view->columnWidth(0)-1;
        int wd;
        int n = 1;
        QArray<int> anzIntersect(wCount); //this stores the number of maximal intersections of each widget
        for (int i = 0; i<wCount; anzIntersect[i] = 1, i++);
        if ( wCount < 20 ) {
                QArray<QRect> geometries(wCount);
                        for (int i = 0; i < wCount; geometries[i] = widgetList.at(i)->geometry(), i++);//stores geometry for each widget in vector
                for ( int i = 0; i < wCount; i++) {
                        QValueList<int> intersectedWidgets;
                        //find all widgets intersecting with widgetList.at(i)
                        for ( int j = 0; j < wCount; j++) {
                                if (i != j)
                                        if (geometries[j].intersects(geometries[i]))
                                                intersectedWidgets.append(j);
                        }
                        //for each of these intersecting widgets find out how many widgets are they intersecting with
                        for ( uint j = 0; j < intersectedWidgets.count(); j++)
                        {
                                QArray<int> inter(wCount);
                                inter[j]=1;
                                if (intersectedWidgets[j] != -1)
                                        for ( uint k = j; k < intersectedWidgets.count(); k++) {
                                                if (j != k && intersectedWidgets[k] != -1)
                                                        if (geometries[intersectedWidgets[k]].intersects(geometries[intersectedWidgets[j]])) {
                                                                inter[j]++;
                                                                intersectedWidgets[k] = -1;
                                                        }
                                                if (inter[j] > anzIntersect[i]) anzIntersect[i] = inter[j] + 1;
                                        }
diff --git a/core/pim/datebook/datebookdayallday.cpp b/core/pim/datebook/datebookdayallday.cpp
index d43d31a..a0aefd3 100644
--- a/core/pim/datebook/datebookdayallday.cpp
+++ b/core/pim/datebook/datebookdayallday.cpp
@@ -1,159 +1,159 @@
 /****************************************************************************
 ** GPL by Rajko Albrecht
 **
 **
 **
 **
 **
 ****************************************************************************/
 #include "datebookdayallday.h"
 #include <qlayout.h>
 #include <qpe/ir.h>
 #include <qpopupmenu.h>
 #include <qtimer.h>
 #include "datebookday.h"
 /*
 *  Constructs a DatebookdayAllday which is a child of 'parent', with the
 *  name 'name' and widget flags set to 'f'
 */
 DatebookdayAllday::DatebookdayAllday(DateBookDB* db, QWidget* parent,  const char* name, WFlags  )
    : QScrollView( parent, name ),item_count(0),dateBook(db)
 {
    if ( !name )
        setName( "DatebookdayAllday" );
    setMinimumSize( QSize( 0, 0 ) );
    setMaximumHeight(3* (QFontMetrics(font()).height()+4) );
    m_MainFrame = new QFrame(viewport());
    m_MainFrame->setFrameStyle(QFrame::NoFrame|QFrame::Plain);
    setFrameStyle(QFrame::NoFrame|QFrame::Plain);
    setResizePolicy( QScrollView::Default );
    setHScrollBarMode( AlwaysOff );
    addChild(m_MainFrame);
    datebookdayalldayLayout = new QVBoxLayout( m_MainFrame );
    datebookdayalldayLayout->setSpacing( 0 );
    datebookdayalldayLayout->setMargin( 0 );
    lblDesc = new DatebookEventDesc(parent->parentWidget(),"");
    lblDesc->setBackgroundColor(Qt::yellow);
    lblDesc->hide();
    subWidgets.setAutoDelete(true);
 }
 /*
 *  Destroys the object and frees any allocated resources
 */
 DatebookdayAllday::~DatebookdayAllday()
 {
    // no need to delete child widgets, Qt does it all for us
 }
 DatebookAlldayDisp* DatebookdayAllday::addEvent(const EffectiveEvent&ev)
 {
    DatebookAlldayDisp * lb;
    lb = new DatebookAlldayDisp(dateBook,ev,m_MainFrame,NULL);
    lb->show();
    datebookdayalldayLayout->addWidget(lb);
    subWidgets.append(lb);
-    connect(lb,SIGNAL(displayMe(const Event &)),lblDesc,SLOT(disp_event(const Event&)));
+    connect(lb,SIGNAL(displayMe(const Event&)),lblDesc,SLOT(disp_event(const Event&)));
    ++item_count;
    return lb;
 }
 void DatebookdayAllday::removeAllEvents()
 {
    subWidgets.clear();
    item_count = 0;
 }
 DatebookAlldayDisp::DatebookAlldayDisp(DateBookDB *db,const EffectiveEvent& ev,
                                       QWidget* parent,const char* name,WFlags f)
    : QLabel(parent,name,f),m_Ev(ev),dateBook(db)
 {
    QString strDesc = m_Ev.description();
    strDesc = strDesc.replace(QRegExp("<"),"&#60;");
    setBackgroundColor(yellow);
    setText(strDesc);
    setFrameStyle(QFrame::Raised|QFrame::Panel);
    int s = QFontMetrics(font()).height()+4;
    setMaximumHeight( s );
    setMinimumSize( QSize( 0, s ) );
 }
 DatebookAlldayDisp::~DatebookAlldayDisp()
 {
 }
 void DatebookAlldayDisp::beam_single_event()
 {
    // create an Event and beam it...
    /*
     * Start with the easy stuff. If start and  end date is the same we can just use
     * the values of effective m_Events
     * If it is a multi day m_Event we need to find the real start and end date...
     */
    if ( m_Ev.event().start().date() == m_Ev.event().end().date() ) {
        Event m_Event( m_Ev.event() );
        QDateTime dt( m_Ev.date(), m_Ev.start() );
        m_Event.setStart( dt );
        dt.setTime( m_Ev.end() );
        m_Event.setEnd( dt );
        emit beamMe( m_Event );
    }else {
        /*
         * at least the the Times are right now
         */
        QDateTime start( m_Ev.event().start() );
        QDateTime end  ( m_Ev.event().end  () );
        /*
         * ok we know the start date or we need to find it
         */
        if ( m_Ev.start() != QTime( 0, 0, 0 ) ) {
            start.setDate( m_Ev.date() );
        }else {
            QDate dt = DateBookDay::findRealStart( m_Ev.event().uid(), m_Ev.date(), dateBook );
            start.setDate( dt );
        }
        /*
         * ok we know now the end date...
         * else
         *   get to know the offset btw the real start and real end
         *   and then add it to the new start date...
         */
        if ( m_Ev.end() != QTime(23, 59, 59 ) ) {
            end.setDate( m_Ev.date() );
        }else{
            int days = m_Ev.event().start().date().daysTo( m_Ev.event().end().date() );
            end.setDate( start.date().addDays( days ) );
        }
        Event m_Event( m_Ev.event() );
        m_Event.setStart( start );
        m_Event.setEnd  ( end   );
        emit beamMe( m_Event );
    }
 }
 void DatebookAlldayDisp::mousePressEvent(QMouseEvent*e)
 {
    Event ev = m_Ev.event();
    QColor b = backgroundColor();
    setBackgroundColor(green);
    update();
    QPopupMenu m;
    m.insertItem( DateBookDayWidget::tr( "Edit" ), 1 );
    m.insertItem( DateBookDayWidget::tr( "Duplicate" ), 4 );
    m.insertItem( DateBookDayWidget::tr( "Delete" ), 2 );
    if(Ir::supported()) m.insertItem( DateBookDayWidget::tr( "Beam" ), 3 );
    if(Ir::supported() && m_Ev.event().doRepeat() ) m.insertItem( DateBookDayWidget::tr( "Beam this occurence"), 5 );
    m.insertItem( tr( "Info"),6);
diff --git a/core/pim/datebook/datebookdayheaderimpl.cpp b/core/pim/datebook/datebookdayheaderimpl.cpp
index 213c843..51b78ca 100644
--- a/core/pim/datebook/datebookdayheaderimpl.cpp
+++ b/core/pim/datebook/datebookdayheaderimpl.cpp
@@ -3,194 +3,194 @@
 **
 ** 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.
 **
 **********************************************************************/
 #include "datebookdayheaderimpl.h"
 #include <qpe/datebookmonth.h>
 #include <qpe/resource.h>
 #include <qbuttongroup.h>
 #include <qtoolbutton.h>
 /*
 *  Constructs a DateBookDayHeader which is a child of 'parent', with the
 *  name 'name' and widget flags set to 'f'
 *
 *  The dialog will by default be modeless, unless you set 'modal' to
 *  TRUE to construct a modal dialog.
 */
 DateBookDayHeader::DateBookDayHeader( bool useMonday,
                                      QWidget* parent,  const char* name )
    : DateBookDayHeaderBase( parent, name ),
      bUseMonday( useMonday )
 {
    connect(date,SIGNAL(pressed()),this,SLOT(pickDate()));
    setupNames();
    forward->setPixmap(  Resource::loadPixmap( "forward" ) );
    back->setPixmap(  Resource::loadPixmap( "back" ) );
    forwardweek->setPixmap(  Resource::loadPixmap( "fastforward" ) );
    backweek->setPixmap(  Resource::loadPixmap( "fastback" ) );
    setBackgroundMode( PaletteButton );
    grpDays->setBackgroundMode( PaletteButton );
 }
 /*
 *  Destroys the object and frees any allocated resources
 */
 DateBookDayHeader::~DateBookDayHeader()
 {
    // no need to delete child widgets, Qt does it all for us
 }
 void DateBookDayHeader::setStartOfWeek( bool onMonday )
 {
    bUseMonday = onMonday;
    setupNames();
    setDate( currDate.year(), currDate.month(), currDate.day() );
 }
 void DateBookDayHeader::setupNames()
 {
    if ( bUseMonday ) {
        cmdDay1->setText( DateBookDayHeaderBase::tr("Monday").left(1) );
        cmdDay2->setText( DateBookDayHeaderBase::tr("Tuesday").left(1) );
        cmdDay3->setText( DateBookDayHeaderBase::tr("Wednesday").left(1) );
        cmdDay4->setText( DateBookDayHeaderBase::tr("Thursday").left(1) );
        cmdDay5->setText( DateBookDayHeaderBase::tr("Friday").left(1) );
        cmdDay6->setText( DateBookDayHeaderBase::tr("Saturday").left(1) );
        cmdDay7->setText( DateBookDayHeaderBase::tr("Sunday").left(1) );
    } else {
        cmdDay1->setText( DateBookDayHeaderBase::tr("Sunday").left(1) );
        cmdDay2->setText( DateBookDayHeaderBase::tr("Monday").left(1) );
        cmdDay3->setText( DateBookDayHeaderBase::tr("Tuesday").left(1) );
        cmdDay4->setText( DateBookDayHeaderBase::tr("Wednesday").left(1) );
        cmdDay5->setText( DateBookDayHeaderBase::tr("Thursday").left(1) );
        cmdDay6->setText( DateBookDayHeaderBase::tr("Friday").left(1) );
        cmdDay7->setText( DateBookDayHeaderBase::tr("Saturday").left(1) );
    }
 }
 void DateBookDayHeader::pickDate()
 {
    static QPopupMenu *m1 = 0;
    static DateBookMonth *picker = 0;
    if ( !m1 ) {
        m1 = new QPopupMenu( this );
        picker = new DateBookMonth( m1, 0, TRUE );
        m1->insertItem( picker );
-        connect( picker, SIGNAL( dateClicked( int, int, int ) ),
+        connect( picker, SIGNAL( dateClicked(int,int,int) ),
-                 this, SLOT( setDate( int, int, int ) ) );
+                 this, SLOT( setDate(int,int,int) ) );
        connect( m1, SIGNAL( aboutToHide() ),
                 this, SLOT( gotHide() ) );
    }
    picker->setDate( currDate.year(), currDate.month(), currDate.day() );
    m1->popup(mapToGlobal(date->pos()+QPoint(0,date->height())));
    picker->setFocus();
 }
 void DateBookDayHeader::gotHide()
 {
    // we have to redo the button...
    date->setDown( false );
 }
 /*
 * public slot
 */
 void DateBookDayHeader::goBack()
 {
    currDate = currDate.addDays( -1 );
    setDate( currDate.year(), currDate.month(), currDate.day() );
 }
 /*
 * public slot
 */
 void DateBookDayHeader::goForward()
 {
    currDate = currDate.addDays( 1 );
    setDate( currDate.year(), currDate.month(), currDate.day() );
 }
 /*
 * public slot
 */
 void DateBookDayHeader::goBackWeek()
 {
    currDate = currDate.addDays( -7 );
    setDate( currDate.year(), currDate.month(), currDate.day() );
 }
 /*
 * public slot
 */
 void DateBookDayHeader::goForwardWeek()
 {
    currDate = currDate.addDays( 7 );
    setDate( currDate.year(), currDate.month(), currDate.day() );
 }
 /*
 * public slot
 */
 void DateBookDayHeader::setDate( int y, int m, int d )
 {
    currDate.setYMD( y, m, d );
    date->setText( TimeString::shortDate( currDate ) );
    int iDayOfWeek = currDate.dayOfWeek();
    // cleverly adjust the day depending on how we start the week
    if ( bUseMonday )
        iDayOfWeek--;
    else {
        if ( iDayOfWeek == 7 )  // Sunday
            iDayOfWeek = 0;
    }
    grpDays->setButton( iDayOfWeek );
    emit dateChanged( y, m, d );
 }
 /*
 * public slot
 */
 void DateBookDayHeader::setDay( int day )
 {
    int realDay;
    int dayOfWeek = currDate.dayOfWeek();
    // a little adjustment is needed...
    if ( bUseMonday )
        realDay = day + 1 ;
    else if ( !bUseMonday && day == 0 ) // sunday
        realDay = 7;
    else
        realDay = day;
    // special cases first...
    if ( realDay == 7 && !bUseMonday )  {
        while ( currDate.dayOfWeek() != realDay )
            currDate = currDate.addDays( -1 );
    } else if ( !bUseMonday && dayOfWeek == 7 && dayOfWeek > realDay ) {
        while ( currDate.dayOfWeek() != realDay )
            currDate = currDate.addDays( 1 );
    } else if ( dayOfWeek < realDay ) {
        while ( currDate.dayOfWeek() < realDay )
            currDate = currDate.addDays( 1 );
    } else if ( dayOfWeek > realDay ) {
        while ( currDate.dayOfWeek() > realDay )
            currDate = currDate.addDays( -1 );
diff --git a/core/pim/datebook/datebooksettings.cpp b/core/pim/datebook/datebooksettings.cpp
index a6d04ba..cb4b73b 100644
--- a/core/pim/datebook/datebooksettings.cpp
+++ b/core/pim/datebook/datebooksettings.cpp
@@ -1,130 +1,130 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 #include "datebooksettings.h"
 #include <qpe/qpeapplication.h>
 #include <qspinbox.h>
 #include <qcheckbox.h>
 DateBookSettings::DateBookSettings( bool whichClock, QWidget *parent,
                                    const char *name, bool modal, WFlags fl )
    : DateBookSettingsBase( parent, name, modal, fl ),
      ampm( whichClock )
 {
        init();
-        QObject::connect( qApp, SIGNAL( clockChanged( bool ) ), this, SLOT( slotChangeClock( bool ) ) );
+        QObject::connect( qApp, SIGNAL( clockChanged(bool) ), this, SLOT( slotChangeClock(bool) ) );
        QArray<int> categories;
        comboCategory->setCategories( categories, "Calendar", tr("Calendar") );
 }
 DateBookSettings::~DateBookSettings()
 {
 }
 void DateBookSettings::setStartTime( int newStartViewTime )
 {
    if ( ampm ) {
        if ( newStartViewTime >= 12 ) {
            newStartViewTime %= 12;
            if ( newStartViewTime == 0 )
                newStartViewTime = 12;
            spinStart->setSuffix( tr(":00 PM") );
        }
        else if ( newStartViewTime == 0 ) {
            newStartViewTime = 12;
            spinStart->setSuffix( tr(":00 AM") );
        }
        oldtime = newStartViewTime;
    }
    spinStart->setValue( newStartViewTime );
 }
 int DateBookSettings::startTime() const
 {
    int returnMe = spinStart->value();
    if ( ampm ) {
        if ( returnMe != 12 && spinStart->suffix().contains(tr("PM"), FALSE) )
            returnMe += 12;
        else if (returnMe == 12 && spinStart->suffix().contains(tr("AM"), TRUE))
            returnMe = 0;
    }
    return returnMe;
 }
 void DateBookSettings::setAlarmPreset( bool bAlarm, int presetTime )
 {
    chkAlarmPreset->setChecked( bAlarm );
    if ( presetTime >=5 )
        spinPreset->setValue( presetTime );
 }
 bool DateBookSettings::alarmPreset() const
 {
    return chkAlarmPreset->isChecked();
 }
 int DateBookSettings::presetTime() const
 {
    return spinPreset->value();
 }
 void DateBookSettings::slot12Hour( int i )
 {
    if ( ampm ) {
        if ( spinStart->suffix().contains( tr("AM"), FALSE ) ) {
            if ( oldtime == 12 && i == 11 || oldtime == 11 && i == 12 )
                spinStart->setSuffix( tr(":00 PM") );
        } else {
            if ( oldtime == 12 && i == 11 || oldtime == 11 && i == 12 )
                spinStart->setSuffix( tr(":00 AM") );
        }
        oldtime = i;
    }
 }
 void DateBookSettings::init()
 {
    if ( ampm ) {
        spinStart->setMinValue( 1 );
        spinStart->setMaxValue( 12 );
        spinStart->setValue( 12 );
        spinStart->setSuffix( tr(":00 AM") );
        oldtime = 12;
    } else {
        spinStart->setMinValue( 0 );
        spinStart->setMaxValue( 23 );
        spinStart->setSuffix( tr(":00") );
    }
 }
 void DateBookSettings::slotChangeClock( bool whichClock )
 {
    int saveMe;
    saveMe = spinStart->value();
    if ( ampm && spinStart->suffix().contains( tr("AM"), FALSE ) ) {
        if ( saveMe == 12 )
            saveMe = 0;
    } else if ( ampm && spinStart->suffix().contains( tr("PM"), FALSE )  ) {
        if ( saveMe != 12 )
            saveMe += 12;
diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp
index 933e191..7503751 100644
--- a/core/pim/datebook/datebookweek.cpp
+++ b/core/pim/datebook/datebookweek.cpp
@@ -269,196 +269,196 @@ void DateBookWeekView::drawContents( QPainter *p, int cx, int cy, int cw, int ch
        int y = t*rowHeight;
        if ( QRect( 1, y, 20, rowHeight ).intersects( ur ) ) {
            QString s;
            if ( ampm ) {
                if ( t == 0 )
                    s = QString::number( 12 );
                else if ( t == 12 )
                    s = QString::number(12) + tr( "p" );
                else if ( t > 12 ) {
                    if ( t - 12 < 10 )
                        s = " ";
                    else
                        s = "";
                    s += QString::number( t - 12 ) + tr("p");
                } else {
                    if ( 12 - t < 3 )
                        s = "";
                    else
                        s = " ";
                    s += QString::number( t );
                }
            } else {
                s = QString::number( t );
                if ( s.length() == 1 )
                    s.prepend( "0" );
            }
            p->drawText( 1, y+p->fontMetrics().ascent()+1, s );
        }
    }
    QListIterator<DateBookWeekItem> it(items);
    for ( ; it.current(); ++it ) {
        DateBookWeekItem *i = it.current();
        if ( i->geometry().intersects( ur ) ) {
            p->setBrush( i->color() );
            p->drawRect( i->geometry() );
        }
    }
 }
 void DateBookWeekView::resizeEvent( QResizeEvent *e )
 {
    const int hourWidth = 20;
    QScrollView::resizeEvent( e );
    //HEAD
    /*
    int avail = visibleWidth();
    header->setGeometry( leftMargin()+frameWidth()+frameRect().left() , frameWidth(),
                          visibleWidth(), header->sizeHint().height() );
    setMargins( 0, header->sizeHint().height(), 0, 0 );
    */
    //BRANCH_1_0
    int avail = width()-qApp->style().scrollBarExtent().width()-1;
    header->setGeometry( 0, 0, avail, header->sizeHint().height() );
    setMargins( 0, header->height(), 0, 0 );
    header->resizeSection( 0, hourWidth );
    int sw = (avail - hourWidth) / 7;
    for ( int i = 1; i < 7; i++ )
        header->resizeSection( i, sw );
    header->resizeSection( 7, avail - hourWidth - sw*6 );
 }
 void DateBookWeekView::setStartOfWeek( bool bStartOnMonday )
 {
    bOnMonday = bStartOnMonday;
    initNames();
 }
 //-------------------------------------------------------------------
 DateBookWeek::DateBookWeek( bool ap, bool startOnMonday, DateBookDB *newDB,
                            QWidget *parent, const char *name )
    : QWidget( parent, name ),
      db( newDB ),
      startTime( 0 ),
      ampm( ap ),
      bStartOnMonday( startOnMonday )
 {
        setFocusPolicy(StrongFocus);
        QVBoxLayout *vb = new QVBoxLayout( this );
        header = new DateBookWeekHeader( bStartOnMonday, this );
        view = new DateBookWeekView( ampm, startOnMonday, this );
        vb->addWidget( header );
        vb->addWidget( view );
        lblDesc = new QLabel( this, "event label" );
        lblDesc->setFrameStyle( QFrame::Plain | QFrame::Box );
        lblDesc->setBackgroundColor( yellow );
        lblDesc->hide();
        tHide = new QTimer( this );
-        connect( view, SIGNAL( showDay( int ) ), this, SLOT( showDay( int ) ) );
+        connect( view, SIGNAL( showDay(int) ), this, SLOT( showDay(int) ) );
        connect( view, SIGNAL(signalShowEvent(const EffectiveEvent&)), this, SLOT(slotShowEvent(const EffectiveEvent&)) );
        connect( view, SIGNAL(signalHideEvent()), this, SLOT(slotHideEvent()) );
-        connect( header, SIGNAL( dateChanged( QDate &) ), this, SLOT( dateChanged( QDate &) ) );
+        connect( header, SIGNAL( dateChanged(QDate&) ), this, SLOT( dateChanged(QDate&) ) );
        connect( tHide, SIGNAL( timeout() ), lblDesc, SLOT( hide() ) );
        connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(slotWeekChanged(bool)) );
        connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(slotClockChanged(bool)));
        setDate(QDate::currentDate());
 }
 void DateBookWeek::keyPressEvent(QKeyEvent *e)
 {
    switch(e->key()) {
        case Key_Up:
            view->scrollBy(0, -20);
            break;
        case Key_Down:
            view->scrollBy(0, 20);
            break;
        case Key_Left:
               setDate(date().addDays(-7));
            break;
        case Key_Right:
            setDate(date().addDays(7));
            break;
        default:
            e->ignore();
    }
 }
 void DateBookWeek::showDay( int day )
 {
        QDate d=bdate;
        // Calculate offset to first day of week.
        int dayoffset=d.dayOfWeek() % 7;
        if(bStartOnMonday) dayoffset--;
        day--;
        d=d.addDays(day-dayoffset);
        emit showDate( d.year(), d.month(), d.day() );
 }
 void DateBookWeek::setDate( int y, int m, int d )
 {
        setDate(QDate(y, m, d));
 }
 void DateBookWeek::setDate(QDate newdate)
 {
        bdate=newdate;
        dow = newdate.dayOfWeek();
        header->setDate( newdate );
 }
 void DateBookWeek::dateChanged( QDate &newdate )
 {
        bdate=newdate;
        getEvents();
 }
 QDate DateBookWeek::date() const
 {
        return bdate;
 }
 void DateBookWeek::getEvents()
 {
        QDate startWeek = weekDate();
        QDate endWeek = startWeek.addDays( 6 );
        QValueList<EffectiveEvent> eventList = db->getEffectiveEvents(startWeek, endWeek);
        view->showEvents( eventList );
        view->moveToHour( startTime );
 }
 void DateBookWeek::generateAllDayTooltext( QString& text ) {
        text += "<b>" + tr("This is an all day event.") + "</b><br>";
 }
 void DateBookWeek::generateNormalTooltext( QString& str, const EffectiveEvent &ev ) {
        str += "<b>" + QObject::tr("Start") + "</b>: ";
        str += TimeString::timeString( ev.event().start().time(), ampm, FALSE );
        if( ev.startDate()!=ev.endDate() ) {
                str += " <i>" + TimeString::longDateString( ev.startDate() )+"</i>";
        }
        str += "<br>";
        str += "<b>" + QObject::tr("End") + "</b>: ";
        str += TimeString::timeString( ev.event().end().time(), ampm, FALSE );
        if( ev.startDate()!=ev.endDate() ) {
                str += " <i>" + TimeString::longDateString( ev.endDate() ) + "</i>";
        }
 }
 void DateBookWeek::slotShowEvent( const EffectiveEvent &ev )
 {
    if ( tHide->isActive() )
        tHide->stop();
diff --git a/core/pim/datebook/datebookweekheaderimpl.cpp b/core/pim/datebook/datebookweekheaderimpl.cpp
index eaa9730..c237b2d 100644
--- a/core/pim/datebook/datebookweekheaderimpl.cpp
+++ b/core/pim/datebook/datebookweekheaderimpl.cpp
@@ -1,120 +1,120 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 #include "datebookweekheaderimpl.h"
 #include "datebookweek.h"
 #include <qpe/resource.h>
 #include <qpe/datebookmonth.h>
 #include <qtoolbutton.h>
 /*
 *  Constructs a DateBookWeekHeader which is a child of 'parent', with the
 *  name 'name' and widget flags set to 'f'
 */
 DateBookWeekHeader::DateBookWeekHeader( bool startOnMonday, QWidget* parent, const char* name, WFlags fl )
    : DateBookWeekHeaderBase( parent, name, fl ),
      bStartOnMonday( startOnMonday )
 {
        setBackgroundMode( PaletteButton );
        labelDate->setBackgroundMode( PaletteButton );
        backmonth->setPixmap( Resource::loadPixmap("fastback") );
        backweek->setPixmap( Resource::loadPixmap("back") );
        forwardweek->setPixmap( Resource::loadPixmap("forward") );
        forwardmonth->setPixmap( Resource::loadPixmap("fastforward") );
 }
 /*
 *  Destroys the object and frees any allocated resources
 */
 DateBookWeekHeader::~DateBookWeekHeader()
 {
    // no need to delete child widgets, Qt does it all for us
 }
 void DateBookWeekHeader::pickDate()
 {
        static QPopupMenu *m1 = 0;
        static DateBookMonth *picker = 0;
        if ( !m1 ) {
                m1 = new QPopupMenu( this );
                picker = new DateBookMonth( m1, 0, TRUE );
                m1->insertItem( picker );
-                connect( picker, SIGNAL( dateClicked( int, int, int ) ), this, SLOT( setDate( int, int, int ) ) );
+                connect( picker, SIGNAL( dateClicked(int,int,int) ), this, SLOT( setDate(int,int,int) ) );
        //      connect( m1, SIGNAL( aboutToHide() ), this, SLOT( gotHide() ) );
        }
        picker->setDate( date.year(), date.month(), date.day() );
        m1->popup(mapToGlobal(labelDate->pos()+QPoint(0,labelDate->height())));
        picker->setFocus();
 }
 void DateBookWeekHeader::nextMonth()
 {
        qWarning("nextMonth() " );
        setDate(date.addDays(28));
 }
 void DateBookWeekHeader::prevMonth()
 {
        qWarning("prevMonth() " );
        setDate(date.addDays(-28));
 }
 void DateBookWeekHeader::nextWeek()
 {
        qWarning("nextWeek() " );
        setDate(date.addDays(7));
 }
 void DateBookWeekHeader::prevWeek()
 {
        qWarning("prevWeek() ");
        setDate(date.addDays(-7));
 }
 void DateBookWeekHeader::setDate( int y, int m, int d )
 {
        setDate(QDate(y,m,d));
 }
 void DateBookWeekHeader::setDate(const QDate &d) {
        int year,week,dayofweek;
        date=d;
        dayofweek=d.dayOfWeek();
        if(bStartOnMonday)
            dayofweek--;
        else if( dayofweek == 7 )
            // we already have the right day -7 would lead to the current week..
            dayofweek = 0;
        date=date.addDays(-dayofweek);
        calcWeek(date,week,year,bStartOnMonday);
        QDate start=date;
        QDate stop=start.addDays(6);
        labelDate->setText( QString::number(start.day()) + "." +
                        Calendar::nameOfMonth( start.month()) + "-" +
                        QString::number(stop.day()) + "." +
                        Calendar::nameOfMonth( stop.month()) +" ("+
                        tr("w")+":"+QString::number( week ) +")");
        date = d; // bugfix: 0001126 - date has to be the selected date, not monday!
        emit dateChanged(date);
 }
 void DateBookWeekHeader::setStartOfWeek( bool onMonday )
 {
        bStartOnMonday = onMonday;
        setDate( date );
 }
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index 42a1753..af40143 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -1,394 +1,394 @@
 #include "datebookweeklst.h"
 #include "datebook.h"
 #include <qpe/datebookmonth.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qlayout.h>
 #include <qtoolbutton.h>
 #include <qtl.h>
 bool calcWeek(const QDate &d, int &week, int &year,bool startOnMonday = false);
 DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, const char* name, WFlags fl)
    : DateBookWeekLstHeaderBase(parent, name, fl)
 {
        setBackgroundMode( PaletteButton );
        labelDate->setBackgroundMode( PaletteButton );
        forwardweek->setBackgroundMode( PaletteButton );
        forwardweek->setPixmap( Resource::loadPixmap("forward") );
        forwardmonth->setBackgroundMode( PaletteButton );
        forwardmonth->setPixmap( Resource::loadPixmap("fastforward") );
        backweek->setBackgroundMode( PaletteButton );
        backweek->setPixmap( Resource::loadPixmap("back") );
        backmonth->setBackgroundMode( PaletteButton );
        backmonth->setPixmap( Resource::loadPixmap("fastback") );
        DateBookWeekLstHeaderBaseLayout->setSpacing(0);
        DateBookWeekLstHeaderBaseLayout->setMargin(0);
        //setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding));
        setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed));
        connect(backmonth, SIGNAL(clicked()), this, SLOT(prevMonth()));
        connect(backweek, SIGNAL(clicked()), this, SLOT(prevWeek()));
        connect(forwardweek, SIGNAL(clicked()), this, SLOT(nextWeek()));
        connect(forwardmonth, SIGNAL(clicked()), this, SLOT(nextMonth()));
        connect(labelDate, SIGNAL(clicked()), this, SLOT(pickDate()));
        connect(dbl, SIGNAL(toggled(bool)), this, SIGNAL(setDbl(bool)));
        bStartOnMonday=onM;
 }
 DateBookWeekLstHeader::~DateBookWeekLstHeader(){}
 void DateBookWeekLstHeader::setDate(const QDate &d) {
        int year,week,dayofweek;
        date=d;
        dayofweek=d.dayOfWeek();
        if(bStartOnMonday)
            dayofweek--;
        else if( dayofweek == 7 )
            /* we already have the right day -7 would lead to the same week */
            dayofweek = 0;
        date=date.addDays(-dayofweek);
        calcWeek(date,week,year,bStartOnMonday);
        QDate start=date;
        QDate stop=start.addDays(6);
        labelDate->setText( QString::number(start.day()) + "." +
                        Calendar::nameOfMonth( start.month() ) + "-" +
                        QString::number(stop.day()) + "." +
                                                Calendar::nameOfMonth( stop.month()) +" ("+
                        tr("w")+":"+QString::number( week ) +")");
        date = d; // bugfix: 0001126 - date has to be the selected date, not monday!
        emit dateChanged(date);
 }
 void DateBookWeekLstHeader::pickDate() {
        static QPopupMenu *m1 = 0;
        static DateBookMonth *picker = 0;
        if ( !m1 ) {
                m1 = new QPopupMenu( this );
                picker = new DateBookMonth( m1, 0, TRUE );
                m1->insertItem( picker );
-                connect( picker, SIGNAL( dateClicked( int, int, int ) ),this, SLOT( setDate( int, int, int ) ) );
+                connect( picker, SIGNAL( dateClicked(int,int,int) ),this, SLOT( setDate(int,int,int) ) );
                //connect( m1, SIGNAL( aboutToHide() ),
                //this, SLOT( gotHide() ) );
        }
        picker->setDate( date.year(), date.month(), date.day() );
        m1->popup(mapToGlobal(labelDate->pos()+QPoint(0,labelDate->height())));
        picker->setFocus();
 }
 void DateBookWeekLstHeader::setDate(int y, int m, int d) {
        setDate(QDate(y,m,d));
 }
 void DateBookWeekLstHeader::nextWeek() {
        setDate(date.addDays(7));
 }
 void DateBookWeekLstHeader::prevWeek() {
        setDate(date.addDays(-7));
 }
 void DateBookWeekLstHeader::nextMonth()
 {
        setDate(date.addDays(28));
 }
 void DateBookWeekLstHeader::prevMonth()
 {
        setDate(date.addDays(-28));
 }
 DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /* onM */,
                                             QWidget* parent,
                                             const char* name,
                                             WFlags fl )
    : DateBookWeekLstDayHdrBase(parent, name, fl) {
        date=d;
        static const QString wdays=tr("MTWTFSSM",  "Week days");
        char day=wdays[d.dayOfWeek()-1];
    //dont use dayOfWeek() to save space !
        label->setText( QString(QObject::tr(QString(QChar(day)))) + " " +QString::number(d.day()) );
     add->setText("+");
        if (d == QDate::currentDate()) {
                QPalette pal=label->palette();
                pal.setColor(QColorGroup::Foreground, QColor(0,0,255));
                label->setPalette(pal);
                /*
                QFont f=label->font();
                f.setItalic(true);
                label->setFont(f);
                label->setPalette(QPalette(QColor(0,0,255),label->backgroundColor()));
                */
        } else if (d.dayOfWeek() == 7) { // FIXME: Match any holiday
                QPalette pal=label->palette();
                pal.setColor(QColorGroup::Foreground, QColor(255,0,0));
                label->setPalette(pal);
        }
        connect (label, SIGNAL(clicked()), this, SLOT(showDay()));
        connect (add, SIGNAL(clicked()), this, SLOT(newEvent()));
 }
 void DateBookWeekLstDayHdr::showDay() {
        emit showDate(date.year(), date.month(), date.day());
 }
 void DateBookWeekLstDayHdr::newEvent() {
    QDateTime start, stop;
    start=stop=date;
    start.setTime(QTime(10,0));
    stop.setTime(QTime(12,0));
    emit addEvent(start,stop,"",0);
 }
 DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
                                                int weeklistviewconfig,
                                                QWidget* parent,
                                                const char* name,
                                                WFlags fl ) : OClickableLabel(parent,name,fl), event(ev)
 {
        // old values... lastday = "__|__", middle="   |---", Firstday="00:00",
        QString s,start,middle,end,day;
        qDebug("weeklistviewconfig=%d",weeklistviewconfig);
                if(weeklistviewconfig==NONE) {// No times displayed.
        //      start.sprintf("%.2d:%.2d-",ev.start().hour(),ev.start().minute());
        //      middle.sprintf("<--->");
        //      end.sprintf("-%.2d:%.2d",ev.end().hour(),ev.end().minute());
        //      day.sprintf("%.2d:%.2d-%.2d:%.2d",ev.start().hour(),ev.start().minute(),ev.end().hour(),ev.end().minute());
                } else if(weeklistviewconfig==NORMAL) {// "Normal", only display start time.
                start.sprintf("%.2d:%.2d",ev.start().hour(),ev.start().minute());
                middle.sprintf("   |---");
                end.sprintf("__|__");
                day.sprintf("%.2d:%.2d",ev.start().hour(),ev.start().minute());
        } else if(weeklistviewconfig==EXTENDED) { // Extended mode, display start and end times.
                start.sprintf("%.2d:%.2d-",ev.start().hour(),ev.start().minute());
                middle.sprintf("<--->");
                end.sprintf("-%.2d:%.2d",ev.end().hour(),ev.end().minute());
                day.sprintf("%.2d:%.2d-%.2d:%.2d",ev.start().hour(),ev.start().minute(),ev.end().hour(),ev.end().minute());
        }
        if(ev.event().type() == Event::Normal) {
                        if(ev.startDate()==ev.date() && ev.endDate()==ev.date()) {// day event.
                        s=day;
                        } else if(ev.startDate()==ev.date()) {// start event.
                        s=start;
                } else if(ev.endDate()==ev.date()) { // end event.
                        s=end;
                        } else {// middle day.
                        s=middle;
                }
        } else {
                s="";
        }
        setText(QString(s) + " " + ev.description());
        connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
        setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
 }
 void DateBookWeekLstEvent::editMe() {
        emit editEvent(event.event());
 }
 DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
                                         const QDate &d, bool onM,
                                         QWidget* parent,
                                         const char* name, WFlags fl)
    : QWidget( parent, name, fl )
 {
        Config config("DateBook");
        config.setGroup("Main");
        int weeklistviewconfig=config.readNumEntry("weeklistviewconfig", NORMAL);
        qDebug("Read weeklistviewconfig: %d",weeklistviewconfig);
        bStartOnMonday=onM;
        setPalette(white);
        setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
        QVBoxLayout *layout = new QVBoxLayout( this );
        qBubbleSort(ev);
        QValueListIterator<EffectiveEvent> it;
        it=ev.begin();
        int dayOrder[7];
        if (bStartOnMonday) {
                for (int d=0; d<7; d++) dayOrder[d]=d+1;
        } else {
                for (int d=0; d<7; d++) dayOrder[d]=d;
                dayOrder[0]=7;
        }
        // Calculate offset to first day of week.
        int dayoffset=d.dayOfWeek();
        if(bStartOnMonday) dayoffset--;
        else if( dayoffset == 7 ) dayoffset = 0;
        for (int i=0; i<7; i++) {
        // Header
                DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i-dayoffset), bStartOnMonday,this);
                connect(hdr, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
-                connect(hdr, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)),
+                connect(hdr, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
-                        this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)));
+                        this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
                layout->addWidget(hdr);
                // Events
                while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) {
                                if(!(((*it).end().hour()==0) && ((*it).end().minute()==0) && ((*it).startDate()!=(*it).date()))) {// Skip events ending at 00:00 starting at another day.
                                DateBookWeekLstEvent *l=new DateBookWeekLstEvent(*it,weeklistviewconfig,this);
                                layout->addWidget(l);
-                                connect (l, SIGNAL(editEvent(const Event &)), this, SIGNAL(editEvent(const Event &)));
+                                connect (l, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
                        }
                        it++;
                }
                layout->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
    }
 }
 DateBookWeekLstView::~DateBookWeekLstView(){}
 void DateBookWeekLstView::keyPressEvent(QKeyEvent *e) {e->ignore();}
 DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
                                               QValueList<EffectiveEvent> &ev2,
                                               QDate &d, bool onM,
                                               QWidget* parent,
                                               const char* name, WFlags fl)
    : QWidget( parent, name, fl )
 {
        QHBoxLayout *layout = new QHBoxLayout( this );
        DateBookWeekLstView *w=new DateBookWeekLstView(ev1,d,onM,this);
        layout->addWidget(w);
-        connect (w, SIGNAL(editEvent(const Event &)), this, SIGNAL(editEvent(const Event &)));
+        connect (w, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
        connect (w, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
-        connect (w, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &,const QString &)),
+        connect (w, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
-                this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)));
+                this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
        w=new DateBookWeekLstView(ev2,d.addDays(7),onM,this);
        layout->addWidget(w);
-        connect (w, SIGNAL(editEvent(const Event &)), this, SIGNAL(editEvent(const Event &)));
+        connect (w, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
        connect (w, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
-        connect (w, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)),
+        connect (w, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
-                this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)));
+                this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
 }
 DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
                                  QWidget *parent,
                                  const char *name )
    : QWidget( parent, name ),
      db( newDB ),
      startTime( 0 ),
      ampm( ap ),
      bStartOnMonday(onM)
 {
        setFocusPolicy(StrongFocus);
        layout = new QVBoxLayout( this );
        layout->setMargin(0);
        header=new DateBookWeekLstHeader(onM, this);
        layout->addWidget( header );
-        connect(header, SIGNAL(dateChanged(QDate &)), this, SLOT(dateChanged(QDate &)));
+        connect(header, SIGNAL(dateChanged(QDate&)), this, SLOT(dateChanged(QDate&)));
        connect(header, SIGNAL(setDbl(bool)), this, SLOT(setDbl(bool)));
        scroll=new QScrollView(this);
        scroll->setResizePolicy(QScrollView::AutoOneFit);
        layout->addWidget(scroll);
        view=NULL;
        Config config("DateBook");
        config.setGroup("Main");
        dbl=config.readBoolEntry("weeklst_dbl", false);
        header->dbl->setOn(dbl);
 }
 DateBookWeekLst::~DateBookWeekLst(){
        Config config("DateBook");
        config.setGroup("Main");
        config.writeEntry("weeklst_dbl", dbl);
 }
 void DateBookWeekLst::setDate(const QDate &d) {
        bdate=d;
        header->setDate(d);
 }
 void DateBookWeekLst::setDbl(bool on) {
        dbl=on;
        redraw();
 }
 void DateBookWeekLst::redraw() {getEvents();}
 QDate DateBookWeekLst::date() {
        return bdate;
 }
 // return the date at the beginning of the week...
 // copied from DateBookWeek
 QDate DateBookWeekLst::weekDate() const
 {
        QDate d=bdate;
        // Calculate offset to first day of week.
        int dayoffset=d.dayOfWeek();
        if(bStartOnMonday) dayoffset--;
        else if( dayoffset == 7 )
            dayoffset = 0;
        return d.addDays(-dayoffset);
 }
 void DateBookWeekLst::getEvents() {
        QDate start = weekDate(); //date();
        QDate stop = start.addDays(6);
        QValueList<EffectiveEvent> el = db->getEffectiveEvents(start, stop);
        if (view) delete view;
        if (dbl) {
                QDate start2=start.addDays(7);
                stop=start2.addDays(6);
                QValueList<EffectiveEvent> el2 = db->getEffectiveEvents(start2, stop);
                view=new DateBookWeekLstDblView(el,el2,start,bStartOnMonday,scroll);
        } else {
                view=new DateBookWeekLstView(el,start,bStartOnMonday,scroll);
        }
-        connect (view, SIGNAL(editEvent(const Event &)), this, SIGNAL(editEvent(const Event &)));
+        connect (view, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
        connect (view, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
-        connect (view, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)),
+        connect (view, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
-                this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)));
+                this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
        scroll->addChild(view);
        view->show();
        scroll->updateScrollBars();
 }
 void DateBookWeekLst::dateChanged(QDate &newdate) {
        bdate=newdate;
        getEvents();
 }
 void DateBookWeekLst::keyPressEvent(QKeyEvent *e)
 {
        switch(e->key()) {
                case Key_Up:
                        scroll->scrollBy(0, -20);
                        break;
                case Key_Down:
                        scroll->scrollBy(0, 20);
                        break;
                case Key_Left:
                        header->prevWeek();
                        break;
                case Key_Right:
                        header->nextWeek();
                        break;
                default:
                        e->ignore();
        }
 }
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp
index 018bb5a..57bcd89 100644
--- a/core/pim/datebook/dateentryimpl.cpp
+++ b/core/pim/datebook/dateentryimpl.cpp
@@ -97,215 +97,215 @@ static void addOrPick( QComboBox* combo, const QString& t )
    }
    // Else add one
    combo->insertItem(t);
    combo->setCurrentItem(combo->count()-1);
 }
 DateEntry::DateEntry( bool startOnMonday, const Event &event, bool whichClock,
                      QWidget* parent,  const char* name )
    : DateEntryBase( parent, name ),
      ampm( whichClock ),
      startWeekOnMonday( startOnMonday ),
      m_showStart(true)
 {
    init();
    setDates(event.start(),event.end());
    comboCategory->setCategories( event.categories(), "Calendar", tr("Calendar") );
    if(!event.description().isEmpty())
        addOrPick( comboDescription, event.description() );
    if(!event.location().isEmpty())
        addOrPick( comboLocation, event.location() );
    checkAlarm->setChecked( event.hasAlarm() );
    checkAllDay->setChecked( event.type() == Event::AllDay );
    if(!event.notes().isEmpty()) noteStr=event.notes();
    else noteStr="";
    spinAlarm->setValue(event.alarmTime());
    if ( event.alarmSound() != Event::Silent )
        comboSound->setCurrentItem( 1 );
    if ( event.hasRepeat() ) {
        rp = event.repeatPattern();
        cmdRepeat->setText( tr("Repeat...") );
    }
    setRepeatLabel();
 }
 void DateEntry::setDates( const QDateTime& s, const QDateTime& e )
 {
    startDate = s.date();
    endDate = e.date();
    startTime = s.time();
    endTime = e.time();
    startDateChanged( s.date().year(), s.date().month(), s.date().day() );
    endDateChanged( e.date().year(), e.date().month(), e.date().day() );
    updateTimeEdit(true,true);
 }
 void DateEntry::updateTimeEdit(bool s, bool e) {
    // Comboboxes
    QString strStart, strEnd;
    int shour, ehour;
    if ( ampm ) {
        shour = startTime.hour();
        ehour = endTime.hour();
        if ( shour >= 12 ) {
            if ( shour > 12 )
                shour -= 12;
            strStart.sprintf( "%d:%02d PM", shour, startTime.minute() );
        } else {
            if ( shour == 0 )
                shour = 12;
            strStart.sprintf( "%d:%02d AM", shour, startTime.minute() );
        }
        if ( ehour == 24 && endTime.minute() == 0 ) {
            strEnd  = "11:59 PM"; // or "midnight"
        } else if ( ehour >= 12 ) {
            if ( ehour > 12 )
                ehour -= 12;
            strEnd.sprintf( "%d:%02d PM", ehour, endTime.minute() );
        } else {
            if ( ehour == 0 )
                ehour = 12;
            strEnd.sprintf( "%d:%02d AM", ehour, endTime.minute() );
        }
    } else {
        strStart.sprintf( "%02d:%02d", startTime.hour(), startTime.minute() );
        strEnd.sprintf( "%02d:%02d", endTime.hour(), endTime.minute() );
    }
    if (s) comboStart->setText(strStart);
    if (e) comboEnd->setText(strEnd);
 }
 void DateEntry::init()
 {
    comboDescription->setInsertionPolicy(QComboBox::AtCurrent);
    comboLocation->setInsertionPolicy(QComboBox::AtCurrent);
    initCombos();
    QPopupMenu *m1 = new QPopupMenu( this );
    startPicker = new DateBookMonth( m1, 0, TRUE );
    m1->insertItem( startPicker );
    buttonStart->setPopup( m1 );
-    connect( startPicker, SIGNAL( dateClicked( int, int, int ) ),
+    connect( startPicker, SIGNAL( dateClicked(int,int,int) ),
-             this, SLOT( startDateChanged( int, int, int ) ) );
+             this, SLOT( startDateChanged(int,int,int) ) );
    //Let start button change both start and end dates
-    connect( startPicker, SIGNAL( dateClicked( int, int, int ) ),
+    connect( startPicker, SIGNAL( dateClicked(int,int,int) ),
-             this, SLOT( endDateChanged( int, int, int ) ) );
+             this, SLOT( endDateChanged(int,int,int) ) );
-    connect( qApp, SIGNAL( clockChanged( bool ) ),
+    connect( qApp, SIGNAL( clockChanged(bool) ),
-             this, SLOT( slotChangeClock( bool ) ) );
+             this, SLOT( slotChangeClock(bool) ) );
    connect( qApp, SIGNAL(weekChanged(bool)),
             this, SLOT(slotChangeStartOfWeek(bool)) );
    connect( editNote, SIGNAL(clicked()),
             this, SLOT(slotEditNote()) );
    QPopupMenu *m2 = new QPopupMenu( this );
    endPicker = new DateBookMonth( m2, 0, TRUE );
    m2->insertItem( endPicker );
    buttonEnd->setPopup( m2 );
-    connect( endPicker, SIGNAL( dateClicked( int, int, int ) ),
+    connect( endPicker, SIGNAL( dateClicked(int,int,int) ),
-             this, SLOT( endDateChanged( int, int, int ) ) );
+             this, SLOT( endDateChanged(int,int,int) ) );
-    connect(timePickerStart, SIGNAL( timeChanged(const QTime &) ),
+    connect(timePickerStart, SIGNAL( timeChanged(const QTime&) ),
-            this, SLOT( startTimePicked(const QTime &) ));
+            this, SLOT( startTimePicked(const QTime&) ));
    // install eventFilters
    comboEnd->installEventFilter( this );
    comboStart->installEventFilter( this );
 }
 /*
 *  Destroys the object and frees any allocated resources
 */
 DateEntry::~DateEntry()
 {
    // no need to delete child widgets, Qt does it all for us
        //cout << "Del: " << comboStart->currentText() << endl;
 }
 /*
 * public slot
 */
 void DateEntry::slotEditNote() {
  QString s;
  s = "<B>"+ TimeString::longDateString( startDate ) + "</B>";
 //  s.sprintf("<B>%d/%d</B> ", startDate.day(), startDate.month());
  NoteEntry noteDlg(s+comboDescription->currentText(), noteStr,
                    this,0,TRUE);
  if ( QPEApplication::execDialog( &noteDlg ) ) {
    noteStr=noteDlg.note->text();
  }
 }
 void DateEntry::endDateChanged( int y, int m, int d )
 {
    endDate.setYMD( y, m, d );
    if ( endDate < startDate ) {
        endDate = startDate;
    }
    buttonEnd->setText( TimeString::shortDate( endDate ) );
    endPicker->setDate( endDate.year(), endDate.month(), endDate.day() );
 }
 static QTime parseTime( const QString& s, bool ampm )
 {
    QTime tmpTime;
    QStringList l = QStringList::split( ':', s );
    int hour = l[0].toInt();
    if ( ampm ) {
        int i=0;
        while (i<int(l[1].length()) && l[1][i]>='0' && l[1][i]<='9')
            i++;
        QString digits = l[1].left(i);
        if ( l[1].contains( "PM", FALSE ) ) {
            if ( hour != 12 )
                hour += 12;
        } else {
            if ( hour == 12 )
                hour = 0;
        }
        l[1] = digits;
    }
    int minute = l[1].toInt();
    if ( minute > 59 )
        minute = 59;
    else if ( minute < 0 )
        minute = 0;
    if ( hour > 23 ) {
        hour = 23;
        minute = 59;
    } else if ( hour < 0 )
        hour = 0;
    tmpTime.setHMS( hour, minute, 0 );
    return tmpTime;
 }
 /*
 * public slot
 */
 void DateEntry::endTimeChanged( const QString &s )
 {
  endTimeChanged( parseTime(s,ampm) );
 }
 void DateEntry::endTimeChanged( const QTime &t ) {
    if ( endDate > startDate || t >= startTime ) {
        endTime = t;
    } else {
        endTime = startTime;
        //comboEnd->setCurrentItem( comboStart->currentItem() );
    }
    timePickerStart->setHour(endTime.hour());
    timePickerStart->setMinute(endTime.minute());
 }
 /*
diff --git a/core/pim/datebook/repeatentry.cpp b/core/pim/datebook/repeatentry.cpp
index 7cf36da..04c3cf3 100644
--- a/core/pim/datebook/repeatentry.cpp
+++ b/core/pim/datebook/repeatentry.cpp
@@ -266,194 +266,194 @@ void RepeatEntry::setupDaily()
 void RepeatEntry::setupWeekly()
 {
    // reshow the buttons...
    fraExtra->setTitle( RepeatEntryBase::tr("Repeat On") );
    fraExtra->setExclusive( FALSE );
    fraExtra->show();
    if ( startWeekOnMonday ) {
        cmdExtra1->setText( RepeatEntryBase::tr("Mon") );
        cmdExtra2->setText( RepeatEntryBase::tr("Tue") );
        cmdExtra3->setText( RepeatEntryBase::tr("Wed") );
        cmdExtra4->setText( RepeatEntryBase::tr("Thu") );
        cmdExtra5->setText( RepeatEntryBase::tr("Fri") );
        cmdExtra6->setText( RepeatEntryBase::tr("Sat") );
        cmdExtra7->setText( RepeatEntryBase::tr("Sun") );
    } else {
        cmdExtra1->setText( RepeatEntryBase::tr("Sun") );
        cmdExtra2->setText( RepeatEntryBase::tr("Mon") );
        cmdExtra3->setText( RepeatEntryBase::tr("Tue") );
        cmdExtra4->setText( RepeatEntryBase::tr("Wed") );
        cmdExtra5->setText( RepeatEntryBase::tr("Thu") );
        cmdExtra6->setText( RepeatEntryBase::tr("Fri") );
        cmdExtra7->setText( RepeatEntryBase::tr("Sat") );
    }
    // I hope clustering these improve performance....
    cmdExtra1->setOn( FALSE );
    cmdExtra2->setOn( FALSE );
    cmdExtra3->setOn( FALSE );
    cmdExtra4->setOn( FALSE );
    cmdExtra5->setOn( FALSE );
    cmdExtra6->setOn( FALSE );
    cmdExtra7->setOn( FALSE );
    cmdExtra1->show();
    cmdExtra2->show();
    cmdExtra3->show();
    cmdExtra4->show();
    cmdExtra5->show();
    cmdExtra6->show();
    cmdExtra7->show();
    lblWeekVar->show();
    spinFreq->setValue( 1 );
    // might as well set the day too...
    if ( startWeekOnMonday ) {
        fraExtra->setButton( start.dayOfWeek() - 1 );
    } else {
        fraExtra->setButton( start.dayOfWeek() % 7 );
    }
    lblFreq->setText( tr("week(s)") );
    lblVar2->show();
    showRepeatStuff();
    setupRepeatLabel( 1 );
 }
 void RepeatEntry::setupMonthly()
 {
    hideExtras();
    lblWeekVar->hide();
    fraExtra->setTitle( tr("Repeat By") );
    fraExtra->setExclusive( TRUE );
    fraExtra->show();
    cmdExtra1->setText( tr("Day") );
    cmdExtra1->show();
    cmdExtra2->setText( tr("Date") );
    cmdExtra2->show();
    spinFreq->setValue( 1 );
    lblFreq->setText( tr("month(s)") );
    lblVar2->show();
    showRepeatStuff();
    setupRepeatLabel( 1 );
 }
 void RepeatEntry::setupYearly()
 {
    hideExtras();
    lblWeekVar->hide();
    spinFreq->setValue( 1 );
    lblFreq->setText( tr("year(s)") );
    lblFreq->show();
    lblFreq->show();
    showRepeatStuff();
    lblVar2->show();
    QString strEvery = strYearTemplate.arg( start.monthName(start.month()) ).arg( numberPlacing(start.day()) );
    lblRepeat->setText( strEvery );
    setupRepeatLabel( 1 );
 }
 void RepeatEntry::init()
 {
    QPopupMenu *m1 = new QPopupMenu( this );
    repeatPicker = new DateBookMonth( m1, 0, TRUE );
    m1->insertItem( repeatPicker );
    cmdEnd->setPopup( m1 );
    cmdEnd->setPopupDelay( 0 );
-    QObject::connect( repeatPicker, SIGNAL(dateClicked(int, int, int)),
+    QObject::connect( repeatPicker, SIGNAL(dateClicked(int,int,int)),
-                      this, SLOT(endDateChanged(int, int, int)) );
+                      this, SLOT(endDateChanged(int,int,int)) );
    QObject::connect( qApp, SIGNAL(weekChanged(bool)),
                      this, SLOT(slotChangeStartOfWeek(bool)) );
    listRTypeButtons.setAutoDelete( TRUE );
    listRTypeButtons.append( cmdNone );
    listRTypeButtons.append( cmdDay );
    listRTypeButtons.append( cmdWeek );
    listRTypeButtons.append( cmdMonth );
    listRTypeButtons.append( cmdYear );
    listExtra.setAutoDelete( TRUE );
    listExtra.append( cmdExtra1 );
    listExtra.append( cmdExtra2 );
    listExtra.append( cmdExtra3 );
    listExtra.append( cmdExtra4 );
    listExtra.append( cmdExtra5 );
    listExtra.append( cmdExtra6 );
    listExtra.append( cmdExtra7 );
 }
 void RepeatEntry::slotNoEnd( bool unused )
 {
    // if the item was toggled, then go ahead and set it to the maximum date
    if ( unused ) {
        end.setYMD( 3000, 12, 31 );
        cmdEnd->setText( RepeatEntryBase::tr("No End Date") );
    } else {
        end = start;
        cmdEnd->setText( TimeString::shortDate(end) );
    }
 }
 void RepeatEntry::endDateChanged( int y, int m, int d )
 {
    end.setYMD( y, m, d );
    if ( end < start )
        end = start;
    cmdEnd->setText(  TimeString::shortDate( end ) );
    repeatPicker->setDate( end.year(), end.month(), end.day() );
 }
 void RepeatEntry::setupRepeatLabel( const QString &s )
 {
    lblVar1->setText( s );
 }
 void RepeatEntry::setupRepeatLabel( int x )
 {
    // change the spelling based on the value of x
    QString strVar2;
    if ( x > 1 )
        lblVar1->show();
    else
        lblVar1->hide();
    switch ( currInterval ) {
        case NONE:
            break;
        case DAY:
            if ( x > 1 )
                strVar2 = tr( "days" );
            else
                strVar2 = tr( "day" );
            break;
        case WEEK:
            if ( x > 1 )
                strVar2 = tr( "weeks" );
            else
                strVar2 = tr( "week" );
            break;
        case MONTH:
            if ( x > 1 )
                strVar2 = RepeatEntryBase::tr( "months" );
            else
                strVar2 = tr( "month" );
            break;
        case YEAR:
            if ( x > 1 )
                strVar2 = RepeatEntryBase::tr( "years" );
            else
                strVar2 = tr( "year" );
            break;
    }
    if ( !strVar2.isNull() )
        lblVar2->setText( strVar2 );
 }
 void RepeatEntry::showRepeatStuff()
 {
    cmdEnd->show();
    chkNoEnd->show();
    lblFreq->show();
    lblEvery->show();
    lblFreq->show();
    spinFreq->show();