run the optimize_connect script

the whole cvs is tagged with "before_optimize_connect" if there are problems you can check the diff (but it had compiled and run here)
author: alwin <alwin> 2004-03-02 12:14:15 (UTC)
committer: alwin <alwin> 2004-03-02 12:14:15 (UTC)
commit: 0d59c780513da78033f4d9040475dee9db0256d4 (patch) (unidiff)
tree: 503d320b4aa3daae9982082e7b34e3e2c48bdfb7 /core/pim
parent: a0981652d61776d70f25980f035748b21339e946 (diff)
download: opie-0d59c780513da78033f4d9040475dee9db0256d4.zip
opie-0d59c780513da78033f4d9040475dee9db0256d4.tar.gz
opie-0d59c780513da78033f4d9040475dee9db0256d4.tar.bz2
26 files changed, 137 insertions, 139 deletions
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index f7bff58..29f4383 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -34,193 +34,193 @@
 #include <stdlib.h>
 #include <ctype.h> //toupper() for key hack
 #if 0
 /*!
  \class AbTableItem abtable.h
  
  \brief QTableItem based class for showing a field of an entry
 */
 AbTableItem::AbTableItem( QTable *t, EditType et, const QString &s,
                          const QString &secondSortKey)
        : QTableItem( t, et, s )
 {
        //    sortKey = s.lower() + QChar( '\0' ) + secondSortKey.lower();
        sortKey = Qtopia::buildSortKey( s, secondSortKey );
 }
 int AbTableItem::alignment() const
 {
        return AlignLeft|AlignVCenter;
 }
 QString AbTableItem::key() const
 {
        return sortKey;
 }
 // A way to reset the item, without out doing a delete or a new...
 void AbTableItem::setItem( const QString &txt, const QString &secondKey )
 {
        setText( txt );
        sortKey = Qtopia::buildSortKey( txt, secondKey );
        
        //    sortKey = txt.lower() + QChar( '\0' ) + secondKey.lower();
 }
 /*!
  \class AbPickItem abtable.h
  
  \brief QTableItem based class for showing slection of an entry
 */
 AbPickItem::AbPickItem( QTable *t ) :
        QTableItem(t, WhenCurrent, "?")
 {
 }
 QWidget *AbPickItem::createEditor() const
 {
        QComboBox* combo = new QComboBox( table()->viewport() );
        ( (AbPickItem*)this )->cb = combo;
        AbTable* t = static_cast<AbTable*>(table());
        QStringList c = t->choiceNames();
        int cur = 0;
        for (QStringList::ConstIterator it = c.begin(); it!=c.end(); ++it) {
                if ( *it == text() )
                        cur = combo->count();
                combo->insertItem(*it);
        }
        combo->setCurrentItem(cur);
        return combo;
 }
 void AbPickItem::setContentFromEditor( QWidget *w )
 {
        if ( w->inherits("QComboBox") )
                setText( ( (QComboBox*)w )->currentText() );
        else
                QTableItem::setContentFromEditor( w );
 }
 #endif
 /*!
  \class AbTable abtable.h
  
  \brief QTable based class for showing a list of entries
 */
 AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name )
        : QTable( parent, name ),
          lastSortCol( -1 ),
          asc( TRUE ),
          intFields( order ),
          enablePainting( true ),
          columnVisible( true ),
          countNested( 0 )
 {
                //qWarning("C'tor start");
        setSelectionMode( NoSelection );
        init();
        setSorting( TRUE );
-        connect( this, SIGNAL(clicked(int,int,int,const QPoint &)),
+        connect( this, SIGNAL(clicked(int,int,int,const QPoint&)),
                 this, SLOT(itemClicked(int,int)) );
        // contactList.clear();
                //qWarning("C'tor end");
 }
 AbTable::~AbTable()
 {
 }
 void AbTable::init()
 {
        // :SX showChar = '\0';
        setNumRows( 0 );
        setNumCols( 2 );
        
        horizontalHeader()->setLabel( 0, tr( "Full Name" ));
        horizontalHeader()->setLabel( 1, tr( "Contact" ));
        setLeftMargin( 0 );
        verticalHeader()->hide();
        columnVisible = true;
 }
 void AbTable::setContacts( const OContactAccess::List& viewList )
 {
        qWarning("AbTable::setContacts()");
        clear();
        m_viewList = viewList;
        setSorting( false );
        setPaintingEnabled( FALSE );
        
        OContactAccess::List::Iterator it;
        setNumRows( m_viewList.count() );
        //int row = 0;
        // for ( it = m_viewList.begin(); it != m_viewList.end(); ++it )
        //      insertIntoTable( *it, row++ );
        
        // setSorting( true );
        // resort();
        updateVisible();
        setPaintingEnabled( TRUE );
 }
 void AbTable::setOrderedList( const QValueList<int> ordered )
 {
        intFields = ordered;
 }
 bool AbTable::selectContact( int UID )
 {
        qWarning( "AbTable::selectContact( %d )", UID );
        int rows = numRows();
        OContact* foundContact = 0l;
        bool found = false;
        setPaintingEnabled( FALSE );
        qWarning( "search start" );
        for ( int r = 0; r < rows; ++r ) {
                if ( m_viewList.uidAt( r ) == UID ){
                        ensureCellVisible( r, 0 );
                        setCurrentCell( r, 0 );
                        found = true;
                        break;
                }
        }
        qWarning( "search end" );
        if ( !found ){
                ensureCellVisible( 0,0 );
                setCurrentCell( 0, 0 );
        }
        setPaintingEnabled( TRUE );
        return true;
 }
 #if 0
 void AbTable::insertIntoTable( const OContact& cnt, int row )
 {
        qWarning( "void AbTable::insertIntoTable( const OContact& cnt, %d )", row );
        QString strName;
        ContactItem contactItem;
        
        strName = findContactName( cnt );
        contactItem = findContactContact( cnt, row );
        
        AbTableItem *ati;
        ati = new AbTableItem( this, QTableItem::Never, strName, contactItem.value );
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 670cdb0..8d61582 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -1,179 +1,179 @@
 /**********************************************************************
 ** Copyright (c) 2002 Stefan Eilers (eilers.stefan@epost.de)
 **
 ** This file is part of Qt Palmtop 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.
 **
 **
 **********************************************************************/
 #include "abview.h"
 #include <qlayout.h>
 #include <qpe/global.h>
 #include <opie/ocontactaccessbackend_vcard.h>
 #include <assert.h>
 // Is defined in LibQPE
 extern QString categoryFileName();
 QString addressbookPersonalVCardName()
 {
        QString filename = Global::applicationFileName("addressbook",
                                                       "businesscard.vcf");
        return filename;
 }
 AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
        QWidget(parent),
        mCat(0),
        m_inSearch( false ),
        m_inPersonal( false ),
        m_curr_category( -1 ),
        m_curr_View( TableView ),
        m_prev_View( TableView ),
        m_curr_Contact ( 0 ),
        m_contactdb ( 0l ),
        m_storedDB ( 0l ),
        m_viewStack( 0l ),
        m_abTable( 0l ),
        m_orderedFields( ordered )
 {
        qWarning("AbView::c'tor");
        // Load default database and handle syncing myself.. !
        m_contactdb = new OContactAccess ( "addressbook", 0l, 0l, false );
        m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available
        mCat.load( categoryFileName() );
        // Create Layout and put WidgetStack into it.
          QVBoxLayout *vb = new QVBoxLayout( this );
         m_viewStack = new QWidgetStack( this );
        vb->addWidget( m_viewStack );
        // Creat TableView
         QVBox* tableBox = new QVBox( m_viewStack );
         m_abTable = new AbTable( m_orderedFields, tableBox, "table" );
        m_abTable->setCurrentCell( 0, 0 );
        m_abTable->setFocus();
        // Add TableView to WidgetStack and raise it
        m_viewStack -> addWidget( tableBox , TableView );
        // Create CardView and add it to WidgetStack
         QVBox* cardBox = new QVBox( m_viewStack );
        m_ablabel = new AbLabel( cardBox, "CardView");
        m_viewStack -> addWidget( cardBox , CardView );
        // Connect views to me
-        connect ( m_abTable, SIGNAL( signalSwitch( void ) ),
+        connect ( m_abTable, SIGNAL( signalSwitch(void) ),
-                  this, SLOT( slotSwitch( void ) ) );
+                  this, SLOT( slotSwitch(void) ) );
-        connect ( m_ablabel, SIGNAL( signalOkPressed( void ) ),
+        connect ( m_ablabel, SIGNAL( signalOkPressed(void) ),
-                  this, SLOT( slotSwitch( void ) ) );
+                  this, SLOT( slotSwitch(void) ) );
        load();
 }
 AbView::~AbView()
 {
        m_contactdb -> save();
        delete m_contactdb;
        if ( m_storedDB ){
                m_storedDB -> save();
                delete m_storedDB;
        }
 }
 void AbView::setView( Views view )
 {
        qWarning("AbView::setView( Views view )");
         m_curr_View = view;
         load();
 }
 void AbView::addEntry( const OContact &newContact )
 {
        qWarning("abview:AddContact");
        m_contactdb->add ( newContact );
        load();
 }
 void AbView::removeEntry( const int UID )
 {
        qWarning("abview:RemoveContact");
        m_contactdb->remove( UID );
        load();
 }
 void AbView::replaceEntry( const OContact &contact )
 {
        qWarning("abview:ReplaceContact");
        m_contactdb->replace( contact );
        load();
 }
 OContact AbView::currentEntry()
 {
        OContact currentContact;
        switch ( (int) m_curr_View ) {
        case TableView:
                currentContact = m_abTable -> currentEntry();
                break;
        case CardView:
                currentContact = m_ablabel -> currentEntry();
                break;
        }
        m_curr_Contact = currentContact.uid();
        return currentContact;
 }
 bool AbView::save()
 {
                //qWarning("abView:Save data");
        return m_contactdb->save();
 }
 void AbView::load()
 {
        qWarning("abView:Load data");
        // Letter Search is stopped at this place
        emit signalClearLetterPicker();
        if ( m_inPersonal )
                // VCard Backend does not sort.. 
                m_list = m_contactdb->allRecords();
        else{
                m_list = m_contactdb->sorted( true, 0, 0, 0 );
                if ( m_curr_category != -1 )
                        clearForCategory();
        }
        qWarning ("Number of contacts: %d", m_list.count());
        updateView( true );
 }
 void AbView::reload()
 {
        qWarning( "void AbView::reload()" );
        m_contactdb->reload();
        load();
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 9cf55b3..8a5f9d5 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -42,313 +42,313 @@
 #include <qtoolbutton.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include "picker.h"
 #include "configdlg.h"
 extern QString addressbookPersonalVCardName();
 AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
                                      WFlags f )
        : QMainWindow( parent, name, f ),
          catMenu (0l),
          abEditor(0l),
          syncing(FALSE),
          m_tableViewButton(0l),
          m_cardViewButton(0l)
 {
        isLoading = true;
        m_config.load();
        setCaption( tr("Contacts") );
        setIcon( Resource::loadPixmap( "AddressBook" ) );
        // Settings for Main Menu
        // setToolBarsMovable( false );
        setToolBarsMovable( !m_config.fixedBars() );
        setRightJustification( true );
        QToolBar *bar = new QToolBar( this );
        bar->setHorizontalStretchable( TRUE );
        QMenuBar *mbList = new QMenuBar( bar  );
        mbList->setMargin( 0 );
        QPopupMenu *edit = new QPopupMenu( mbList );
        mbList->insertItem( tr( "Contact" ), edit );
        // Category Menu
        catMenu = new QPopupMenu( this );
        catMenu->setCheckable( TRUE );
        connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) );
        mbList->insertItem( tr("View"), catMenu );
        // Create Toolbar
        listTools = new QToolBar( this, "list operations" );
        listTools->setHorizontalStretchable( true );
        addToolBar( listTools );
        moveToolBar( listTools, m_config.getToolBarPos() );
        // View Icons
        m_tableViewButton  = new QAction( tr( "List" ), Resource::loadPixmap( "addressbook/listview" ),
                                          QString::null, 0, this, 0 );
        connect( m_tableViewButton, SIGNAL( activated() ), this, SLOT( slotListView() ) );
        m_tableViewButton->setToggleAction( true );
        m_tableViewButton->addTo( listTools );
        m_cardViewButton = new QAction( tr( "Card" ), Resource::loadPixmap( "addressbook/cardview" ),  QString::null, 0, this, 0 );
        connect( m_cardViewButton, SIGNAL( activated() ), this, SLOT( slotCardView() ) );
        m_cardViewButton->setToggleAction( true );
        m_cardViewButton->addTo( listTools );
        listTools->addSeparator();
        // Other Buttons
        QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null,
                                  0, this, 0 );
        actionNew = a;
        connect( a, SIGNAL( activated() ), this, SLOT( slotListNew() ) );
        a->addTo( edit );
        a->addTo( listTools );
        a = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null,
                         0, this, 0 );
        actionEdit = a;
        connect( a, SIGNAL( activated() ), this, SLOT( slotViewEdit() ) );
        a->addTo( edit );
        a->addTo( listTools );
        a = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null,
                         0, this, 0 );
        actionTrash = a;
        connect( a, SIGNAL( activated() ), this, SLOT( slotListDelete() ) );
        a->addTo( edit );
        a->addTo( listTools );
        // make it possible to go directly to businesscard via qcop call
        //#if defined(Q_WS_QWS) // Why this ? (se)
 #if !defined(QT_NO_COP)
        QCopChannel *addressChannel = new QCopChannel("QPE/Addressbook" , this );
-        connect (addressChannel, SIGNAL( received(const QCString &, const QByteArray &)),
+        connect (addressChannel, SIGNAL( received(const QCString&,const QByteArray&)),
-                 this, SLOT ( appMessage(const QCString &, const QByteArray &) ) );
+                 this, SLOT ( appMessage(const QCString&,const QByteArray&) ) );
 #endif
        // #endif
        a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ),
                         QString::null, 0, this, 0 );
        actionFind = a;
        connect( a, SIGNAL(activated()), this, SLOT( slotFindOpen()) );
        a->addTo( edit );
        a->addTo( listTools );
        // Much better search widget, taken from QTReader.. (se)
        searchBar = new OFloatBar( "Search", this, QMainWindow::Top, TRUE );
        searchBar->setHorizontalStretchable( TRUE );
        searchBar->hide();
        searchEdit = new QLineEdit( searchBar, "searchEdit" );
        // QFont f("unifont", 16 /*, QFont::Bold*/);
        // searchEdit->setFont( f );
        searchBar->setStretchableWidget( searchEdit );
-        connect( searchEdit, SIGNAL( returnPressed( ) ),
+        connect( searchEdit, SIGNAL( returnPressed() ),
-                 this, SLOT( slotFind( ) ) );
+                 this, SLOT( slotFind() ) );
        a = new QAction( tr( "Start Search" ), Resource::loadPixmap( "enter" ), QString::null, 0, this, 0 );
        connect( a, SIGNAL( activated() ), this, SLOT( slotFind() ) );
        a->addTo( searchBar );
        a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
        connect( a, SIGNAL( activated() ), this, SLOT( slotFindClose() ) );
        a->addTo( searchBar );
        a = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "addressbook/sendmail" ),
                         QString::null, 0, this, 0 );
        //a->setEnabled( FALSE ); we got support for it now :) zecke
        actionMail = a;
        connect( a, SIGNAL( activated() ), this, SLOT( writeMail() ) );
        a->addTo( edit );
        a->addTo( listTools );
        if ( Ir::supported() ) {
                a = new QAction( tr ("Beam Entry" ), Resource::loadPixmap( "beam" ), QString::null,
                                 0, this, 0 );
                actionBeam = a;
                connect( a, SIGNAL( activated() ), this, SLOT( slotBeam() ) );
                a->addTo( edit );
                a->addTo( listTools );
        }
        edit->insertSeparator();
        a = new QAction( tr("Import vCard"), Resource::loadPixmap( "addressbook/fileimport"), QString::null,
                                                                   0, this, 0);
        actionPersonal = a;
        connect( a, SIGNAL( activated() ), this, SLOT( importvCard() ) );
        a->addTo( edit );
        a = new QAction( tr("Export vCard"), Resource::loadPixmap( "addressbook/fileexport"), QString::null,
                                                                   0, this, 0);
        actionPersonal = a;
        connect( a, SIGNAL( activated() ), this, SLOT( exportvCard() ) );
        a->addTo( edit );
        edit->insertSeparator();
        a = new QAction( tr("My Personal Details"), Resource::loadPixmap( "addressbook/identity" ),
                         QString::null, 0, this, 0 , TRUE );
        actionPersonal = a;
        connect( a, SIGNAL( activated() ), this, SLOT( slotPersonalView() ) );
        a->addTo( edit );
 #ifdef __DEBUG_RELEASE
        // Remove this function for public Release ! This is only
        // for debug purposes ..
        a = new QAction( tr( "Save all Data"), QString::null, 0, 0 );
        connect( a, SIGNAL( activated() ), this , SLOT( slotSave() ) );
        a->addTo( edit );
 #endif
        a = new QAction( tr( "Config" ), Resource::loadPixmap( "SettingsIcon" ), QString::null,
                         0, this, 0 );
        connect( a, SIGNAL( activated() ), this, SLOT( slotConfig() ) );
        a->addTo( edit );
        // Create Views
        listContainer = new QWidget( this );
        QVBoxLayout *vb = new QVBoxLayout( listContainer );
         m_abView = new AbView( listContainer, m_config.orderList() );
         vb->addWidget( m_abView );
        // abList->setHScrollBarMode( QScrollView::AlwaysOff );
-        connect( m_abView, SIGNAL( signalViewSwitched ( int ) ),
+        connect( m_abView, SIGNAL( signalViewSwitched(int) ),
-                 this, SLOT( slotViewSwitched( int ) ) );
+                 this, SLOT( slotViewSwitched(int) ) );
        QObject::connect( m_abView, SIGNAL(signalNotFound()), this, SLOT(slotNotFound()) );
        // m_abView->load(); // Already done by c'tor .
        // Letter Picker
        pLabel = new LetterPicker( listContainer );
        connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char)));
        connect(m_abView, SIGNAL( signalClearLetterPicker() ), pLabel, SLOT( clear() ) );
        vb->addWidget( pLabel );
        // All Categories into view-menu..
        populateCategories();
        // Fontsize
        defaultFont = new QFont( m_abView->font() );
         slotSetFont(m_config.fontSize());
        m_curFontSize = m_config.fontSize();
        setCentralWidget(listContainer);
        //    qDebug("adressbook contrsuction: t=%d", t.elapsed() );
        connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
        connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) );
-        connect( qApp, SIGNAL( appMessage(const QCString &, const QByteArray &) ),
+        connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ),
-        this, SLOT( appMessage(const QCString &, const QByteArray &) ) );
+        this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
        isLoading = false;
 }
 void AddressbookWindow::slotConfig()
 {
        ConfigDlg* dlg = new ConfigDlg( this, "Config" );
        dlg -> setConfig( m_config );
        if ( QPEApplication::execDialog( dlg ) ) {
                qWarning ("Config Dialog accepted!");
                m_config = dlg -> getConfig();
                if ( m_curFontSize != m_config.fontSize() ){
                        qWarning("Font was changed!");
                        m_curFontSize = m_config.fontSize();
                        emit slotSetFont( m_curFontSize );
                }
                m_abView -> setListOrder( m_config.orderList() );
        }
        delete dlg;
 }
 void AddressbookWindow::slotSetFont( int size )
 {
        qWarning("void AddressbookWindow::slotSetFont( %d )", size);
        if (size > 2 || size < 0)
                size = 1;
        m_config.setFontSize( size );
        QFont *currentFont;
        switch (size) {
        case 0:
                m_abView->setFont( QFont( defaultFont->family(), defaultFont->pointSize() - 2 ) );
                currentFont = new QFont (m_abView->font());
                // abList->resizeRows(currentFont->pixelSize() + 7); :SX
                // abList->resizeRows();
                break;
        case 1:
                m_abView->setFont( *defaultFont );
                currentFont = new QFont (m_abView->font());
        //      // abList->resizeRows(currentFont->pixelSize() + 7);
        //      abList->resizeRows();
                break;
        case 2:
                m_abView->setFont( QFont( defaultFont->family(), defaultFont->pointSize() + 2 ) );
                currentFont = new QFont (m_abView->font());
        //      //abList->resizeRows(currentFont->pixelSize() + 7);
        //      abList->resizeRows();
                break;
        }
 }
 void AddressbookWindow::importvCard() {
        QString str = OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
        if(!str.isEmpty() ){
                setDocument((const QString&) str );
        }
 }
 void AddressbookWindow::exportvCard()
 {
        qWarning(" void AddressbookWindow::exportvCard()");
        QString filename = OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this );
        if( !filename.isEmpty() &&  ( filename[filename.length()-1] != '/' ) ){
                qWarning(" Save to file %s, (%d)", filename.latin1(), filename.length()-1 );
                OContact curCont = m_abView->currentEntry();
                if ( !curCont.isEmpty() ){
                        OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null,
                                                                                                filename );
                        OContactAccess* access = new OContactAccess ( "addressbook_exp", QString::null , vcard_backend, true );
                        if ( access ){
                                access->add( curCont );
                                access->save();
                        }
                        delete access;
                }else
                        QMessageBox::critical( 0, "Export VCard",
                           QString( tr( "You have to select a contact !") ) );
        }else
                QMessageBox::critical( 0, "Export VCard",
                                       QString( tr( "You have to set a filename !") ) );
 }
 void AddressbookWindow::setDocument( const QString &filename )
 {
        qWarning( "void AddressbookWindow::setDocument( %s )", filename.latin1() );
@@ -502,271 +502,271 @@ void AddressbookWindow::slotFind()
 }
 void AddressbookWindow::slotViewBack()
 {
        // :SX showList();
 }
 void AddressbookWindow::slotViewEdit()
 {
        if(!syncing) {
                if (actionPersonal->isOn()) {
                        editPersonal();
                } else {
                        editEntry( EditEntry );
                }
        } else {
                QMessageBox::warning( this, tr("Contacts"),
                                      tr("Can not edit data, currently syncing") );
        }
 }
 void AddressbookWindow::writeMail()
 {
        OContact c = m_abView -> currentEntry();
        QString name = c.fileAs();
        QString email = c.defaultEmail();
        // I prefer the OPIE-Environment variable before the
        // QPE-one..
        QString basepath = QString::fromLatin1( getenv("OPIEDIR") );
        if ( basepath.isEmpty() )
                basepath = QString::fromLatin1( getenv("QPEDIR") );
        // Try to access the preferred. If not possible, try to
        // switch to the other one..
        if ( m_config.useQtMail() ){
                qWarning ("Accessing: %s", (basepath + "/bin/qtmail").latin1());
                if ( QFile::exists( basepath + "/bin/qtmail" ) ){
                        qWarning ("QCop");
                        QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
                        e << name << email;
                        return;
                } else
                        m_config.setUseOpieMail( true );
        }
        if ( m_config.useOpieMail() ){
                qWarning ("Accessing: %s", (basepath + "/bin/opiemail").latin1());
                if ( QFile::exists( basepath + "/bin/opiemail" ) ){
                        qWarning ("QCop");
                        QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)");
                        e << name << email;
                        return;
                } else
                        m_config.setUseQtMail( true );
        }
 }
 static const char * beamfile = "/tmp/obex/contact.vcf";
 void AddressbookWindow::slotBeam()
 {
        QString beamFilename;
        OContact c;
        if ( actionPersonal->isOn() ) {
                beamFilename = addressbookPersonalVCardName();
                if ( !QFile::exists( beamFilename ) )
                        return; // can't beam a non-existent file
                OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null,
                                                                                        beamFilename );
                OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true );
                OContactAccess::List allList = access->allRecords();
                OContactAccess::List::Iterator it = allList.begin();  // Just take first
                c = *it;
                delete access;
        } else {
                unlink( beamfile ); // delete if exists
                mkdir("/tmp/obex/", 0755);
                c = m_abView -> currentEntry();
                OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null,
                                                                                        beamfile );
                OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true );
                access->add( c );
                access->save();
                delete access;
                beamFilename = beamfile;
        }
        qWarning("Beaming: %s", beamFilename.latin1() );
        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 = c.fullName();
        ir->send( beamFilename, description, "text/x-vCard" );
 }
 void AddressbookWindow::beamDone( Ir *ir )
 {
        delete ir;
        unlink( beamfile );
 }
 static void parseName( const QString& name, QString *first, QString *middle,
                       QString * last )
 {
        int comma = name.find ( "," );
        QString rest;
        if ( comma > 0 ) {
                *last = name.left( comma );
                comma++;
                while ( comma < int(name.length()) && name[comma] == ' ' )
                        comma++;
                rest = name.mid( comma );
        } else {
                int space = name.findRev( ' ' );
                *last = name.mid( space+1 );
                rest = name.left( space );
        }
        int space = rest.find( ' ' );
        if ( space <= 0 ) {
                *first = rest;
        } else {
                *first = rest.left( space );
                *middle = rest.mid( space+1 );
        }
 }
 void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 {
        bool needShow = FALSE;
        qWarning("Receiving QCop-Call with message %s", QString( msg ).latin1() );
        if (msg == "editPersonal()") {
                editPersonal();
        } else if (msg == "editPersonalAndClose()") {
                editPersonal();
                close();
        } else if ( msg == "addContact(QString,QString)" ) {
                QDataStream stream(data,IO_ReadOnly);
                QString name, email;
                stream >> name >> email;
                OContact cnt;
                QString fn, mn, ln;
                parseName( name, &fn, &mn, &ln );
                //  qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() );
                cnt.setFirstName( fn );
                cnt.setMiddleName( mn );
                cnt.setLastName( ln );
                cnt.insertEmails( email );
                cnt.setDefaultEmail( email );
                cnt.setFileAs();
                m_abView -> addEntry( cnt );
                // :SXm_abView()->init( cnt );
                editEntry( EditEntry );
        } else if ( msg == "beamBusinessCard()" ) {
                QString beamFilename = addressbookPersonalVCardName();
                if ( !QFile::exists( beamFilename ) )
                        return; // can't beam a non-existent file
                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 = "mycard.vcf";
                ir->send( beamFilename, description, "text/x-vCard" );
        } else if ( msg == "show(int)" ) {
                raise();
                QDataStream stream(data,IO_ReadOnly);
                int uid;
                stream >> uid;
                qWarning( "Showing uid: %d" , uid );
                // Deactivate Personal View..
                if ( actionPersonal->isOn() ){
                        actionPersonal->setOn( false );
                        slotPersonalView();
                }
                // Reset category and show as card..
                m_abView -> setShowByCategory( QString::null );
                m_abView -> setCurrentUid( uid );
                slotViewSwitched ( AbView::CardView );
                needShow = true;
        } else if ( msg == "edit(int)" ) {
                QDataStream stream(data,IO_ReadOnly);
                int uid;
                stream >> uid;
                // Deactivate Personal View..
                if ( actionPersonal->isOn() ){
                        actionPersonal->setOn( false );
                        slotPersonalView();
                }
                // Reset category and edit..
                m_abView -> setShowByCategory( QString::null );
                m_abView -> setCurrentUid( uid );
                slotViewEdit();
        }
        if (needShow)
            QPEApplication::setKeepRunning();
 }
 void AddressbookWindow::editEntry( EntryMode entryMode )
 {
        OContact entry;
        if ( !abEditor ) {
                abEditor = new ContactEditor( entry, this, "editor" );
        }
        if ( entryMode == EditEntry )
                abEditor->setEntry( m_abView -> currentEntry() );
        else if ( entryMode == NewEntry )
                abEditor->setEntry( entry );
        // other things may change the caption.
        abEditor->setCaption( tr("Edit Address") );
        // fix the foxus...
        abEditor->setNameFocus();
        if ( QPEApplication::execDialog( abEditor ) ) {
                setFocus();
                if ( entryMode == NewEntry ) {
                        OContact insertEntry = abEditor->entry();
                        insertEntry.assignUid();
                        m_abView -> addEntry( insertEntry );
                        m_abView -> setCurrentUid( insertEntry.uid() );
                } else {
                        OContact replEntry = abEditor->entry();
                        if ( !replEntry.isValidUid() )
                                replEntry.assignUid();
                        m_abView -> replaceEntry( replEntry );
                }
        }
        // populateCategories();
 }
 void AddressbookWindow::editPersonal()
 {
        OContact entry;
        // Switch to personal view if not selected
        // but take care of the menu, too
        if ( ! actionPersonal->isOn() ){
                qWarning("*** ++++");
                actionPersonal->setOn( true );
                slotPersonalView();
        }
        if ( !abEditor ) {
                abEditor = new ContactEditor( entry, this, "editor" );
        }
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index b1eb042..8acf570 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -442,327 +442,327 @@ void ContactEditor::init() {
        cmbCountry->insertItem( tr ( "Solomon Islands" ) );
        cmbCountry->insertItem( tr ( "Somalia" ) );
        cmbCountry->insertItem( tr ( "South Africa" ) );
        cmbCountry->insertItem( tr ( "Spain" ) );
        cmbCountry->insertItem( tr ( "Sri Lanka" ) );
        cmbCountry->insertItem( tr ( "St. Helena" ) );
        cmbCountry->insertItem( tr ( "Sudan" ) );
        cmbCountry->insertItem( tr ( "Suriname" ) );
        cmbCountry->insertItem( tr ( "Swaziland" ) );
        cmbCountry->insertItem( tr ( "Sweden" ) );
        cmbCountry->insertItem( tr ( "Switzerland" ) );
        cmbCountry->insertItem( tr ( "Taiwan" ) );
        cmbCountry->insertItem( tr ( "Tajikistan" ) );
        cmbCountry->insertItem( tr ( "Tanzania" ) );
        cmbCountry->insertItem( tr ( "Thailand" ) );
        cmbCountry->insertItem( tr ( "Togo" ) );
        cmbCountry->insertItem( tr ( "Tokelau" ) );
        cmbCountry->insertItem( tr ( "Tonga" ) );
        cmbCountry->insertItem( tr ( "Tunisia" ) );
        cmbCountry->insertItem( tr ( "Turkey" ) );
        cmbCountry->insertItem( tr ( "Turkmenistan" ) );
        cmbCountry->insertItem( tr ( "Tuvalu" ) );
        cmbCountry->insertItem( tr ( "Uganda" ) );
        cmbCountry->insertItem( tr ( "Ukraine" ) );
        cmbCountry->insertItem( tr ( "Uruguay" ) );
        cmbCountry->insertItem( tr ( "Uzbekistan" ) );
        cmbCountry->insertItem( tr ( "Vanuatu" ) );
        cmbCountry->insertItem( tr ( "Venezuela" ) );
        cmbCountry->insertItem( tr ( "Vietnam" ) );
        cmbCountry->insertItem( tr ( "Virgin Islands" ) );
        cmbCountry->insertItem( tr ( "Western Sahara" ) );
        cmbCountry->insertItem( tr ( "Yemen" ) );
        cmbCountry->insertItem( tr ( "Yugoslavia" ) );
        cmbCountry->insertItem( tr ( "Zambia" ) );
        cmbCountry->insertItem( tr ( "Zimbabwe" ) );
        if (cmbCountry->listBox()!=0)
           cmbCountry->listBox()->sort();
        cmbCountry->setMaximumWidth( 135 );
        gl->addMultiCellWidget( cmbCountry, 5, 5, 1, 2 );
        // Chooser 4
        cmbChooserField4 = new QComboBox( FALSE, container );
        cmbChooserField4->setMaximumWidth( 90 );
        gl->addWidget( cmbChooserField4, 6, 0 );
        // Textfield for chooser 2
        // Now use WidgetStack to contain the textfield and the default-email combo!
        m_widgetStack4 = new QWidgetStack( container );
        txtChooserField4 = new QLineEdit( m_widgetStack4 );
        m_widgetStack4 -> addWidget( txtChooserField4, TextField );
        gl->addMultiCellWidget( m_widgetStack4, 6, 6, 1, 2 );
        m_widgetStack4 -> raiseWidget( TextField );
        QSpacerItem *space = new QSpacerItem(1,1,
                                             QSizePolicy::Maximum,
                                             QSizePolicy::MinimumExpanding );
        gl->addItem( space, 7, 0 );
        tabMain->insertTab( tabViewport, tr( "Address" ) );
        tabViewport = new QWidget ( tabMain );
        vb = new QVBoxLayout( tabViewport );
        svDetails = new QScrollView( tabViewport );
        vb->addWidget( svDetails, 0, 0 );
        svDetails->setResizePolicy( QScrollView::AutoOneFit );
        svDetails->setFrameStyle( QFrame::NoFrame );
        container = new QWidget( svDetails->viewport() );
        svDetails->addChild( container );
        gl = new QGridLayout( container, 1, 2, 2, 4 );
        int counter = 0;
        // Birthday
        QHBox* hBox = new QHBox( container );
        l = new QLabel( tr("Birthday"), container );
        gl->addWidget( l, counter, 0 );
         QPopupMenu* m1 = new QPopupMenu( container );
         birthdayPicker = new DateBookMonth( m1, 0, TRUE );
         m1->insertItem( birthdayPicker );
        birthdayButton= new QToolButton( hBox, "buttonStart" );
         birthdayButton->setPopup( m1 );
        birthdayButton->setPopupDelay(0);
        QPushButton* deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), 
                                                     tr( "Delete" ),
                                                     hBox, 0 );
        gl->addWidget( hBox, counter , 1  );
-        connect( birthdayPicker, SIGNAL( dateClicked( int, int, int ) ),
+        connect( birthdayPicker, SIGNAL( dateClicked(int,int,int) ),
-                 this, SLOT( slotBirthdayDateChanged( int, int, int ) ) );
+                 this, SLOT( slotBirthdayDateChanged(int,int,int) ) );
        connect( deleteButton, SIGNAL( clicked() ), this, SLOT( slotRemoveBirthday() ) );
        ++counter;
        // Anniversary
        hBox = new QHBox( container );
        l = new QLabel( tr("Anniversary"), container );
        gl->addWidget( l, counter, 0 );
         m1 = new QPopupMenu( container );
         anniversaryPicker = new DateBookMonth( m1, 0, TRUE );
         m1->insertItem( anniversaryPicker );
        anniversaryButton= new QToolButton( hBox, "buttonStart" );
         anniversaryButton->setPopup( m1 );
        anniversaryButton->setPopupDelay(0);
        deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), 
                                                     tr( "Delete" ),
                                                     hBox, 0 );
        gl->addWidget( hBox, counter , 1  );
-        connect( anniversaryPicker, SIGNAL( dateClicked( int, int, int ) ),
+        connect( anniversaryPicker, SIGNAL( dateClicked(int,int,int) ),
-                 this, SLOT( slotAnniversaryDateChanged( int, int, int ) ) );
+                 this, SLOT( slotAnniversaryDateChanged(int,int,int) ) );
        connect( deleteButton, SIGNAL( clicked() ), this, SLOT( slotRemoveAnniversary() ) );
        ++counter;
        // Gender
        l = new QLabel( tr("Gender"), container );
        gl->addWidget( l, counter, 0 );
        cmbGender = new QComboBox( container );
        cmbGender->insertItem( "", 0 );
        cmbGender->insertItem( tr("Male"), 1);
        cmbGender->insertItem( tr("Female"), 2);
        gl->addWidget( cmbGender, counter, 1 );
        ++counter;
        // Create Labels and lineedit fields for every dynamic entry
        QStringList::ConstIterator it = slDynamicEntries.begin();
        QMap<QString, int> mapStrToID = OContactFields::untrFieldsToId();
        QMap<int, QString> mapIdToStr = OContactFields::idToTrFields();
        for (i = counter; it != slDynamicEntries.end(); i++, ++it ) {
          
          if (((*it) == "Anniversary") || 
              ((*it) == "Birthday")|| ((*it) == "Gender")) continue;
          l = new QLabel( mapIdToStr[mapStrToID[*it]], container );
                listName.append( l );
                gl->addWidget( l, i, 0 );
                QLineEdit *e = new QLineEdit( container );
                listValue.append( e );
                gl->addWidget( e, i, 1);
        }
        // Fill labels with names..
                //loadFields();
        tabMain->insertTab( tabViewport, tr( "Details" ) );
        dlgNote = new QDialog( this, "Note Dialog", TRUE );
        dlgNote->setCaption( tr("Enter Note") );
        QVBoxLayout *vbNote = new QVBoxLayout( dlgNote );
        txtNote = new QMultiLineEdit( dlgNote );
        vbNote->addWidget( txtNote );
        connect( btnNote, SIGNAL(clicked()), this, SLOT(slotNote()) );
        dlgName = new QDialog( this, "Name Dialog", TRUE );
        dlgName->setCaption( tr("Edit Name") );
        gl = new QGridLayout( dlgName, 5, 2, 2, 3 );
        l = new QLabel( tr("First Name"), dlgName );
        gl->addWidget( l, 0, 0 );
        txtFirstName = new QLineEdit( dlgName );
        gl->addWidget( txtFirstName, 0, 1 );
        l = new QLabel( tr("Middle Name"), dlgName );
        gl->addWidget( l, 1, 0 );
        txtMiddleName = new QLineEdit( dlgName );
        gl->addWidget( txtMiddleName, 1, 1 );
        l = new QLabel( tr("Last Name"), dlgName );
        gl->addWidget( l, 2, 0 );
        txtLastName = new QLineEdit( dlgName );
        gl->addWidget( txtLastName, 2, 1 );
        // l = new QLabel( tr("Suffix"), dlgName );
        // gl->addWidget( l, 3, 0 );
        // txtSuffix = new QLineEdit( dlgName );
        // gl->addWidget( txtSuffix, 3, 1 );
        space = new QSpacerItem(1,1,
                                QSizePolicy::Maximum,
                                QSizePolicy::MinimumExpanding );
        gl->addItem( space, 4,  0 );
        cmbChooserField1->insertStringList( trlChooserNames );
        cmbChooserField2->insertStringList( trlChooserNames );
        cmbChooserField3->insertStringList( trlChooserNames );
        cmbChooserField4->insertStringList( trlChooserNames );
         cmbChooserField1->setCurrentItem( 0 );
         cmbChooserField2->setCurrentItem( 1 );
         cmbChooserField3->setCurrentItem( 2 );
        connect( btnFullName, SIGNAL(clicked()), this, SLOT(slotName()) );
-        connect( txtFullName, SIGNAL(textChanged(const QString &)), 
+        connect( txtFullName, SIGNAL(textChanged(const QString&)), 
-                 this, SLOT(slotFullNameChange(const QString &)) );
+                 this, SLOT(slotFullNameChange(const QString&)) );
-        connect( txtSuffix, SIGNAL(textChanged(const QString &)), 
+        connect( txtSuffix, SIGNAL(textChanged(const QString&)), 
-                 this, SLOT(slotSuffixChange(const QString &)) );
+                 this, SLOT(slotSuffixChange(const QString&)) );
-         connect( txtOrganization, SIGNAL(textChanged(const QString &)), 
+         connect( txtOrganization, SIGNAL(textChanged(const QString&)), 
-                 this, SLOT(slotOrganizationChange(const QString &)) );
+                 this, SLOT(slotOrganizationChange(const QString&)) );
-        connect( txtChooserField1, SIGNAL(textChanged(const QString &)),
+        connect( txtChooserField1, SIGNAL(textChanged(const QString&)),
-                 this, SLOT(slotChooser1Change(const QString &)) );
+                 this, SLOT(slotChooser1Change(const QString&)) );
-        connect( txtChooserField2, SIGNAL(textChanged(const QString &)),
+        connect( txtChooserField2, SIGNAL(textChanged(const QString&)),
-                 this, SLOT(slotChooser2Change(const QString &)) );
+                 this, SLOT(slotChooser2Change(const QString&)) );
-        connect( txtChooserField3, SIGNAL(textChanged(const QString &)),
+        connect( txtChooserField3, SIGNAL(textChanged(const QString&)),
-                 this, SLOT(slotChooser3Change(const QString &)) );
+                 this, SLOT(slotChooser3Change(const QString&)) );
-        connect( txtChooserField4, SIGNAL(textChanged(const QString &)),
+        connect( txtChooserField4, SIGNAL(textChanged(const QString&)),
-                 this, SLOT(slotChooser4Change(const QString &)) );
+                 this, SLOT(slotChooser4Change(const QString&)) );
-        connect( txtAddress, SIGNAL(textChanged(const QString &)),
+        connect( txtAddress, SIGNAL(textChanged(const QString&)),
-                 this, SLOT(slotAddressChange(const QString &)) );
+                 this, SLOT(slotAddressChange(const QString&)) );
-        connect( txtCity, SIGNAL(textChanged(const QString &)),
+        connect( txtCity, SIGNAL(textChanged(const QString&)),
-                 this, SLOT(slotCityChange(const QString &)) );
+                 this, SLOT(slotCityChange(const QString&)) );
-        connect( txtState, SIGNAL(textChanged(const QString &)),
+        connect( txtState, SIGNAL(textChanged(const QString&)),
-                 this, SLOT(slotStateChange(const QString &)) );
+                 this, SLOT(slotStateChange(const QString&)) );
-        connect( txtZip, SIGNAL(textChanged(const QString &)),
+        connect( txtZip, SIGNAL(textChanged(const QString&)),
-                 this, SLOT(slotZipChange(const QString &)) );
+                 this, SLOT(slotZipChange(const QString&)) );
-        connect( cmbCountry, SIGNAL(textChanged(const QString &)),
+        connect( cmbCountry, SIGNAL(textChanged(const QString&)),
-                 this, SLOT(slotCountryChange(const QString &)) );
+                 this, SLOT(slotCountryChange(const QString&)) );
-        connect( cmbCountry, SIGNAL(activated(const QString &)),
+        connect( cmbCountry, SIGNAL(activated(const QString&)),
-                 this, SLOT(slotCountryChange(const QString &)) );
+                 this, SLOT(slotCountryChange(const QString&)) );
        connect( cmbChooserField1, SIGNAL(activated(int)),
                 this, SLOT(slotCmbChooser1Change(int)) );
        connect( cmbChooserField2, SIGNAL(activated(int)),
                 this, SLOT(slotCmbChooser2Change(int)) );
        connect( cmbChooserField3, SIGNAL(activated(int)),
                 this, SLOT(slotCmbChooser3Change(int)) );
        connect( cmbChooserField4, SIGNAL(activated(int)),
                 this, SLOT(slotCmbChooser4Change(int)) );
        connect( cmbAddress, SIGNAL(activated(int)),
                 this, SLOT(slotAddressTypeChange(int)) );
        new QPEDialogListener(this);
        setPersonalView ( m_personalView );
        qWarning("init() END");
 }
 void ContactEditor::defaultEmailChanged(int i){
        qDebug("defaultEmailChanged");
        // was sollte das ? (se)
        // int index = cmbChooserField1->currentItem();
        // slChooserValues[index] = cmbDefaultEmail->text(i);
        defaultEmail = cmbDefaultEmail->text(i);
        qDebug ("Changed to: %s", defaultEmail.latin1());
 }
 void ContactEditor::populateDefaultEmailCmb(){       
        // if the default-email combo was not selected and therfore not created
        // we get a lot of trouble.. Therfore create an invisible one..
        if ( !cmbDefaultEmail ){
                        cmbDefaultEmail = new QComboBox(this);
                cmbDefaultEmail -> hide();
        }
        cmbDefaultEmail->clear();    
        cmbDefaultEmail->insertStringList( emails );
        // cmbDefaultEmail->show();
        // Select default email in combo..
        bool found = false;
        for ( int i = 0; i < cmbDefaultEmail->count(); i++){
                qDebug(" populateDefaultEmailCmb text >%s< defaultEmail >%s<",
                       cmbDefaultEmail->text( i ).latin1(), defaultEmail.latin1());
                if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
                        cmbDefaultEmail->setCurrentItem( i );
                        qDebug("set");
                        found = true;
                }
        }
        
        // If the current default email is not found in the list, we choose the
        // first one..
        if ( !found )
                defaultEmail = cmbDefaultEmail->text(0);
 }
 // Called when any combobox was changed.
 // "true" returned if the change was chandled by this function, else it should
 // be handled by something else..
 bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) {
        QString type = slChooserNames[index];
        qWarning("ContactEditor::cmbChooserChange -> Type: %s, WidgetPos: %d", type.latin1(), widgetPos );
        if ( !initializing )
                contactfields.setFieldOrder( widgetPos-1, index );
        // Create and connect combobox for selecting the default email 
        if ( type == "Default Email"){         
                qWarning("Choosing default-email (defaultEmailChooserPosition= %d) ", defaultEmailChooserPosition);
                
                // More than one default-email chooser is not allowed !
                if ( ( defaultEmailChooserPosition != -1 ) && 
                     defaultEmailChooserPosition != widgetPos && !initializing){
                        chooserError( widgetPos );
                        return true;
                }
                QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
                if ( cmbo ){  
                        inputStack->raiseWidget( TextField );
                        inputStack -> removeWidget( cmbo );
                        delete cmbo;
                }
                cmbo = new QComboBox( inputStack );
                cmbo -> insertStringList( emails );
                inputStack -> addWidget( cmbo, Combo );
                inputStack -> raiseWidget( Combo );
                defaultEmailChooserPosition = widgetPos;
                cmbDefaultEmail = cmbo;
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();
diff --git a/core/pim/datebook2/mainwindow.cpp b/core/pim/datebook2/mainwindow.cpp
index 7ff2204..3937796 100644
--- a/core/pim/datebook2/mainwindow.cpp
+++ b/core/pim/datebook2/mainwindow.cpp
@@ -1,250 +1,250 @@
 #include <qcopchannel_qws.h>
 #include <qwidgetstack.h>
 #include <qlabel.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qtimer.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/ir.h>
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include "editor.h"
 #include "show.h"
 #include "templatemanager.h"
 #include "bookmanager.h"
 #include "mainwindow.h"
 using namespace Datebook;
 MainWindow::MainWindow()
    : OPimMainWindow( "Datebook", 0, 0 ), m_descMan( "Descriptions" ),  m_locMan( "Locations" )
 {
    setIcon( Resource::loadPixmap( "datebook_icon" ) );
    initUI();
    initManagers();
    initView();
    initConfig();
    QTimer::singleShot(0, this, SLOT(populate() ) );
    QCopChannel* chan = new QCopChannel( "QPE/System", this );
-    connect( chan, SIGNAL( received(const QCString&, const QByteArray& ) ),
+    connect( chan, SIGNAL( received(const QCString&,const QByteArray&) ),
-             this, SLOT( slotReceive( const QCString&, const QByteArray& ) ) );
+             this, SLOT( slotReceive(const QCString&,const QByteArray&) ) );
    chan  = new QCopChannel( "QPE/Datebook", this );
-    connect( chan, SIGNAL( received(const QCString&, const QByteArray& ) ),
+    connect( chan, SIGNAL( received(const QCString&,const QByteArray&) ),
-             this, SLOT( slotReceive( const QCString&, const QByteArray& ) ) );
+             this, SLOT( slotReceive(const QCString&,const QByteArray&) ) );
 }
 MainWindow::~MainWindow() {
    m_tempMan.save();
    m_locMan.save();
    m_descMan.save();
    manager()->save();
    delete m_manager;
 }
 void MainWindow::doSetDocument( const QString& str ) {
 }
 void MainWindow::flush() {
    manager()->save();
 }
 void MainWindow::reload() {
    manager()->reload();
 }
 int MainWindow::create() {
    return 0;
 }
 bool MainWindow::remove( int uid ) {
    manager()->remove( uid );
    return true;
 }
 void MainWindow::beam( int uid ) {
 }
 void MainWindow::show( int uid ) {
    eventShow()->show( manager()->event( uid ) );
 }
 void MainWindow::add( const OPimRecord& ad) {
    manager()->add( ad );
 }
 void MainWindow::edit() {
    edit ( currentView()->currentItem() );
 }
 void MainWindow::edit( int uid ) {
 }
 /*
 * init tool bars layout and so on
 */
 void MainWindow::initUI() {
    setToolBarsMovable( false );
    m_stack = new QWidgetStack( this );
    setCentralWidget( m_stack );
    m_toolBar = new QToolBar( this );
    m_toolBar->setHorizontalStretchable( TRUE );
    QMenuBar* mb = new QMenuBar( m_toolBar );
    m_popView    = new QPopupMenu( this );
    m_popSetting = new QPopupMenu( this );
    mb->insertItem( tr("View"), m_popView );
    mb->insertItem( tr("Settings" ), m_popSetting );
    m_popTemplate = new QPopupMenu( this );
    m_popTemplate->setCheckable( TRUE );
    connect( m_popTemplate, SIGNAL(activated(int) ),
             this, SLOT(slotNewFromTemplate(int) ) );
    m_popView->insertItem(tr("New from template"), m_popTemplate, -1, 0);
    QAction* a = new QAction( tr("New Event"), Resource::loadPixmap("new"),
                              QString::null, 0, this, 0 );
    a->addTo( m_toolBar );
    a->addTo( m_popView );
    connect(a, SIGNAL( activated() ), this, SLOT( create() ) );
    a = new QAction( tr("Edit Event"), Resource::loadPixmap("edit"),
                     QString::null, 0, this, 0 );
    a->addTo( m_popView );
    connect(a, SIGNAL( activated() ), this, SLOT( edit() ) );
    a = new QAction( tr("Today" ), Resource::loadPixmap( "datebook/to_day"),
                     QString::null, 0, this, 0 );
    a->addTo( m_toolBar );
    connect(a, SIGNAL( activated() ), this, SLOT( slotGoToNow() ) );
    a = new QAction( tr("Find"), Resource::loadPixmap( "mag" ),
                     QString::null, 0, this, 0 );
    a->addTo( m_toolBar );
    connect(a, SIGNAL( activated() ), this, SLOT( slotFind() ) );
    a = new QAction( tr("Configure"), QString::null, 0, 0 );
    a->addTo( m_popSetting );
    connect(a, SIGNAL( activated() ), this, SLOT( slotConfigure() ) );
    a = new QAction( tr("Configure Locations"), QString::null, 0, 0 );
    a->addTo( m_popSetting );
    connect(a, SIGNAL( activated() ), this, SLOT( slotConfigureLocs() ) );
    a = new QAction( tr("Configure Descriptions"), QString::null, 0, 0 );
    a->addTo( m_popSetting );
    connect(a, SIGNAL( activated() ), this, SLOT(slotConfigureDesc() ) );
    a = new QAction( tr("Configure Templates"), QString::null, 0, 0 );
    a->addTo( m_popSetting );
    connect(a, SIGNAL( activated() ), this, SLOT(slotConfigureTemp() ) );
    connect( qApp, SIGNAL(clockChanged(bool) ),
             this, SLOT(slotClockChanged(bool) ) );
    connect( qApp, SIGNAL(weekChanged(bool) ),
             this, SLOT(slotWeekChanged(bool) ) );
-    connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray& ) ),
+    connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&) ),
-             this, SLOT(slotAppMessage( const QCString&, const QByteArray& ) ) );
+             this, SLOT(slotAppMessage(const QCString&,const QByteArray&) ) );
 }
 void MainWindow::initConfig() {
 }
 void MainWindow::initView() {
 }
 void MainWindow::initManagers() {
    m_manager = new BookManager;
    m_tempMan.load();
    m_locMan.load();
    m_descMan.load();
    setTemplateMenu();
 }
 void MainWindow::raiseCurrentView() {
 }
 /*
 * populate the view
 */
 void MainWindow::populate() {
    if (!manager()->isLoaded() )
        manager()->load();
 }
 void MainWindow::slotGoToNow() {
 }
 View* MainWindow::currentView() {
 }
 void MainWindow::slotFind() {
 }
 void MainWindow::slotConfigure() {
 }
 void MainWindow::slotClockChanged( bool ) {
 }
 void MainWindow::slotWeekChanged(bool ) {
 }
 void MainWindow::slotAppMessage( const QCString&, const QByteArray& ) {
 }
 void MainWindow::slotReceive( const QCString&, const QByteArray& ) {
 }
 BookManager* MainWindow::manager() {
    return m_manager;
 }
 TemplateManager MainWindow::templateManager() {
    return m_tempMan;
 }
 LocationManager MainWindow::locationManager() {
    return m_locMan;
 }
 DescriptionManager MainWindow::descriptionManager() {
    return m_descMan;
 }
 void MainWindow::setLocationManager( const LocationManager& loc) {
    m_locMan = loc;
 }
 void MainWindow::setDescriptionManager( const DescriptionManager& dsc ) {
    m_descMan = dsc;
 }
 Show* MainWindow::eventShow() {
    return m_show;
 }
 void MainWindow::slotAction( QAction* act ) {
 }
 void MainWindow::slotConfigureLocs() {
    LocationManagerDialog dlg( locationManager() );
    dlg.setCaption( tr("Configure Locations") );
    if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) {
        setLocationManager( dlg.manager() );
    }
 }
 void MainWindow::slotConfigureDesc() {
    DescriptionManagerDialog dlg( descriptionManager() );
    dlg.setCaption( tr("Configure Descriptions") );
    if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) {
        setDescriptionManager( dlg.manager() );
    }
 }
 void MainWindow::slotConfigureTemp() {
    TemplateDialog dlg( templateManager(), editor() );
    dlg.setCaption( tr("Configure Templates") );
    if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) {
        m_tempMan = dlg.manager();
        setTemplateMenu();
    }
 }
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index bfe95b0..8b6a5df 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -108,193 +108,193 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
  buttonBox->hide();
  searches.append( new AppLnkSearch( resultsList, tr("Applications") ) );
  searches.append( new DocLnkSearch( resultsList, tr("Documents") ) );
  searches.append( new TodoSearch( resultsList, tr("Todo List") ) );
  searches.append( new DatebookSearch( resultsList, tr("Calendar") ) );
  searches.append( new AdressSearch( resultsList, tr("Contacts") ) );
  setCentralWidget( mainFrame );
  popupTimer = new QTimer();
  searchTimer = new QTimer();
  connect(popupTimer, SIGNAL(timeout()), SLOT(showPopup()));
  connect(searchTimer, SIGNAL(timeout()), SLOT(searchStringChanged()));
  connect(resultsList, SIGNAL(pressed(QListViewItem*)), SLOT(setCurrent(QListViewItem*)));
  connect(resultsList, SIGNAL(clicked(QListViewItem*)), SLOT(stopTimer(QListViewItem*)));
  signalMapper = new QSignalMapper( this );
  connect(signalMapper, SIGNAL(mapped(int)), SLOT( slotAction(int) ) );
  makeMenu();
   Config cfg( "osearch", Config::User );
   cfg.setGroup( "search_settings" );
   actionCaseSensitiv->setOn( cfg.readBoolEntry( "caseSensitiv", false ) );
   actionWildcards->setOn( cfg.readBoolEntry( "wildcards", false ) );
 //   actionWholeWordsOnly->setOn( cfg.readBoolEntry( "whole_words_only", false ) );
 }
 void MainWindow::makeMenu()
 {
   QToolBar *toolBar = new QToolBar( this );
   QToolBar *searchBar = new QToolBar(this);
   QMenuBar *menuBar = new QMenuBar( toolBar );
   QPopupMenu *searchMenu = new QPopupMenu( menuBar );
 //   QPopupMenu *viewMenu = new QPopupMenu( menuBar );
   QPopupMenu *cfgMenu = new QPopupMenu( menuBar );
   QPopupMenu *searchOptions = new QPopupMenu( cfgMenu );
   setToolBarsMovable( false );
   toolBar->setHorizontalStretchable( true );
   menuBar->insertItem( tr( "Search" ), searchMenu );
   menuBar->insertItem( tr( "Settings" ), cfgMenu );
   //SETTINGS MENU
   cfgMenu->insertItem( tr( "Search" ), searchOptions );
   QPopupMenu *pop;
   for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){
                pop = s->popupMenu();
                if (pop){
                        cfgMenu->insertItem( s->text(0), pop );
                }
  }
  //SEARCH
  SearchAllAction = new QAction( tr("Search all"),QString::null,  0, this, 0 );
  SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) );
 // QWhatsThis::add( SearchAllAction, tr("Search everything...") );
  connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) );
  SearchAllAction->addTo( searchMenu );
  searchMenu->insertItem( tr( "Options" ), searchOptions );
  //SEARCH OPTIONS
  //actionWholeWordsOnly = new QAction( tr("Whole words only"),QString::null,  0, this, 0, true );
  //actionWholeWordsOnly->addTo( searchOptions );
  actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null,  0, this, 0, true );
  actionCaseSensitiv->addTo( searchOptions );
  actionWildcards = new QAction( tr("Use wildcards"),QString::null,  0, this, 0, true );
  actionWildcards->addTo( searchOptions );
  //SEARCH BAR
  LabelEnterText = new QLabel( searchBar, "Label" );
  LabelEnterText->setAutoMask( FALSE );
  LabelEnterText->setText( tr( "Search for: " ) );
  addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
  QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" );
  QWhatsThis::add( searchEdit, tr("Enter your search terms here") );
  searchEdit->setFocus();
  searchBar->setHorizontalStretchable( TRUE );
  searchBar->setStretchableWidget( searchEdit );
  //Search button
  SearchAllAction->addTo( searchBar );
  //image ripped of off opie-login/loginwindow.cpp
  QPixmap image1( ( const char** ) image1_data );
  //Clear text
  ClearSearchText = new QToolButton( searchBar, "ClearSearchText");
  ClearSearchText->setText( tr( "" ) );
  ClearSearchText->setPixmap( image1 );
-  connect( searchEdit, SIGNAL( textChanged( const QString & ) ),this, SLOT( setSearch( const QString & ) ) );
+  connect( searchEdit, SIGNAL( textChanged(const QString&) ),this, SLOT( setSearch(const QString&) ) );
  connect( ClearSearchText, SIGNAL( clicked() ), searchEdit, SLOT( clear() ) );
 }
 MainWindow::~MainWindow()
 {
   Config cfg( "osearch", Config::User );
   cfg.setGroup( "search_settings" );
   cfg.writeEntry( "caseSensitiv", actionCaseSensitiv->isOn() );
   cfg.writeEntry( "wildcards", actionWildcards->isOn() );
   //cfg.writeEntry( "whole_words_only", actionWholeWordsOnly->isOn() );
 }
 void MainWindow::setCurrent(QListViewItem *item)
 {
        if (!item) return;
        _currentItem = (OListViewItem*)item;
        //_currentItem = dynamic_cast<OListViewItem*>(item);
        if (_currentItem->rtti() == OListViewItem::Result){
                ResultItem *res = (ResultItem*)item;
        //      ResultItem *res = dynamic_cast<ResultItem*>(item);
                richEdit->setText( res->toRichText() );
                QIntDict<QString> acts = res->actions();
                QButton *button;
                for (uint i = 0; i < acts.count(); i++){
                        button = buttonMap[i];
                        if (!button) {
                            qWarning(" no button for %s", (*acts[i]).latin1() );
                            button = new QPushButton( buttonBox );
                            buttonMap.insert( i,  button );
                            signalMapper->setMapping(button, i );
                            connect(button, SIGNAL(clicked() ), signalMapper, SLOT(map() ) );
                        }
                        button->setText( *acts[i] );
                        button->show();
                }
                for (uint i = acts.count(); i < _buttonCount; i++){
                        button = buttonMap[i];
                        if (button) button->hide();
                }
                _buttonCount = acts.count();
                detailsFrame->show();
                buttonBox->show();
        }else {
            detailsFrame->hide();
            buttonBox->hide();
        }
        popupTimer->start( 300, true );
 }
 void MainWindow::stopTimer(QListViewItem*)
 {
        popupTimer->stop();
 }
 void MainWindow::showPopup()
 {
        popupTimer->stop();
        if (!_currentItem) return;
        QPopupMenu *pop = _currentItem->popupMenu();
        if (pop) pop->popup( QCursor::pos() );
 }
 void MainWindow::setSearch( const QString &key )
 {
        searchTimer->stop();
        _searchString = key;
        searchTimer->start( 300 );
 }
 void MainWindow::searchStringChanged()
 {
 #ifdef NEW_OWAIT
        OWait("setting search string");
 #endif
        searchTimer->stop();
        QString ss = _searchString;
        //ss = Global::stringQuote( _searchString );
        //if (actionWholeWordsOnly->isOn())
        //      ss = "\\s"+_searchString+"\\s";
        //qDebug(" set searchString >%s<",ss.latin1());
        QRegExp re( ss );
        re.setCaseSensitive( actionCaseSensitiv->isOn() );
        re.setWildcard( actionWildcards->isOn() );
        for (SearchGroup *s = searches.first(); s != 0; s = searches.next() )
                s->setSearch( re );
 }
 void MainWindow::searchAll()
 {
 #ifdef NEW_OWAIT
        OWait("searching...");
 #endif
        for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){
                s->doSearch();
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
index c8652f3..b0d456d 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
@@ -1,137 +1,137 @@
 /*
 * addresspluginwidget.cpp
 *
 * copyright   : (c) 2003 by Stefan Eilers
 * email       : eilers.stefan@epost.de
 *
 * This implementation was derived from the todolist plugin implementation
 *
 */
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #include "addresspluginwidget.h"
 #include <qpe/config.h>
 #include <opie/ocontact.h>
 AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent,  const char* name )
    : QWidget( parent, name ) {
    addressLabel = 0l;
    m_contactdb = 0l;
    layoutTodo = 0l;
    // H� ? Nonsense ! (se)
    if ( m_contactdb ) {
        delete m_contactdb;
    }
    m_contactdb = new OContactAccess("addressplugin");
    
-    connect( m_contactdb, SIGNAL( signalChanged( const OContactAccess * ) ),
+    connect( m_contactdb, SIGNAL( signalChanged(const OContactAccess*) ),
-             this, SLOT( refresh( const OContactAccess * ) ) );
+             this, SLOT( refresh(const OContactAccess*) ) );
    readConfig();
    getAddress();
 }
 AddressBookPluginWidget::~AddressBookPluginWidget() {
    delete m_contactdb;
 }
 void AddressBookPluginWidget::refresh( const OContactAccess* )
 {
        qWarning(" AddressBookPluginWidget::Database was changed externally ! ");
        m_contactdb->reload();
        getAddress();
 }
 void AddressBookPluginWidget::reinitialize() {
        readConfig();
        getAddress();
 }
 void AddressBookPluginWidget::readConfig() {
    Config cfg( "todayaddressplugin" );
    cfg.setGroup( "config" );
    m_maxLinesTask  = cfg.readNumEntry( "maxlinestask", 5 );
    m_maxCharClip   = cfg.readNumEntry( "maxcharclip", 38 );
    m_daysLookAhead = cfg.readNumEntry( "dayslookahead", 14 );
    m_urgentDays    = cfg.readNumEntry( "urgentdays", 7 );
    m_entryColor    = cfg.readEntry("entrycolor", Qt::black.name() );
    m_headlineColor = cfg.readEntry( "headlinecolor", Qt::black.name() );
    m_urgentColor   = cfg.readEntry( "urgentcolor", Qt::red.name() );
    m_showBirthdays = cfg.readBoolEntry( "showBirthdays", true );
    m_showAnniversaries = cfg.readBoolEntry( "showAnniversaries", true );
 }
 /**
 * Get the addresss
 */
 void AddressBookPluginWidget::getAddress() {
        if ( ! layoutTodo ){
                layoutTodo = new QVBoxLayout( this );
        }
        if ( ! addressLabel ) {
                addressLabel = new OClickableLabel( this );
                connect( addressLabel, SIGNAL( clicked() ), this, SLOT( startAddressBook() ) );
                layoutTodo->addWidget( addressLabel );
        }
        
        QString output;
        // Check whether the database provide the search option..
    if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
                // Libopie seems to be old..
                output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" );
                addressLabel->setText( output );
                return;
        }
        // Define the query for birthdays and start search..
        QDate lookAheadDate = QDate::currentDate().addDays( m_daysLookAhead );
        int ammount = 0;
        if ( m_showBirthdays ){
                qWarning("Searching from now (%s) until %s ! ",
                         QDate::currentDate().toString().latin1(),
                         lookAheadDate.toString().latin1() );
    }
    if ( m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
                OContact querybirthdays;
                querybirthdays.setBirthday( lookAheadDate );
                
                m_list = m_contactdb->queryByExample( querybirthdays, 
                                                      OContactAccess::DateDiff );
                if ( m_list.count() > 0 ){
                        output = "<font color=" + m_headlineColor + ">"
                                + QObject::tr( "Next birthdays in <b> %1 </b> days:" )
                                .arg( m_daysLookAhead )
                                + "</font> <br>";
                        for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
                                if ( ammount++ < m_maxLinesTask ){
                                        // Now we want to calculate how many days 
                                        //until birthday. We have to set 
                                        // the correct year to calculate the day diff...
                                        QDate destdate = (*m_it).birthday();
                                        destdate.setYMD( QDate::currentDate().year(), 
                                                         destdate.month(), destdate.day() );
                                        if ( QDate::currentDate().daysTo(destdate) < 0 )
                                                destdate.setYMD( QDate::currentDate().year()+1, 
                                                                 destdate.month(), destdate.day() );
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
index b6707df..0820802 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
@@ -6,135 +6,135 @@
 *
 */
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #include "datebookpluginwidget.h"
 #include <qpe/config.h>
 #include <qtl.h>
 DatebookPluginWidget::DatebookPluginWidget( QWidget *parent, const char* name )
    : QWidget(parent, name ) {
    db = 0l;
    m_layoutDates = 0l;
    if ( m_layoutDates )  {
        delete m_layoutDates;
    }
    m_layoutDates = new QVBoxLayout( this );
    m_layoutDates->setAutoAdd( true );
    m_eventsList.setAutoDelete( true );
    readConfig();
    getDates();
 }
 DatebookPluginWidget::~DatebookPluginWidget() {
    delete db;
    delete m_layoutDates;
 }
 void DatebookPluginWidget::readConfig() {
    Config cfg( "todaydatebookplugin" );
    cfg.setGroup( "config" );
    m_max_lines_meet = cfg.readNumEntry( "maxlinesmeet", 5 );
    m_show_location = cfg.readNumEntry( "showlocation", 1 );
    m_show_notes = cfg.readNumEntry( "shownotes", 0 );
    m_onlyLater = cfg.readNumEntry( "onlylater", 1 );
    m_moreDays = cfg.readNumEntry( "moredays", 0 );
    m_timeExtraLine = cfg.readNumEntry( "timeextraline",  1 );
 }
 void DatebookPluginWidget::reinitialize()  {
    readConfig();
    refresh();
 }
 void DatebookPluginWidget::refresh()  {
    m_eventsList.clear();
    if ( m_layoutDates )  {
        delete m_layoutDates;
    }
    m_layoutDates = new QVBoxLayout( this );
    m_layoutDates->setAutoAdd( true );
    getDates();
 }
 /**
 *  Get all events that are in the datebook xml file for today
 */
 void DatebookPluginWidget::getDates() {
    if ( db ) {
        delete db;
    }
    db = new DateBookDB;
    QDate date = QDate::currentDate();
    QValueList<EffectiveEvent> list = db->getEffectiveEvents( date, date.addDays( m_moreDays )  );
    qBubbleSort( list );
    int count = 0;
    if ( list.count() > 0 ) {
        for ( QValueList<EffectiveEvent>::ConstIterator it = list.begin(); it  != list.end(); ++it ) {
            if ( count < m_max_lines_meet ) {
                if ( !m_onlyLater ) {
                    count++;
                    DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine );
                    m_eventsList.append( l );
                    l->show();
-                    QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) );
+                    QObject::connect ( l, SIGNAL( editEvent(const Event&) ), l, SLOT( editEventSlot(const Event&) ) );
                } else {
                        if ( ( QDateTime::currentDateTime()  <=  (*it).event().end() )
                             // Show events which span over many days and are not elapsed.
                             || ( ( (*it).event().start().date() != date ) &&  (  QDateTime::currentDateTime()  <=  (*it).event().end() )  )
                             // Show repeated event for today that is not elapsed.
                             || ( ( (*it).event().repeatType() != Event::NoRepeat )
                                  && ( ( date.dayOfWeek() == (*it).date().dayOfWeek() )
                                       && ( QTime::currentTime() < (*it).event().start().time() ) ) )
                             // Show repeated event for next days.
                             || ( ( (*it).event().repeatType() != Event::NoRepeat )
                                  && ( date.dayOfWeek() != (*it).date().dayOfWeek() ) )
                             )
                             {
                                count++;
                                // show only later appointments
                                DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine );
                                m_eventsList.append( l );
                                l->show();
-                                QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) );
+                                QObject::connect ( l, SIGNAL( editEvent(const Event&) ), l, SLOT( editEventSlot(const Event&) ) );
                             }
                }
            }
        }
        if ( m_onlyLater && count == 0 ) {
            QLabel* noMoreEvents = new QLabel( this );
            m_eventsList.append(  noMoreEvents );
            noMoreEvents->show();
            noMoreEvents->setText( QObject::tr( "No more appointments today" ) );
        }
    } else {
        QLabel* noEvents = new QLabel( this );
        m_eventsList.append( noEvents );
        noEvents->show();
        noEvents->setText( QObject::tr( "No appointments today" ) );
    }
 }
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.cpp b/core/pim/today/plugins/mail/mailpluginwidget.cpp
index 4194270..a8e4c41 100644
--- a/core/pim/today/plugins/mail/mailpluginwidget.cpp
+++ b/core/pim/today/plugins/mail/mailpluginwidget.cpp
@@ -1,97 +1,97 @@
 /*
 * mailpluginwidget.cpp
 *
 * copyright   : (c) 2002,2003,2004 by Maximilian Rei�
 * email       : harlekin@handhelds.org
 *
 */
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #include "mailpluginwidget.h"
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 MailPluginWidget::MailPluginWidget( QWidget *parent,  const char* name)
    : QWidget(parent,  name ) {
    m_mailLabel = 0l;
    m_layout = 0l;
    if ( m_mailLabel )  {
        delete m_mailLabel;
    }
    m_mailLabel = new OClickableLabel( this );
    connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) );
    if ( m_layout )  {
        delete m_layout;
    }
    m_layout = new QHBoxLayout( this );
    m_layout->setAutoAdd( true );
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
    QCopChannel *qCopChannel = new QCopChannel( "QPE/Pim" , this );
-    connect ( qCopChannel, SIGNAL( received( const QCString &, const QByteArray &) ),
+    connect ( qCopChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
-              this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) );
+              this, SLOT ( channelReceived(const QCString&,const QByteArray&) ) );
 #endif
 #endif
    readConfig();
    getInfo();
 }
 void MailPluginWidget::channelReceived( const QCString &msg, const QByteArray & data ) {
    QDataStream stream( data, IO_ReadOnly );
    if ( msg == "outgoingMails(int)" ) {
       stream >> m_outgoing;
    } else if ( msg == "newMails(int)" ) {
       stream >> m_newMails;
    }
    getInfo();
 }
 MailPluginWidget::~MailPluginWidget() {
    delete m_mailLabel;
    delete m_layout;
 }
 void MailPluginWidget::readConfig() {
    Config cfg( "todaymailplugin" );
    cfg.setGroup( "config" );
    Config cfg2( "mail" );
    cfg2.setGroup( "Status" );
    m_newMails = cfg2.readNumEntry( "newMails", 0 );
    m_outgoing = cfg2.readNumEntry( "outgoing", 0 );
 }
 void MailPluginWidget::refresh()  {
    getInfo();
 }
 void MailPluginWidget::getInfo() {
    m_mailLabel->setText(  QObject::tr( "<b>%1</b> new mail(s), <b>%2</b> outgoing" ).arg( m_newMails ).arg( m_outgoing ) );
 }
 /**
 * launches datebook
 */
 void MailPluginWidget::startMail() {
    QCopEnvelope e("QPE/System", "execute(QString)");
    e << QString( "opiemail" );
 }
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 72cdfd6..812f8b5 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -1,153 +1,153 @@
 /*
 * today.cpp
 *
 * copyright   : (c) 2002,2003,2004 by Maximilian Rei�
 * email       : harlekin@handhelds.org
 *
 */
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #define QTOPIA_INTERNAL_LANGLIST
 #include "today.h"
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/contact.h>
 #include <qdir.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 struct TodayPlugin {
    TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {}
    QLibrary *library;
    QInterfacePtr<TodayPluginInterface> iface;
    TodayPluginObject *guiPart;
    QWidget *guiBox;
    QString name;
    bool active;
    bool excludeRefresh;
    int pos;
 };
 static QValueList<TodayPlugin> pluginList;
 static  QMap<QString, TodayPlugin> tempList;
 Today::Today( QWidget* parent,  const char* name, WFlags fl )
    : TodayBase( parent, name, fl ) {
    QObject::connect( (QObject*)ConfigButton, SIGNAL( clicked() ), this, SLOT( startConfig() ) );
    QObject::connect( (QObject*)OwnerField, SIGNAL( clicked() ), this,  SLOT( editCard() ) );
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
    QCopChannel *todayChannel = new QCopChannel( "QPE/Today" , this );
-    connect ( todayChannel, SIGNAL( received( const QCString &, const QByteArray &) ),
+    connect ( todayChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
-              this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) );
+              this, SLOT ( channelReceived(const QCString&,const QByteArray&) ) );
 #endif
 #endif
    setOwnerField();
    m_refreshTimer = new QTimer( this );
    connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
    m_refreshTimer->start( 15000 );
    m_big_box = 0L;
    layout = new QVBoxLayout( this );
    layout->addWidget( Frame );
    layout->addWidget( OwnerField );
    m_sv = new QScrollView( this );
    m_sv->setResizePolicy( QScrollView::AutoOneFit );
    m_sv->setHScrollBarMode( QScrollView::AlwaysOff );
    m_sv->setFrameShape( QFrame::NoFrame );
    layout->addWidget( m_sv );
    layout->setStretchFactor( m_sv,4 );
    qApp->processEvents();
    loadPlugins();
    QPEApplication::showWidget( this );
 }
 /**
 * Qcop receive method.
 */
 void Today::channelReceived( const QCString &msg, const QByteArray & data ) {
    QDataStream stream( data, IO_ReadOnly );
    if ( msg == "message(QString)" ) {
        QString message;
        stream >> message;
        setOwnerField( message );
    }
 }
 void Today::setRefreshTimer( int interval ) {
    disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
    // 0 is "never" case
    if ( !interval == 0 ) {
        connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
        m_refreshTimer->changeInterval( interval );
    }
 }
 /**
 * Initialises the owner field with the default value, the username
 */
 void Today::setOwnerField() {
    QString file = Global::applicationFileName( "addressbook", "businesscard.vcf" );
    if ( QFile::exists( file ) ) {
        Contact cont = Contact::readVCard( file )[0];
        QString returnString = cont.fullName();
        OwnerField->setText( "<b>" + tr ( "Owned by " ) + returnString + "</b>" );
    } else {
        OwnerField->setText( "<b>" + tr ( "Please fill out the business card" ) + " </b>" );
    }
 }
 /**
 * Set the owner field with a given QString, for example per qcop.
 */
 void Today::setOwnerField( QString &message ) {
    if ( !message.isEmpty() ) {
        OwnerField->setText( "<b>" + message + "</b>" );
    }
 }
 /**
 * Init stuff needed for today. Reads the config file.
 */
 void Today::init() {
    // read config
    Config cfg( "today" );
    cfg.setGroup( "Plugins" );
    m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
    m_allApplets = cfg.readListEntry( "AllApplets", ',' );
    cfg.setGroup( "General" );
    m_iconSize = cfg.readNumEntry( "IconSize", 18 );
    m_hideBanner = cfg.readNumEntry( "HideBanner", 0 );
    setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) );
    // set the date in top label
    QDate date = QDate::currentDate();
    DateLabel->setText( QString( "<font color=#FFFFFF>" +  TimeString::longDateString( date )  + "</font>" ) );
    if ( m_hideBanner )  {
        Opiezilla->hide();
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 5c51515..a6f53e1 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -1,184 +1,184 @@
 /*
 * todayconfig.cpp
 *
 * copyright   : (c) 2002, 2003, 2004 by Maximilian Rei�
 * email       : harlekin@handhelds.org
 *
 */
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #include "todayconfig.h"
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qlayout.h>
 #include <qheader.h>
 #include <qvbox.h>
 #include <qtoolbutton.h>
 #include <qwhatsthis.h>
 class ToolButton : public QToolButton {
 public:
    ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
        : QToolButton( parent, name ) {
        setPixmap( Resource::loadPixmap( icon ) );
        setAutoRaise( TRUE );
        setFocusPolicy( QWidget::NoFocus );
        setToggleButton( t );
        connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
    }
 };
 /**
 * The class has currently quite some duplicate code.
 * By that way it would be real easy to have it as seperate app in settings tab
 *
 */
 TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
    : QDialog( parent, name, modal, WStyle_ContextHelp ) {
    setCaption( tr( "Today Config" ) );
    QVBoxLayout *layout = new QVBoxLayout( this );
    TabWidget3 = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
    layout->addWidget( TabWidget3 );
    tab_2 = new QWidget( TabWidget3, "tab_2" );
    QVBoxLayout *tab2Layout = new QVBoxLayout( tab_2, 4 ,4 );
    QLabel *l = new QLabel( tr( "Load which plugins in what order:" ), tab_2 );
    tab2Layout->addWidget( l );
    QHBox *hbox1 = new QHBox( tab_2 );
    m_appletListView = new QListView( hbox1 );
    m_appletListView->addColumn( "PluginList" );
    m_appletListView->header()->hide();
    m_appletListView->setSorting( -1 );
    QWhatsThis::add( m_appletListView, tr( "Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order" ) );
    QVBox *vbox1 = new QVBox( hbox1 );
    new ToolButton( vbox1, tr( "Move Up" ), "up",  this , SLOT( moveSelectedUp() ) );
    new ToolButton( vbox1, tr( "Move Down" ), "down", this , SLOT( moveSelectedDown() ) );
    tab2Layout->addWidget( hbox1 );
    TabWidget3->addTab( tab_2, "pass", tr( "active/order" ) );
    // Misc tab
    tab_3 = new QWidget( TabWidget3, "tab_3" );
    QVBoxLayout *tab3Layout = new QVBoxLayout( tab_3 );
    m_guiMisc = new TodayConfigMiscBase( tab_3 );
    tab3Layout->addWidget( m_guiMisc );
    TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) );
    m_applets_changed = false;
-    connect ( m_appletListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( appletChanged ( ) ) );
+    connect ( m_appletListView , SIGNAL( clicked(QListViewItem*) ), this, SLOT( appletChanged() ) );
    readConfig();
    QPEApplication::showDialog( this );
 }
 /**
 * Autostart, uses the new (opie only) autostart method in the launcher code.
 * If registered against that today ist started on each resume.
 */
 void TodayConfig::setAutoStart() {
    Config cfg( "today" );
    cfg.setGroup( "Autostart" );
    if ( m_autoStart ) {
        QCopEnvelope e( "QPE/System", "autoStart(QString,QString,QString)" );
        e << QString( "add" );
        e << QString( "today" );
        e << QString( "%1" ).arg( m_autoStartTimer );
    } else {
        QCopEnvelope e( "QPE/System", "autoStart(QString,QString)" );
        e << QString( "remove" );
        e << QString( "today" );
    }
 }
 /**
 * Read the config part
 */
 void TodayConfig::readConfig() {
    Config cfg( "today" );
    cfg.setGroup( "Autostart" );
    m_autoStart = cfg.readNumEntry( "autostart", 1 );
    m_guiMisc->CheckBoxAuto->setChecked( m_autoStart );
    m_autoStartTimer = cfg.readNumEntry( "autostartdelay", 0 );
    m_guiMisc->SpinBoxTime->setValue( m_autoStartTimer );
    cfg.setGroup( "General" );
    m_iconSize = cfg.readNumEntry( "IconSize", 18 );
    m_guiMisc->SpinBoxIconSize->setValue( m_iconSize );
    m_guiMisc->SpinRefresh->setValue( cfg.readNumEntry( "checkinterval", 15000 ) / 1000 );
    m_guiMisc->CheckBoxHide->setChecked( cfg.readNumEntry( "HideBanner", 0 ) );
    cfg.setGroup( "Plugins" );
    m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
 }
 /**
 * Write the config part
 */
 void TodayConfig::writeConfig() {
    Config cfg( "today" );
    cfg.setGroup( "Plugins" );
    if ( m_applets_changed ) {
        QStringList exclude;
        QStringList include;
        QStringList all_applets;
        QListViewItemIterator list_it( m_appletListView );
        // this makes sure the names get saved in the order selected
        for ( ; list_it.current(); ++list_it ) {
            QMap <QString, QCheckListItem *>::Iterator it;
            for ( it = m_applets.begin(); it != m_applets. end (); ++it ) {
                if ( list_it.current() == (*it) && !(*it)-> isOn () ) {
                    exclude << it.key();
                } else if ( list_it.current() == (*it) && (*it)-> isOn () ){
                    include << it.key();
                }
                if ( list_it.current() == (*it) ) {
                    all_applets << it.key();
                }
            }
        }
        cfg.writeEntry( "ExcludeApplets", exclude, ',' );
        cfg.writeEntry( "IncludeApplets", include, ',' );
        cfg.writeEntry( "AllApplets",  all_applets, ',' );
    }
    cfg.setGroup( "Autostart" );
    m_autoStart = m_guiMisc->CheckBoxAuto->isChecked();
    cfg.writeEntry( "autostart",  m_autoStart );
    m_autoStartTimer = m_guiMisc->SpinBoxTime->value();
    cfg.writeEntry( "autostartdelay", m_autoStartTimer );
    m_iconSize = m_guiMisc->SpinBoxIconSize->value();
    cfg.setGroup( "General" );
    cfg.writeEntry( "IconSize", m_iconSize );
    cfg.writeEntry( "HideBanner",  m_guiMisc->CheckBoxHide->isChecked() );
    cfg.writeEntry( "checkinterval", m_guiMisc->SpinRefresh->value()*1000 );
    // set autostart settings
    setAutoStart();
 }
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index b68aad2..a244e58 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -96,193 +96,193 @@ void MainWindow::initActions() {
    m_edit->insertItem(QWidget::tr("New from template"), m_template,
                       -1, 0 );
    QAction* a = new QAction( QWidget::tr("New Task" ), Resource::loadPixmap( "new" ),
                              QString::null, 0, this, 0 );
    connect(a, SIGNAL( activated() ),
            this, SLOT( slotNew() ) );
    a->setWhatsThis( QWidget::tr( "Click here to create a new task." ) );
    a->addTo(m_tool );
    a->addTo(m_edit );
    a = new QAction( QWidget::tr("Edit Task"), Resource::loadIconSet( "edit" ),
                     QString::null, 0, this, 0 );
    connect(a, SIGNAL(activated() ),
            this, SLOT( slotEdit() ) );
    a->setWhatsThis( QWidget::tr( "Click here to modify the current task." ) );
    a->addTo( m_tool );
    a->addTo( m_edit );
    m_editAction = a;
    a = new QAction( QString::null, QWidget::tr("View Task"), 0, this, 0 );
    connect(a, SIGNAL( activated() ),
            this, SLOT( slotShowDetails() ) );
    a->addTo( m_edit );
    m_edit->insertSeparator();
    a = new QAction( QWidget::tr("Delete..."),  Resource::loadIconSet( "trash" ),
                     QString::null, 0, this, 0 );
    connect(a, SIGNAL(activated() ),
            this, SLOT(slotDelete() ) );
    a->setWhatsThis( QWidget::tr( "Click here to remove the current task." ) );
    a->addTo( m_tool );
    a->addTo( m_edit );
    m_deleteAction = a;
    a = new QAction( QString::null, QWidget::tr("Delete all..."), 0, this, 0 );
    connect(a, SIGNAL( activated() ),
            this, SLOT( slotDeleteAll() ) );
    a->addTo(m_edit );
    m_deleteAllAction = a;
    a = new QAction( QString::null, QWidget::tr("Delete completed"),
                     0, this, 0 );
    connect(a, SIGNAL( activated() ),
            this, SLOT( slotDeleteCompleted() ) );
    a->addTo(m_edit );
    a->setEnabled( TRUE );
    m_deleteCompleteAction = a;
    m_edit->insertSeparator();
    a = new QAction( QString::null, QWidget::tr("Duplicate"), 0, this, 0 );
    connect(a, SIGNAL( activated() ),
            this, SLOT( slotDuplicate() ) );
    a->addTo(m_edit );
    m_duplicateAction = a;
    m_edit->insertSeparator();
    if ( Ir::supported() ) {
        a = new QAction( QWidget::tr( "Beam" ), Resource::loadPixmap( "beam" ), QString::null, 0, this, 0 );
        connect( a, SIGNAL( activated() ), this, SLOT( slotBeam() ) );
        a->setWhatsThis( QWidget::tr( "Click here to send the current task to another device." ) );
        a->addTo( m_edit );
        a->addTo( m_tool );
    }
 #if 0
    // Options menu
    a = new QAction( QWidget::tr("Find"), Resource::loadIconSet( "mag" ),
                     QString::null, 0, this, 0 );
    connect(a, SIGNAL( activated() ), this, SLOT( slotFind() ) );
    a->addTo( m_options );
    m_findAction = a;
    m_options->insertSeparator();
 #endif
    m_completedAction = new QAction( QString::null, QWidget::tr("Show completed tasks"),
                                     0, this, 0, TRUE );
    m_completedAction->addTo( m_options );
    m_completedAction->setOn( showCompleted() );
    connect(m_completedAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowCompleted(bool) ) );
    a = new QAction( QString::null, QWidget::tr("Show only over-due tasks"),
                     0, this, 0, TRUE );
    a->addTo( m_options );
    a->setOn( showOverDue() );
    connect(a, SIGNAL(toggled(bool)), this, SLOT(slotShowDue(bool) ) );
    m_showDeadLineAction = new QAction( QString::null, QWidget::tr("Show task deadlines"),
                                        0, this, 0, TRUE );
    m_showDeadLineAction->addTo( m_options );
    m_showDeadLineAction->setOn( showDeadline() );
-    connect(m_showDeadLineAction, SIGNAL(toggled(bool) ), this, SLOT( slotShowDeadLine( bool ) ) );
+    connect(m_showDeadLineAction, SIGNAL(toggled(bool) ), this, SLOT( slotShowDeadLine(bool) ) );
    m_showQuickTaskAction = new QAction( QString::null, QWidget::tr("Show quick task bar"),
                                     0, this, 0, TRUE );
    m_showQuickTaskAction->addTo( m_options );
    m_showQuickTaskAction->setOn( showQuickTask() );
    connect(m_showQuickTaskAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowQuickTask(bool) ) );
    m_options->insertSeparator();
    m_bar->insertItem( QWidget::tr("Data") ,m_edit );
    m_bar->insertItem( QWidget::tr("Category"),  m_catMenu );
    m_bar->insertItem( QWidget::tr("Options"), m_options );
    m_curQuick = new QuickEditImpl( this, m_quicktask );
    addToolBar( (QToolBar *)m_curQuick->widget(), QWidget::tr( "QuickEdit" ), QMainWindow::Top, TRUE );
    m_curQuick->signal()->connect( this, SLOT(slotQuickEntered() ) );
 }
 /* m_curCat from Config */
 void MainWindow::initConfig() {
    Config config( "todo" );
    config.setGroup( "View" );
    m_completed =  config.readBoolEntry( "ShowComplete", TRUE );
    m_curCat = config.readEntry( "Category",    QString::null );
    m_deadline =  config.readBoolEntry( "ShowDeadLine", TRUE);
    m_overdue = config.readBoolEntry("ShowOverDue", FALSE );
    m_quicktask = config.readBoolEntry("ShowQuickTask", TRUE);
 }
 void MainWindow::initUI() {
    m_stack = new OWidgetStack(this,  "main stack");
    setCentralWidget( m_stack );
    setToolBarsMovable( FALSE );
    QToolBar *menubarholder = new QToolBar( this );
    menubarholder->setHorizontalStretchable( TRUE );
    m_bar = new QMenuBar( menubarholder );
    m_tool = new QToolBar( this );
    /** QPopupMenu */
    m_edit = new QPopupMenu( this );
    m_options = new QPopupMenu( this );
    m_catMenu = new QPopupMenu( this );
    m_template = new QPopupMenu( this );
    m_catMenu->setCheckable( TRUE );
    m_template->setCheckable( TRUE );
    connect(m_catMenu, SIGNAL(activated(int) ),
            this, SLOT(setCategory(int) ) );
    connect(m_template, SIGNAL(activated(int) ),
            this, SLOT(slotNewFromTemplate(int) ) );
 }
 void MainWindow::initViews() {
    TableView* tableView = new TableView( this, m_stack );
    QWhatsThis::add( tableView, QWidget::tr( "This is a listing of all current tasks.\n\nThe list displays the following information:\n1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.\n2. Priority - a graphical representation of task priority.  Double-click here to modify.\n3. Description - description of task.  Click here to select the task.\n4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options->'Show task deadlines' from the menu above." ) );
    m_stack->addWidget( tableView,  m_counter++ );
    m_views.append( tableView );
    m_curView = tableView;
    connectBase( tableView );
    /* add QString type + QString configname to
     * the View menu
     * and subdirs for multiple views
     */
 }
 void MainWindow::initEditor() {
    m_curEdit = new Editor();
 }
 void MainWindow::initShow() {
    m_curShow = new TextViewShow(this, this);
    m_stack->addWidget( m_curShow->widget() , m_counter++ );
 }
 MainWindow::~MainWindow() {
    delete templateManager();
 }
 void MainWindow::connectBase( ViewBase* ) {
    // once templates and signals mix we'll use it again
 }
 QPopupMenu* MainWindow::contextMenu( int , bool recur ) {
    QPopupMenu* menu = new QPopupMenu();
    m_editAction->addTo( menu );
    m_deleteAction->addTo( menu );
    m_duplicateAction->addTo( menu );
    menu->insertSeparator();
    /*
     * if this event recurs we allow
     * to detach it.
     * remove all
     */
diff --git a/core/pim/todo/otaskeditor.cpp b/core/pim/todo/otaskeditor.cpp
index ab1ce94..d1e50f7 100644
--- a/core/pim/todo/otaskeditor.cpp
+++ b/core/pim/todo/otaskeditor.cpp
@@ -1,90 +1,90 @@
 #include <qlayout.h>
 #include "taskeditoroverview.h"
 #include "taskeditorstatus.h"
 #include "taskeditoralarms.h"
 #include "otaskeditor.h"
 OTaskEditor::OTaskEditor(int cur)
    : QDialog( 0, 0, TRUE, WStyle_ContextHelp ) {
    init();
    init( cur );
 }
 OTaskEditor::OTaskEditor( const OPimTodo& to)
    : QDialog( 0, 0, TRUE, WStyle_ContextHelp ) {
    init();
    init( to );
 }
 OTaskEditor::~OTaskEditor() {
 }
 void OTaskEditor::init( int cur ) {
    OPimTodo to;
    to.setUid( 1 ); // generate a new uid
    if ( cur != 0 )
        to.setCategories( cur );
    load(to);
 }
 void OTaskEditor::init( const OPimTodo& to ) {
    load( to );
 }
 OPimTodo OTaskEditor::todo()const{
    qWarning("saving!");
    OPimTodo to ( m_todo );
    m_overView->save( to );
    m_stat->save( to );
    to.setRecurrence( m_rec->recurrence() );
    m_alarm->save( to );
    return to;
 }
 void OTaskEditor::load(const OPimTodo& to) {
    m_overView->load( to );
    m_stat->load( to );
    m_rec->setRecurrence( to.recurrence(), to.hasDueDate() ? to.dueDate() : QDate::currentDate() );
    m_alarm->load( to );
    m_todo = to;
 }
 void OTaskEditor::init() {
    setCaption(tr("Task Editor") );
    QVBoxLayout* layo = new QVBoxLayout( this );
    m_tab = new OTabWidget( this );
    layo->addWidget( m_tab );
    /*
     * Add the Widgets
     */
    m_overView = new TaskEditorOverView( m_tab );
    m_tab->addTab( m_overView, "todo/info", tr("Information") );
    m_stat = new TaskEditorStatus( m_tab );
    m_tab->addTab( m_stat, "todo/TodoList", tr("Status") );
    m_alarm = new TaskEditorAlarms( m_tab );
    m_tab->addTab( m_alarm, "todo/alarm", tr("Alarms") );
 //    m_remind = new TaskEditorAlarms( m_tab );
 //    m_tab->addTab( m_remind, "todo/reminder", tr("Reminders") );
 //    QLabel* lbl = new QLabel( m_tab );
 //    lbl->setText( tr("X-Ref") );
 //    m_tab->addTab( lbl, "todo/xref", tr("X-Ref") );
    m_rec = new OPimRecurrenceWidget( true, QDate::currentDate(), this );
    m_tab->addTab( m_rec, "repeat", tr("Recurrence") );
    /* signal and slots */
    connect(m_overView, SIGNAL(recurranceEnabled(bool) ),
            m_rec, SLOT(setEnabled(bool) ) );
    /* connect due date changed to the recurrence tab */
    connect(m_stat, SIGNAL(dueDateChanged(const QDate&) ),
-            m_rec, SLOT(setStartDate(const QDate& ) ) );
+            m_rec, SLOT(setStartDate(const QDate&) ) );
    m_tab->setCurrentTab( m_overView );
 }
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp
index 5bbf880..0d298f4 100644
--- a/core/pim/todo/tableview.cpp
+++ b/core/pim/todo/tableview.cpp
@@ -23,200 +23,200 @@
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include <stdlib.h>
 #include <cmath>
 #include <cctype>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qtimer.h>
 #include <qpopupmenu.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <opie2/opimrecurrence.h>
 #include "mainwindow.h"
 //#include "tableitems.h"
 #include "tableview.h"
 using namespace Todo;
 namespace {
    static const int BoxSize = 14;
    static const int RowHeight = 20;
 }
 TableView::EditorWidget::EditorWidget() : m_wid(0l), m_row(-1), m_col(-1) {
 }
 void TableView::EditorWidget::setCellWidget(QWidget* wid, int row, int col ) {
    m_wid = wid;
    m_row = row;
    m_col = col;
 }
 void TableView::EditorWidget::releaseCellWidget() {
    m_wid = 0;
    m_row = m_col = -1;
 }
 QWidget* TableView::EditorWidget::cellWidget()const {
    return m_wid;
 }
 int TableView::EditorWidget::cellRow()const {
    return m_row;
 }
 int TableView::EditorWidget::cellCol()const {
    return m_col;
 }
 void TableView::initConfig() {
    Config config( "todo" );
    config.setGroup( "Options" );
    m_completeStrokeWidth = config.readNumEntry( "CompleteStrokeWidth", 8 );
    for (int i = 0; i < numCols(); i++ ) {
        int width = config.readNumEntry("Width"+QString::number(i), -1 );
        setColumnWidth(i, width == -1 ? columnWidth(i) : width );
    }
 }
 TableView::TableView( MainWindow* window, QWidget* wid )
    : QTable(  wid ), TodoView( window ) {
    setName("TableView");
    // Load icons
    // TODO - probably should be done globally somewhere else,
    //        see also quickeditimpl.cpp/h, taskeditoroverview.cpp/h
    m_pic_completed = Resource::loadPixmap( "todo/completed" );
    QString namestr;
    for ( unsigned int i = 1; i < 6; i++ ) {
        namestr = "todo/priority";
        namestr.append( QString::number( i ) );
        m_pic_priority[ i - 1 ] = Resource::loadPixmap( namestr );
    }
    setUpdatesEnabled( false );
    viewport()->setUpdatesEnabled( false );
    m_enablePaint = false;
    setNumRows(0);
    setNumCols(4);
    horizontalHeader()->setLabel( 0, QWidget::tr("C.") );
    horizontalHeader()->setLabel( 1, QWidget::tr("Priority") );
    horizontalHeader()->setLabel( 2, QWidget::tr("Summary" ) );
    horizontalHeader()->setLabel( 3, QWidget::tr("Deadline") );
    setShowDeadline( todoWindow()->showDeadline() );
    setSorting( TRUE );
    setSelectionMode( NoSelection );
    setLeftMargin( 0 );
    verticalHeader()->hide();
-    connect((QTable*)this, SIGNAL( clicked( int, int, int, const QPoint& ) ),
+    connect((QTable*)this, SIGNAL( clicked(int,int,int,const QPoint&) ),
-            this, SLOT( slotClicked(int, int, int, const QPoint& ) ) );
+            this, SLOT( slotClicked(int,int,int,const QPoint&) ) );
-    connect((QTable*)this, SIGNAL( pressed( int, int, int, const QPoint& ) ),
+    connect((QTable*)this, SIGNAL( pressed(int,int,int,const QPoint&) ),
-            this, SLOT( slotPressed(int, int, int, const QPoint& ) ) );
+            this, SLOT( slotPressed(int,int,int,const QPoint&) ) );
-    connect((QTable*)this, SIGNAL(valueChanged(int, int) ),
+    connect((QTable*)this, SIGNAL(valueChanged(int,int) ),
-            this, SLOT( slotValueChanged(int, int) ) );
+            this, SLOT( slotValueChanged(int,int) ) );
-    connect((QTable*)this, SIGNAL(currentChanged(int, int) ),
+    connect((QTable*)this, SIGNAL(currentChanged(int,int) ),
-            this, SLOT( slotCurrentChanged(int, int) ) );
+            this, SLOT( slotCurrentChanged(int,int) ) );
    m_menuTimer = new QTimer( this );
    connect( m_menuTimer, SIGNAL(timeout()),
             this, SLOT(slotShowMenu()) );
    /* now let's init the config */
    initConfig();
    m_enablePaint = true;
    setUpdatesEnabled( true );
    viewport()->setUpdatesEnabled( true );
    viewport()->update();
    setSortOrder( 0 );
    setAscending( TRUE );
    m_first = true;
 }
 /* a new day has started
 * update the day
 */
 void TableView::newDay() {
    clear();
    updateView();
 }
 TableView::~TableView() {
    Config config( "todo" );
    config.setGroup( "Options" );
    for (int i = 0; i < numCols(); i++ )
        config.writeEntry("Width"+QString::number(i), columnWidth(i) );
 }
 void TableView::slotShowMenu() {
    QPopupMenu *menu = todoWindow()->contextMenu( current(), sorted()[currentRow()].recurrence().doesRecur() );
    menu->exec(QCursor::pos() );
    delete menu;
 }
 QString TableView::type() const {
    return QString::fromLatin1( tr("Table View") );
 }
 int TableView::current() {
    if (numRows() == 0 ) return 0;
    int uid = sorted().uidAt(currentRow() );
    return uid;
 }
 int TableView::next() {
    if ( numRows() == 0 ) return 0;
    if ( currentRow() + 1 >= numRows() ) return 0;
    setCurrentCell( currentRow() +1, currentColumn()  );
    return sorted().uidAt( currentRow() );
 }
 int TableView::prev() {
    if ( numRows() == 0 ) return 0;
    if ( currentRow() - 1 < 0 ) return 0;
    setCurrentCell( currentRow() -1, currentColumn()  );
    return sorted().uidAt( currentRow() );
 }
 QString TableView::currentRepresentation() {
    OPimTodo to = sorted()[currentRow()];
    return to.summary().isEmpty() ? to.description().left(20) : to.summary() ;
 }
 /* show overdue */
 void TableView::showOverDue( bool ) {
    clear();
    updateView();
 }
 void TableView::updateView( ) {
    qWarning("update view");
    m_row = false;
    static int id;
    id = startTimer(4000 );
    /* FIXME we want one page to be read!
     *
     * Calculate that screensize
     */
    todoWindow()->setReadAhead( 4 );
    sort();
    OPimTodoAccess::List::Iterator it, end;
    it = sorted().begin();
    end = sorted().end();
    qWarning("setTodos");
    QTime time;
    time.start();
    m_enablePaint = false;
    setUpdatesEnabled( false );
    viewport()->setUpdatesEnabled( false );
    setNumRows( it.count() );
    if ( it.count() == 0 )
        killTimer(id);
 //    int elc = time.elapsed();
diff --git a/core/pim/todo/taskeditoralarms.cpp b/core/pim/todo/taskeditoralarms.cpp
index 930c94e..a512fb0 100644
--- a/core/pim/todo/taskeditoralarms.cpp
+++ b/core/pim/todo/taskeditoralarms.cpp
@@ -1,179 +1,179 @@
 /*
 � � � � � � � �=.            This file is part of the OPIE Project
 � � � � � � �.=l.            Copyright (c)  2002 <>
 � � � � � �.>+-=
 �_;:, � � .> � �:=|.         This program is free software; you can
 .> <`_, � > �. � <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.-- � :           the terms of the GNU General Public
 .="- .-=="i, � � .._         License as published by the Free Software
 �- . � .-<_> � � .<>         Foundation; either version 2 of the License,
 � � �._= =} � � � :          or (at your option) any later version.
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       This program is distributed in the hope that
 � � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
 � � : .. � �.:, � � . . .    without even the implied warranty of
 � � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.= � � � = � � � ;      Library General Public License for more
 ++= � -. � � .` � � .:       details.
 �: � � = �...= . :.=-
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           General Public License along with
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "taskeditoralarms.h"
 #include <opie2/opimnotifymanager.h>
 #include <opie2/otimepicker.h>
 #include <qpe/datebookmonth.h>
 #include <qpe/resource.h>
 #include <qlistview.h>
 #include <qlayout.h>
 class AlarmItem : public QListViewItem {
 public:
    AlarmItem( QListView*, const OPimAlarm& );
    ~AlarmItem();
    OPimAlarm alarm()const;
    void setAlarm( const OPimAlarm& );
 private:
    QDateTime m_dt;
    int m_type;
 };
 AlarmItem::AlarmItem( QListView* view, const OPimAlarm& dt)
    : QListViewItem(view) {
    setAlarm( dt );
 }
 void AlarmItem::setAlarm( const OPimAlarm& dt ) {
    m_dt = dt.dateTime();
    m_type = dt.sound();
    setText( 0, TimeString::dateString( m_dt.date() ) );
    setText( 1, TimeString::timeString( m_dt.time() ) );
    setText( 2, m_type == 0 ? QObject::tr("silent") : QObject::tr("loud") );
 }
 AlarmItem::~AlarmItem() {
 }
 OPimAlarm AlarmItem::alarm()const{
    OPimAlarm al( m_type, m_dt );
    return al;
 }
 TaskEditorAlarms::TaskEditorAlarms( QWidget* parent,  int, const char* name, WFlags fl )
    : QWidget( parent, name, fl )
 {
    m_date = m_type = m_time = 0;
    QGridLayout *layout = new QGridLayout( this, 2, 2, 4, 4 );
    lstAlarms = new QListView( this );
    lstAlarms->addColumn( tr("Date") );
    lstAlarms->addColumn( tr("Time") );
    lstAlarms->addColumn( tr("Type") );
-    connect( lstAlarms, SIGNAL(clicked ( QListViewItem *, const QPoint &, int  ) ),
+    connect( lstAlarms, SIGNAL(clicked(QListViewItem*,const QPoint&,int) ),
-             this, SLOT(inlineEdit(QListViewItem*, const QPoint&, int  ) ) );
+             this, SLOT(inlineEdit(QListViewItem*,const QPoint&,int) ) );
    layout->addMultiCellWidget( lstAlarms, 0, 0, 0, 2 );
    QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), this );
    //QWhatsThis::add( btn, tr( "Click here to add a new transaction." ) );
    connect( btn, SIGNAL( clicked() ), this, SLOT( slotNew() ) );
    layout->addWidget( btn, 1, 0 );
 /* use when we've reminders too */
 #if 0
    btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Edit" ), this );
    //QWhatsThis::add( btn, tr( "Select a transaction and then click here to edit it." ) );
    connect( btn, SIGNAL( clicked() ), this, SLOT( slotEdit() ) );
    layout->addWidget( btn, 1, 1 );
 #endif
    btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), this );
    //QWhatsThis::add( btn, tr( "Select a checkbook and then click here to delete it." ) );
    connect( btn, SIGNAL( clicked() ), this, SLOT( slotDelete() ) );
    layout->addWidget( btn, 1, 2 );
 }
 TaskEditorAlarms::~TaskEditorAlarms(){
 }
 void TaskEditorAlarms::slotNew(){
    (void)new AlarmItem(lstAlarms, OPimAlarm(0, QDateTime::currentDateTime() ) );
 }
 void TaskEditorAlarms::slotEdit(){
 }
 void TaskEditorAlarms::slotDelete(){
    QListViewItem* item = lstAlarms->currentItem();
    if (!item) return;
    lstAlarms->takeItem( item ); delete item;
 }
 void TaskEditorAlarms::load( const OPimTodo& todo) {
    lstAlarms->clear();
    if (!todo.hasNotifiers() ) return;
    OPimNotifyManager::Alarms als = todo.notifiers().alarms();
    if (als.isEmpty() ) return;
    OPimNotifyManager::Alarms::Iterator it = als.begin();
    for ( ; it != als.end(); ++it )
        (void)new AlarmItem( lstAlarms, (*it) );
 }
 void TaskEditorAlarms::save( OPimTodo& todo ) {
    if (lstAlarms->childCount() <= 0 ) return;
    OPimNotifyManager::Alarms alarms;
    for ( QListViewItem* item = lstAlarms->firstChild(); item; item = item->nextSibling() ) {
        AlarmItem *alItem = static_cast<AlarmItem*>(item);
        alarms.append( alItem->alarm() );
    }
    OPimNotifyManager& manager = todo.notifiers();
    manager.setAlarms( alarms );
 }
 void TaskEditorAlarms::inlineEdit( QListViewItem* alarm, const QPoint& p, int col ) {
    if (!alarm) return;
    AlarmItem* item = static_cast<AlarmItem*>(alarm);
    switch( col ) {
        // date
    case 0:
        return inlineSetDate( item, p );
        // time
    case 1:
        return inlineSetTime( item );
        // type
    case 2:
        return inlineSetType( item, p );
    }
 }
 void TaskEditorAlarms::inlineSetDate( AlarmItem* item, const QPoint& p ) {
    QPopupMenu* pop = popup( 0 );
    m_dbMonth->setDate( item->alarm().dateTime().date() );
    pop->exec(p);
    OPimAlarm al = item->alarm();
    QDateTime dt = al.dateTime();
    dt.setDate( m_dbMonth->selectedDate() );
    al.setDateTime( dt );
    item->setAlarm( al );
 }
 void TaskEditorAlarms::inlineSetType( AlarmItem* item, const QPoint& p ) {
    int type;
diff --git a/core/pim/todo/taskeditorstatus.cpp b/core/pim/todo/taskeditorstatus.cpp
index 367dd58..16351e0 100644
--- a/core/pim/todo/taskeditorstatus.cpp
+++ b/core/pim/todo/taskeditorstatus.cpp
@@ -7,226 +7,226 @@
 :`=1 )Y*s>-.-- � :           the terms of the GNU General Public
 .="- .-=="i, � � .._         License as published by the Free Software
 �- . � .-<_> � � .<>         Foundation; either version 2 of the License,
 � � �._= =} � � � :          or (at your option) any later version.
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       This program is distributed in the hope that
 � � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
 � � : .. � �.:, � � . . .    without even the implied warranty of
 � � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.= � � � = � � � ;      Library General Public License for more
 ++= � -. � � .` � � .:       details.
 �: � � = �...= . :.=-
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           General Public License along with
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "taskeditorstatus.h"
 #include <opie2/opimmaintainer.h>
 #include <opie2/opimstate.h>
 #include <qpe/datebookmonth.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qwhatsthis.h>
 // FIXME add the hack slots instead of setPopup!!!!
 // drw you shouldn't have removed them
 TaskEditorStatus::TaskEditorStatus( QWidget* parent,  const char* name, WFlags fl )
    : QWidget( parent, name, fl )
 {
    QDate curDate = QDate::currentDate();
    m_start = m_comp = m_due = curDate;
    QString curDateStr = TimeString::longDateString( curDate );
    QVBoxLayout *vb = new QVBoxLayout( this );
    QScrollView *sv = new QScrollView( this );
    vb->addWidget( sv );
    sv->setResizePolicy( QScrollView::AutoOneFit );
    sv->setFrameStyle( QFrame::NoFrame );
    QWidget *container = new QWidget( sv->viewport() );
    sv->addChild( container );
    QGridLayout *layout = new QGridLayout( container, 7, 3, 4, 4 );
    // Status
    QLabel *label = new QLabel( tr( "Status:" ), container );
    layout->addWidget( label, 0, 0 );
    QWhatsThis::add( label, tr( "Click here to set the current status of this task." ) );
    cmbStatus = new QComboBox( FALSE, container );
    cmbStatus->insertItem( tr( "Started" ) );
    cmbStatus->insertItem( tr( "Postponed" ) );
    cmbStatus->insertItem( tr( "Finished" ) );
    cmbStatus->insertItem( tr( "Not started" ) );
    layout->addMultiCellWidget( cmbStatus, 0, 0, 1, 2 );
    QWhatsThis::add( cmbStatus, tr( "Click here to set the current status of this task." ) );
    // Progress
    label = new QLabel( tr( "Progress:" ), container );
    layout->addWidget( label, 1, 0 );
    QWhatsThis::add( label, tr( "Select progress made on this task here." ) );
    cmbProgress = new QComboBox( FALSE, container );
    cmbProgress->insertItem( tr( "0 %" ) );
    cmbProgress->insertItem( tr( "20 %" ) );
    cmbProgress->insertItem( tr( "40 %" ) );
    cmbProgress->insertItem( tr( "60 %" ) );
    cmbProgress->insertItem( tr( "80 %" ) );
    cmbProgress->insertItem( tr( "100 %" ) );
    layout->addMultiCellWidget( cmbProgress, 1, 1, 1, 2 );
    QWhatsThis::add( cmbProgress, tr( "Select progress made on this task here." ) );
    // Start date
    ckbStart = new QCheckBox( tr( "Start Date:" ), container );
    layout->addWidget( ckbStart, 2, 0 );
    QWhatsThis::add( ckbStart, tr( "Click here to set the date this task was started." ) );
    connect( ckbStart, SIGNAL( clicked() ), this, SLOT( slotStartChecked() ) );
    btnStart = new QPushButton( curDateStr, container );
    btnStart->setEnabled( FALSE );
    layout->addMultiCellWidget( btnStart, 2, 2, 1, 2 );
    QWhatsThis::add( btnStart, tr( "Click here to set the date this task was started." ) );
    QPopupMenu *popup = new QPopupMenu( this );
    m_startBook = new DateBookMonth( popup, 0, TRUE );
    popup->insertItem( m_startBook );
    btnStart->setPopup( popup );
-    connect( m_startBook, SIGNAL( dateClicked( int, int, int ) ),
+    connect( m_startBook, SIGNAL( dateClicked(int,int,int) ),
-             this, SLOT( slotStartChanged( int, int, int ) ) );
+             this, SLOT( slotStartChanged(int,int,int) ) );
    // Due date
    ckbDue = new QCheckBox( tr( "Due Date:" ), container );
    layout->addWidget( ckbDue, 3, 0 );
    QWhatsThis::add( ckbDue, tr( "Click here to set the date this task needs to be completed by." ) );
    connect( ckbDue, SIGNAL( clicked() ), this, SLOT( slotDueChecked() ) );
    btnDue = new QPushButton( curDateStr, container );
    btnDue->setEnabled( FALSE );
    layout->addMultiCellWidget( btnDue, 3, 3, 1, 2 );
    QWhatsThis::add( btnDue, tr( "Click here to set the date this task needs to be completed by." ) );
    popup = new QPopupMenu( this );
    m_dueBook = new DateBookMonth( popup, 0, TRUE );
    popup->insertItem( m_dueBook );
    btnDue->setPopup( popup );
-    connect( m_dueBook, SIGNAL( dateClicked( int, int, int ) ),
+    connect( m_dueBook, SIGNAL( dateClicked(int,int,int) ),
-             this, SLOT( slotDueChanged( int, int, int ) ) );
+             this, SLOT( slotDueChanged(int,int,int) ) );
    // Completed
    ckbComp = new QCheckBox( tr( "Completed:" ), container );
    layout->addWidget( ckbComp, 4, 0 );
    QWhatsThis::add( ckbComp, tr( "Click here to mark this task as completed." ) );
    connect( ckbComp, SIGNAL( clicked() ), this, SLOT( slotCompChecked() ) );
    btnComp = new QPushButton( curDateStr, container );
    btnComp->setEnabled( FALSE );
    layout->addMultiCellWidget( btnComp, 4, 4, 1, 2 );
    QWhatsThis::add( btnComp, tr( "Click here to set the date this task was completed." ) );
    popup = new QPopupMenu( this );
    m_compBook = new DateBookMonth( popup, 0, TRUE );
    popup->insertItem( m_compBook );
    btnComp->setPopup( popup );
-    connect( m_compBook, SIGNAL( dateClicked( int, int, int ) ),
+    connect( m_compBook, SIGNAL( dateClicked(int,int,int) ),
-             this, SLOT( slotCompChanged( int, int, int ) ) );
+             this, SLOT( slotCompChanged(int,int,int) ) );
    QSpacerItem *spacer = new QSpacerItem( 5, 5, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding );
    layout->addItem( spacer, 5, 0 );
    // Maintainer mode
 #if 0
    label = new QLabel( tr( "Maintainer Mode:" ), container );
    layout->addWidget( label, 6, 0 );
    QWhatsThis::add( label, tr( "Click here to set the maintainer's role." ) );
    cmbMaintMode = new QComboBox( FALSE, container );
    cmbMaintMode->insertItem( tr( "Nothing" ) );
    cmbMaintMode->insertItem( tr( "Responsible" ) );
    cmbMaintMode->insertItem( tr( "Done By" ) );
    cmbMaintMode->insertItem( tr( "Coordinating" ) );
 //    layout->addMultiCellWidget( cmbMaintMode, 6, 6, 1, 2 );
    QWhatsThis::add( cmbMaintMode, tr( "Click here to set the maintainer's role." ) );
    // Maintainer
    label = new QLabel( tr( "Maintainer:" ), container );
    layout->addWidget( label, 7, 0 );
    QWhatsThis::add( label, tr( "This is the name of the current task maintainer." ) );
    txtMaintainer = new QLabel( tr( "test" ), container );
    txtMaintainer->setTextFormat( QLabel::RichText );
    layout->addWidget( txtMaintainer, 7, 1 );
    QWhatsThis::add( txtMaintainer, tr( "This is the name of the current task maintainer." ) );
    tbtMaintainer = new QToolButton( container );
    tbtMaintainer->setPixmap( Resource::loadPixmap( "todo/more" ) );
 //    layout->addWidget( tbtMaintainer, 7, 2 );
    QWhatsThis::add( tbtMaintainer, tr( "Click here to select the task maintainer." ) );
 #endif
 }
 TaskEditorStatus::~TaskEditorStatus()
 {
 }
 void TaskEditorStatus::load( const OPimTodo &todo )
 {
    QDate date = QDate::currentDate();
    QString str = TimeString::longDateString( date );
    // Status
    int state = todo.hasState()? todo.state().state() : OPimState::NotStarted;
    if ( state == OPimState::Undefined )
        state = OPimState::NotStarted;
    cmbStatus->setCurrentItem( state );
    // Progress
    cmbProgress->setCurrentItem( todo.progress() / 20 );
    // Start date
    ckbStart->setChecked( todo.hasStartDate() );
    btnStart->setEnabled( todo.hasStartDate() );
    if ( todo.hasStartDate() )
    {
        m_start = todo.startDate();
        btnStart->setText( TimeString::longDateString( m_start ) );
    }
    else
        btnStart->setText( str );
    // Due date
    ckbDue->setChecked( todo.hasDueDate() );
    btnDue->setText( TimeString::longDateString( todo.dueDate() ) );
    btnDue->setEnabled( todo.hasDueDate() );
    m_due = todo.dueDate();
    // Completed
    ckbComp->setChecked( todo.isCompleted() );
    btnComp->setEnabled( todo.hasCompletedDate() );
    if ( todo.hasCompletedDate() )
    {
        m_comp = todo.completedDate();
        btnComp->setText( TimeString::longDateString( m_comp ) );
    }
    else
        btnComp->setText( str );
    // Maintainer Mode
 #if 0
    state = todo.hasMaintainer() ? todo.maintainer().mode() : OPimMaintainer::Nothing;
    if ( state == OPimMaintainer::Undefined )
        state = OPimMaintainer::Nothing;
    cmbMaintMode->setCurrentItem( state );
 #endif
    // Maintainer - not implemented yet
 }
 void TaskEditorStatus::save( OPimTodo &todo )
 {
    QDate inval;
    // Status
    todo.setState( OPimState( cmbStatus->currentItem() ) );
    // Progress
author	alwin <alwin>	2004-03-02 12:14:15 (UTC)
committer	alwin <alwin>	2004-03-02 12:14:15 (UTC)
commit	0d59c780513da78033f4d9040475dee9db0256d4 (patch) (unidiff)
tree	503d320b4aa3daae9982082e7b34e3e2c48bdfb7 /core/pim
parent	a0981652d61776d70f25980f035748b21339e946 (diff)
download	opie-0d59c780513da78033f4d9040475dee9db0256d4.zip opie-0d59c780513da78033f4d9040475dee9db0256d4.tar.gz opie-0d59c780513da78033f4d9040475dee9db0256d4.tar.bz2