fix includes

34 files changed, 1 insertions, 123 deletions

diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 1914f71..076e2e0 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -1,147 +1,144 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** 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.
 **
 ** 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 "ablabel.h"
 
-#include <qpe/stringutil.h>
 
-#include <qregexp.h>
-#include <qstylesheet.h>
 
 AbLabel::AbLabel( QWidget *parent, const char *name ):
         QTextView( parent, name ),
         m_empty( false )
 {
 }
 
 AbLabel::~AbLabel()
 {
 }
 
 void AbLabel::setContacts( const OContactAccess::List& viewList )
 {
         m_viewList = viewList;
         if (m_viewList.count() != 0){
                 m_empty = false;
                 m_itCurContact = m_viewList.begin();
                 sync();
         }else{
                 // m_itCurContact.clear();
                 m_empty = true;
                 setText( "" );
         }
 }
 
 int AbLabel::currentEntry_UID()
 {
         OContact contact = currentEntry();
 
         if ( contact.isEmpty() )
                 return 0;
         else
                 return ( contact.uid() );
 }
 
 OContact AbLabel::currentEntry()
 {
         if ( ! m_empty )
                 return ( *m_itCurContact );
         else
                 return OContact();
 }
 
 
 bool AbLabel::selectContact( int UID )
 {
 
         for ( int r = 0; r < m_viewList.count(); ++r ) {
                 if ( m_viewList.uidAt( r ) == UID ){
                         m_itCurContact.setCurrent( r );
                         break;
                 }
         }
 
         sync();
 
         return true;
 }
 
 
 
 void AbLabel::sync()
 {
     QString text = (*m_itCurContact).toRichText();
     setText( text );
 }
 
 void AbLabel::keyPressEvent( QKeyEvent *e )
 {
 
         // Commonly handled keys
         if ( !m_empty ){
                 switch( e->key() ) {
                 case Qt::Key_Left:
                         qWarning( "Left..");
                 case Qt::Key_Right:
                         qWarning( "Right..");
                 case Qt::Key_F33:
                         qWarning( "OK..");
                         emit signalOkPressed();
                         break;
                 case Qt::Key_Up:
                         qWarning( "UP..");
                         if ( ( visibleHeight() < contentsHeight() ) &&
                              ( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) )
                                 scrollBy( 0, -(visibleHeight()-20) );
                         else {
                                 --m_itCurContact;
                                 if ( *m_itCurContact != OContact() )
                                         sync();
                                 else
                                         m_itCurContact = m_viewList.end();
                         }
 
                         break;
                 case Qt::Key_Down:
                         qWarning( "DOWN..");
         //              qWarning( "visible: %d, content: %d",visibleHeight(),contentsHeight()); 
         //              qWarning( "value: %d; barMaxValue: %d", verticalScrollBar()->value()
         //                        , verticalScrollBar()->maxValue() );
                         if ( ( visibleHeight() < contentsHeight() ) &&
                              ( verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) )
                                 scrollBy( 0, visibleHeight()-20 );
                         else {
                                 ++m_itCurContact;
                                 if ( *m_itCurContact != OContact() )
                                         sync();
                                 else
                                         m_itCurContact = m_viewList.begin();
                         }
                         break;
                 case Qt::Key_Return: // fall through
                 case Qt::Key_Space: // fall through
                 case Qt::Key_Enter: // we want to switch back
                         emit signalOkPressed();
                         break;
                 default: break;
                 }
         }
 
 }
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 70330c7..f7bff58 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -1,420 +1,411 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 ** 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.
 **
 ** 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 <qpe/categoryselect.h>
-#include <qpe/config.h>
-#include <qpe/stringutil.h>
-#include <qpe/qcopenvelope_qws.h>
 #include <qpe/timestring.h>
 #include <qpe/resource.h>
 
 #include <opie/orecordlist.h>
 
-#include <qasciidict.h>
-#include <qdatetime.h>
-#include <qfile.h>
-#include <qregexp.h>
-#include <qmessagebox.h>
 
 #include "abtable.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #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 &)),
                  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 );
         contactList.insert( ati, cnt );
         setItem( row, 0, ati );
         ati = new AbTableItem( this, QTableItem::Never, contactItem.value, strName);
         if ( !contactItem.icon.isNull() )
                 ati->setPixmap( contactItem.icon );
         setItem( row, 1, ati );
         
         //### cannot do this; table only has two columns at this point
         //    setItem( row, 2, new AbPickItem( this ) );
         
 }
 #endif
 
 
 void AbTable::columnClicked( int col )
 {
         if ( !sorting() )
                 return;
         
         if ( lastSortCol == -1 )
                 lastSortCol = col;
         
         if ( col == lastSortCol ) {
                 asc = !asc;
         } else {
                 lastSortCol = col;
                 asc = TRUE;
         }
         //QMessageBox::information( this, "resort", "columnClicked" );
         resort();
 }
 
 void AbTable::resort()
 {
         qWarning( "void AbTable::resort() NOT POSSIBLE !!" );
 #if 0
         setPaintingEnabled( FALSE );
         if ( sorting() ) {
                 if ( lastSortCol == -1 )
                         lastSortCol = 0;
                 sortColumn( lastSortCol, asc, TRUE );
                 //QMessageBox::information( this, "resort", "resort" );
                 updateVisible();
         }
         setPaintingEnabled( TRUE );
 #endif
 }
 
 OContact AbTable::currentEntry()
         {
         return m_viewList[currentRow()];
 }
 
 int AbTable::currentEntry_UID()
 {
         return ( currentEntry().uid() );
 }
 
 void AbTable::clear()
 {
         qWarning( "void AbTable::clear()" );
         // contactList.clear();
 
         setPaintingEnabled( FALSE );
         for ( int r = 0; r < numRows(); ++r ) {
                 for ( int c = 0; c < numCols(); ++c ) {
                         if ( cellWidget( r, c ) )
                                 clearCellWidget( r, c );
                         clearCell( r, c );
                 }
         }
         setNumRows( 0 );
         setPaintingEnabled( TRUE );
 }
 
 // Refresh updates column 2 if the contactsettings changed
 void AbTable::refresh()
 {
         qWarning( "void AbTable::refresh() NOT IMPLEMENTED !!" );
 
 #if 0
         int rows = numRows();
         AbTableItem *abi;
         ContactItem contactItem;
 
         setPaintingEnabled( FALSE );
         for ( int r = 0; r < rows; ++r ) {
                 abi = static_cast<AbTableItem*>( item(r, 0) );
                 contactItem = findContactContact( contactList[abi], r );
                 static_cast<AbTableItem*>( item(r, 1) )->setItem( contactItem.value, abi->text() );
                 if ( !contactItem.icon.isNull() ){
                         static_cast<AbTableItem*>( item(r, 1) )->
                                 setPixmap( contactItem.icon );
                 }else{
                         static_cast<AbTableItem*>( item(r, 1) )->
                                 setPixmap( QPixmap() );
                 }
         }
         resort();
         setPaintingEnabled( TRUE );
 
 #endif
 }
 
 void AbTable::keyPressEvent( QKeyEvent *e )
 {
         char key = toupper( e->ascii() );
         
         if ( key >= 'A' && key <= 'Z' )
                 moveTo( key );
         
                 //qWarning("Received key ..");
         switch( e->key() ) {
         case Qt::Key_Space:
         case Qt::Key_Return:
         case Qt::Key_Enter:
                 emit signalSwitch();
                 break;
         // case Qt::Key_Up:
         //      qWarning("a");
         //      emit signalKeyUp();
         //      break;
         // case Qt::Key_Down:
         //      qWarning("b");
         //      emit signalKeyDown();
         //      break;
         default:
                 QTable::keyPressEvent( e );
         }
                 
 }
 
 void AbTable::moveTo( char c )
 {
         qWarning( "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" );
         
 #if 0
         int rows = numRows();
         QString value;
         AbTableItem *abi;
         int r;
         if ( asc ) {
                 r = 0;
                 while ( r < rows-1) {
                         abi = static_cast<AbTableItem*>( item(r, 0) );
                         QChar first = abi->key()[0];
                         //### is there a bug in QChar to char comparison???
                         if ( first.row() || first.cell() >= c )
                                 break;
                         r++;
                 }
         } else {
                 //### should probably disable reverse sorting instead
                 r = rows - 1;
                 while ( r > 0 ) {
                         abi = static_cast<AbTableItem*>( item(r, 0) );
                         QChar first = abi->key()[0];
                         //### is there a bug in QChar to char comparison???
                         if ( first.row() || first.cell() >= c )
                                 break;
                         r--;
                 }
         }
         setCurrentCell( r, currentColumn() );
 
 #endif
 }
 
 #if 0
 // Useless.. Nobody uses it .. (se)
 QString AbTable::findContactName( const OContact &entry )
 {
         // We use the fileAs, then company, defaultEmail
         QString str;
         str = entry.fileAs();
         if ( str.isEmpty() ) {
                 str = entry.company();
                 if ( str.isEmpty() ) {
                         str = entry.defaultEmail();
                 }
         }
         return str;
 }
 #endif
 
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 1c7ddd4..9cf55b3 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -1,442 +1,426 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 ** Copyright (C) 2003 Stefan Eilers (eilers.stefan@epost.de)
 **
 ** This file is part of the Open Palmtop Environment (see www.opie.info).
 **
 ** 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.
 **
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_FD
 
-#include "contacteditor.h"
-#include "ablabel.h"
-#include "abview.h"
-#include "abtable.h"
 // #include "addresssettings.h"
 #include "addressbook.h"
 
 
 #include <opie/ofileselector.h>
 #include <opie/ofiledialog.h>
 #include <opie/ocontact.h>
 #include <opie/ocontactaccessbackend_vcard.h>
 
 #include <qpe/resource.h>
 #include <qpe/ir.h>
 #include <qpe/qpemessagebox.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qtoolbar.h>
 #include <qmenubar.h>
 // #include <qtoolbar.h>
 // #include <qmenubar.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/config.h>
 
 #include <qaction.h>
-#include <qdialog.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qimage.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
-#include <qpixmap.h>
-#include <qpopupmenu.h>
-#include <qstringlist.h>
 #include <qtoolbutton.h>
-#include <qwhatsthis.h>
-#include <qdatetime.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 &)),
                  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( ) ),
                  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 ) ),
                  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 &) ),
         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() );
 
         if ( filename.find(".vcf") != int(filename.length()) - 4 ){
 
 
 
                 switch( QMessageBox::information( this, tr ( "Right file type ?" ),
                                                   tr( "The selected file \n does not end with \".vcf\".\n Do you really want to open it?" ),
                                                   tr( "&Yes" ), tr( "&No" ), QString::null,
                                                   0,      // Enter == button 0
                                                   2 ) ) { // Escape == button 2
                 case 0:
                         qWarning("YES clicked");
                         break;
                 case 1:
                         qWarning("NO clicked");
                         return;
                         break;
                 }
         }
 
         OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null,
                                                                          filename );
         OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true );
         OContactAccess::List allList = access->allRecords();
         qWarning( "Found number of contacts in File: %d", allList.count() );
 
         if ( !allList.count() ) {
                 QMessageBox::information( this, "Import VCard",
                                           "It was impossible to import\nthe VCard.\n"
                                           "The VCard may be corrupted!" );
         }
 
         bool doAsk = true;
         OContactAccess::List::Iterator it;
         for ( it = allList.begin(); it != allList.end(); ++it ){
                 qWarning("Adding Contact from: %s", (*it).fullName().latin1() );
                 if ( doAsk ){
                         switch( QMessageBox::information( this, tr ( "Add Contact?" ),
                                                           tr( "Do you really want add contact for \n%1?" )
                                                           .arg( (*it).fullName().latin1() ),
                                                           tr( "&Yes" ), tr( "&No" ), tr( "&All Yes"),
                                                           0,      // Enter == button 0
                                                           2 ) ) { // Escape == button 2
                         case 0:
                                 qWarning("YES clicked");
                                 m_abView->addEntry( *it );
                                 break;
                         case 1:
                                 qWarning("NO clicked");
                                 break;
                         case 2:
                                 qWarning("YesAll clicked");
                                 doAsk = false;
                                 break;
                         }
                 }else
                         m_abView->addEntry( *it );
 
         }
 
         delete access;
 }
 
 void AddressbookWindow::resizeEvent( QResizeEvent *e )
 {
         QMainWindow::resizeEvent( e );
 
 
 }
 
 AddressbookWindow::~AddressbookWindow()
 {
         ToolBarDock dock;
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index 981f5e0..dee0f11 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -1,154 +1,153 @@
 #include "configdlg.h"
 
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
-#include <qiconset.h> 
 
 #include <qpe/resource.h>
 
 #include <opie/ocontact.h>
 #include "opie/ocontactfields.h"
 
 ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
         ConfigDlg_Base(parent, name, true )
 {
         contFields = OContactFields::trfields();
 
         // We add all Fields into the Listbox
         for (uint i=0; i < contFields.count(); i++) {
                 allFieldListBox->insertItem( contFields[i] );
         }
 
         // Reset Widget Flags: This was not changeable by designer :(
                 setWFlags ( WStyle_ContextHelp );
 
         // Set Pics to Buttons and Tabs
         m_upButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/up" ) ) );
         m_downButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/down" ) ) );
         m_addButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/add" ) ) );
         m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) );
         
 
         // Get the translation maps between Field ID and translated strings
         m_mapStrToID = OContactFields::trFieldsToId();
         m_mapIDToStr = OContactFields::idToTrFields();
 
         connect ( m_addButton, SIGNAL( clicked() ), this, SLOT( slotItemAdd() ) );
         connect ( m_removeButton, SIGNAL( clicked() ), this, SLOT( slotItemRemove() ) );
         connect ( m_upButton, SIGNAL( clicked() ), this, SLOT( slotItemUp() ) );
         connect ( m_downButton, SIGNAL( clicked() ), this, SLOT( slotItemDown() ) );
 }
 
 void ConfigDlg::slotItemUp()
 {
         qWarning( "void ConfigDlg::slotItemUp()" );
 
         int i = fieldListBox->currentItem();
         if ( i > 0 ) {
                 QString item = fieldListBox->currentText();
                 fieldListBox->removeItem( i );
                 fieldListBox->insertItem( item, i-1 );
                 fieldListBox->setCurrentItem( i-1 );
         }
 
 }
 
 void ConfigDlg::slotItemDown()
 {
         qWarning( "void ConfigDlg::slotItemDown()" );
 
         int i = fieldListBox->currentItem();
         if ( i < (int)fieldListBox->count() - 1 ) {
                 QString item = fieldListBox->currentText();
                 fieldListBox->removeItem( i );
                 fieldListBox->insertItem( item, i+1 );
                 fieldListBox->setCurrentItem( i+1 );
         }
 }
 
 void ConfigDlg::slotItemAdd()
 {
         qWarning( "void ConfigDlg::slotItemAdd()" );
 
         int i = allFieldListBox->currentItem();
         if ( i > 0 ) {
                 QString item = allFieldListBox->currentText();
                 qWarning("ADding %s", item.latin1());
                 fieldListBox->insertItem( item );
                 }
 }
 
 void ConfigDlg::slotItemRemove()
 {
         qWarning( "void ConfigDlg::slotItemRemove()" );
 
         int i = fieldListBox->currentItem();
         if ( i > 0 ) {
                 fieldListBox->removeItem( i );
                 }
 }
     
 void ConfigDlg::setConfig( const AbConfig& cnf )
 { 
         m_config = cnf; 
 
         m_useRegExp->setChecked( m_config.useRegExp() );
         m_useWildCard->setChecked( m_config.useWildCards() );
         m_useQtMail->setChecked( m_config.useQtMail() );
         m_useOpieMail->setChecked( m_config.useOpieMail() );
         m_useCaseSensitive->setChecked( m_config.beCaseSensitive() );
 
         switch( m_config.fontSize() ){
         case 0:
                 m_smallFont->setChecked( true );
                 m_normalFont->setChecked( false );
                 m_largeFont->setChecked( false );
                 break;
         case 1: 
                 m_smallFont->setChecked( false );
                 m_normalFont->setChecked( true );
                 m_largeFont->setChecked( false );
                 break;
         case 2: 
                 m_smallFont->setChecked( false );
                 m_normalFont->setChecked( false );
                 m_largeFont->setChecked( true );
                 break;
         }
 
         for( uint i = 0; i < m_config.orderList().count(); i++ ) {
                 fieldListBox -> insertItem ( m_mapIDToStr[ m_config.orderList()[i] ] );
         }
 
         m_fixedBars->setChecked( m_config.fixedBars() );
         m_moveBars->setChecked( !m_config.fixedBars() );
 }
     
 AbConfig ConfigDlg::getConfig()
 { 
         m_config.setUseRegExp( m_useRegExp->isOn() );
         m_config.setUseWildCards( m_useWildCard->isOn() );
         m_config.setUseQtMail( m_useQtMail->isOn() );
         m_config.setUseOpieMail( m_useOpieMail->isOn() );
         m_config.setBeCaseSensitive( m_useCaseSensitive->isChecked() );
 
         if ( m_smallFont->isChecked() )
                 m_config.setFontSize( 0 );
         if ( m_normalFont->isChecked() )
                 m_config.setFontSize( 1 );
         if ( m_largeFont->isChecked() )
                 m_config.setFontSize( 2 );
 
         QValueList<int> orderlist;
         for( int i = 0; i < (int)fieldListBox->count(); i++ ) {
                 orderlist.append( m_mapStrToID[ fieldListBox->text(i) ] );
         }
         m_config.setOrderList( orderlist );
 
         m_config.setFixedBars( m_fixedBars->isChecked() );
 
         return m_config;
 }
 
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 7932781..b1eb042 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -1,431 +1,420 @@
 /*
  * Copyright (c) 2002 Michael R. Crawford <mike@tuxnami.org>
  * Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de)
  *
  * This file is an add-on for the OPIE 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 pacakaging
  * 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.
  *
  *
  * This is a rewrite of the abeditor.h file, modified to provide a more
  * intuitive interface to TrollTech's original Address Book editor.  This
  * is made to operate exactly in interface with the exception of name.
  *
  */
 
 #include "contacteditor.h"
-#include "addresspicker.h"
 
 #include <qpe/categoryselect.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpedialog.h>
-#include <qpe/timeconversion.h>
 #include <opie/ocontact.h>
 #include <qpe/resource.h>
 
-#include <qcombobox.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
-#include <qscrollview.h>
 #include <qtoolbutton.h>
-#include <qpushbutton.h>
-#include <qmainwindow.h>
-#include <qvaluelist.h>
-#include <qpopupmenu.h> 
 #include <qlistbox.h> 
-#include <qhbox.h>
-#include <qaction.h>
-#include <qiconset.h> 
 #include <qmessagebox.h> 
 #include <qwhatsthis.h>
 
 #include <assert.h>
 
 static inline bool containsAlphaNum( const QString &str );
 static inline bool constainsWhiteSpace( const QString &str );
 
 // helper functions, convert our comma delimited list to proper
 // file format...
 void parseEmailFrom( const QString &txt, QString &strDefaultEmail,
                      QString &strAll );
 
 // helper convert from file format to comma delimited...
 void parseEmailTo( const QString &strDefaultEmail,
                    const QString &strOtherEmail, QString &strBack );
 
         ContactEditor::ContactEditor(const OContact &entry,
                                 QWidget *parent,
                                 const char *name,
                                 WFlags )
         : QDialog( parent, name, TRUE, WStyle_ContextHelp ),
           defaultEmailChooserPosition( -1 ),
           m_personalView ( false ),
           cmbDefaultEmail( 0 ),
           initializing ( false )
 {
 
         initializing = true;
 
         init();
         setEntry( entry );
         // cmbDefaultEmail = 0;
         // defaultEmailChooserPosition = -1;
 
         initializing = false;
 }
 
 ContactEditor::~ContactEditor() {
 }
 
 void ContactEditor::init() {
         qWarning("init() START");
         
         uint i = 0;
 
         QStringList trlChooserNames;
 
         for (i = 0; i <= 6; i++) {
                 slHomeAddress.append( "" );
                 slBusinessAddress.append( "" );
         }
 
         trlChooserNames   = OContactFields::trphonefields( false );
         slChooserNames    = OContactFields::untrphonefields( false );
         slDynamicEntries  = OContactFields::untrdetailsfields( false );
         trlDynamicEntries = OContactFields::trdetailsfields( false );
 
         // Ok, we have to remove elements from the list of dynamic entries
         // which are now stored in special (not dynamic) widgets..
         // Otherwise we will get problems with field assignments! (se)
         slDynamicEntries.remove("Anniversary");
         slDynamicEntries.remove("Birthday");
         slDynamicEntries.remove("Gender");
 
         // The same with translated fields.. But I will
         // use the translation map to avoid mismatches..
         QMap<int, QString> translMap = OContactFields::idToTrFields();
         trlDynamicEntries.remove( translMap[Qtopia::Anniversary] );
         trlDynamicEntries.remove( translMap[Qtopia::Birthday] );
         trlDynamicEntries.remove( translMap[Qtopia::Gender] );
 
         // Last Check to be sure..
         assert( slDynamicEntries.count() == trlDynamicEntries.count() );
         assert( slChooserNames.count() == trlChooserNames.count() );
 
         for (i = 0; i < slChooserNames.count(); i++)
           slChooserValues.append("");
 
 
         QVBoxLayout *vb = new QVBoxLayout( this );
 
         tabMain = new QTabWidget( this );
         vb->addWidget( tabMain );
 
         QWidget *tabViewport = new QWidget ( tabMain );
 
         vb = new QVBoxLayout( tabViewport );
 
         svGeneral = new QScrollView( tabViewport );
         vb->addWidget( svGeneral, 0, 0 );
         svGeneral->setResizePolicy( QScrollView::AutoOneFit );
         // svGeneral->setHScrollBarMode( QScrollView::AlwaysOff );
         // svGeneral->setVScrollBarMode( QScrollView::AlwaysOff );
         svGeneral->setFrameStyle( QFrame::NoFrame );
 
         QWidget *container = new QWidget( svGeneral->viewport() );
         svGeneral->addChild( container );
 
         QGridLayout *gl = new QGridLayout( container, 1, 1, 2, 4 );
         gl->setResizeMode( QLayout::FreeResize );
 
         btnFullName = new QPushButton( tr( "Full Name..." ), container );
         QWhatsThis::add( btnFullName, tr( "Press to enter last- middle and firstname" ) );
         gl->addWidget( btnFullName, 0, 0 );
         txtFullName = new QLineEdit( container );
         QWhatsThis::add( txtFullName, tr( "Enter fullname directly ! If you have a lastname with multiple words ( for instance \"de la Guerra\"), please write <lastname>,<firstnames> like this: \"de la Guerra, Carlos Pedro\"" ) );
         gl->addWidget( txtFullName, 0, 1 );
 
         QLabel *l = new QLabel( tr( "Job Title" ), container );
         QWhatsThis::add( l, tr( "The jobtitle.." ) );
         gl->addWidget( l, 1, 0 );
         txtJobTitle = new QLineEdit( container );
         QWhatsThis::add( txtJobTitle, tr( "The jobtitle.." ) );
         gl->addWidget( txtJobTitle, 1, 1 );
 
         l = new QLabel( tr("Suffix"), container );
         QWhatsThis::add( l, tr( "Something like \"jr.\".." ) );
         gl->addWidget( l, 2, 0 );
         txtSuffix = new QLineEdit( container );
         QWhatsThis::add( txtSuffix, tr( "Something like \"jr.\".." ) );
         gl->addWidget( txtSuffix, 2, 1 );
 
         l = new QLabel( tr( "Organization" ), container );
         QWhatsThis::add( l, tr( "The working place of the contact" ) );
         gl->addWidget( l, 3, 0 );
         txtOrganization = new QLineEdit( container );
         QWhatsThis::add( txtOrganization, tr( "The working place of the contact" ) );
         gl->addWidget( txtOrganization, 3, 1 );
 
         // Chooser 1 
         cmbChooserField1 = new QComboBox( FALSE, container );
         QWhatsThis::add( cmbChooserField1, tr( "Press to select attribute to change" ) );
         cmbChooserField1->setMaximumWidth( 90 );
         gl->addWidget( cmbChooserField1, 4, 0 );
         // Textfield for chooser 1.
         // Now use Widgetstack to contain the textfield and the default-email combo !
         m_widgetStack1 = new QWidgetStack( container );
         txtChooserField1 = new QLineEdit( m_widgetStack1 );
         m_widgetStack1 -> addWidget( txtChooserField1, TextField );
         gl->addWidget( m_widgetStack1, 4, 1 );
         m_widgetStack1 -> raiseWidget( TextField );
 
         // Chooser 2
         cmbChooserField2 = new QComboBox( FALSE, container );
         QWhatsThis::add( cmbChooserField2, tr( "Press to select attribute to change" ) );
         cmbChooserField2->setMaximumWidth( 90 );
         gl->addWidget( cmbChooserField2, 5, 0 );
         // Textfield for chooser 2
         // Now use WidgetStack to contain the textfield and the default-email combo!
         m_widgetStack2 = new QWidgetStack( container );
         txtChooserField2 = new QLineEdit( m_widgetStack2 );
         m_widgetStack2 -> addWidget( txtChooserField2, TextField );
         gl->addWidget( m_widgetStack2, 5, 1 );
         m_widgetStack2 -> raiseWidget( TextField );
 
         // Chooser 3
         cmbChooserField3 = new QComboBox( FALSE, container );
         QWhatsThis::add( cmbChooserField3, tr( "Press to select attribute to change" ) );
         cmbChooserField3->setMaximumWidth( 90 );
         gl->addWidget( cmbChooserField3, 6, 0 );
         // Textfield for chooser 2
         // Now use WidgetStack to contain the textfield and the default-email combo!
         m_widgetStack3 = new QWidgetStack( container );
         txtChooserField3 = new QLineEdit( m_widgetStack3 );
         m_widgetStack3 -> addWidget( txtChooserField3, TextField );
         gl->addWidget( m_widgetStack3, 6, 1 );
         m_widgetStack3 -> raiseWidget( TextField );
 
         l = new QLabel( tr( "File As" ), container );
         QWhatsThis::add( l, tr( "Press to select how to store the name (and howto show it in the listview)" ) );
         gl->addWidget( l, 7, 0 );
         cmbFileAs = new QComboBox( TRUE, container );
         gl->addWidget( cmbFileAs, 7, 1 );
 
         labCat = new QLabel( tr( "Category" ), container );
         gl->addWidget( labCat, 8, 0 );
         cmbCat = new CategorySelect( container );
         gl->addWidget( cmbCat, 8, 1 );
         labCat->show();
         cmbCat->show();
 
         btnNote = new QPushButton( tr( "Notes..." ), container );
         gl->addWidget( btnNote, 9, 1 );
 
         tabMain->insertTab( tabViewport, tr( "General" ) );
 
         tabViewport = new QWidget ( tabMain );
 
         vb = new QVBoxLayout( tabViewport );
 
         svAddress = new QScrollView( tabViewport );
         vb->addWidget( svAddress, 0, 0 );
         svAddress->setResizePolicy( QScrollView::AutoOneFit );
         svAddress->setFrameStyle( QFrame::NoFrame );
 
         container = new QWidget( svAddress->viewport() );
         svAddress->addChild( container );
 
         gl = new QGridLayout( container, 8, 3, 2, 4 ); // row 7 QSpacerItem
 
         cmbAddress = new QComboBox( FALSE, container );
         cmbAddress->insertItem( tr( "Business" ) );
         cmbAddress->insertItem( tr( "Home" ) );
         gl->addMultiCellWidget( cmbAddress, 0, 0, 0, 1 );
 
         l = new QLabel( tr( "Address" ), container );
         gl->addWidget( l, 1, 0 );
         txtAddress = new QLineEdit( container );
         gl->addMultiCellWidget( txtAddress, 1, 1, 1, 2 );
 
         l = new QLabel( tr( "City" ), container );
         gl->addWidget( l, 2, 0 );
         txtCity = new QLineEdit( container );
         gl->addMultiCellWidget( txtCity, 2, 2, 1, 2 );
 
         l = new QLabel( tr( "State" ), container );
         gl->addWidget( l, 3, 0 );
         txtState = new QLineEdit( container );
         gl->addMultiCellWidget( txtState, 3, 3, 1, 2 );
 
         l = new QLabel( tr( "Zip Code" ), container );
         gl->addWidget( l, 4, 0 );
         txtZip = new QLineEdit( container );
         gl->addMultiCellWidget( txtZip, 4, 4, 1, 2 );
 
         l = new QLabel( tr( "Country" ), container );
         gl->addWidget( l, 5, 0 );
         cmbCountry = new QComboBox( TRUE, container );
         cmbCountry->insertItem( tr( "" ) );
         cmbCountry->insertItem( tr ( "United States" ) );
         cmbCountry->insertItem( tr ( "United Kingdom" ) );
         cmbCountry->insertItem( tr ( "Afghanistan" ) );
         cmbCountry->insertItem( tr ( "Albania" ) );
         cmbCountry->insertItem( tr ( "Algeria" ) );
         cmbCountry->insertItem( tr ( "American Samoa" ) );
         cmbCountry->insertItem( tr ( "Andorra" ) );
         cmbCountry->insertItem( tr ( "Angola" ) );
         cmbCountry->insertItem( tr ( "Anguilla" ) );
         cmbCountry->insertItem( tr ( "Antarctica" ) );
         cmbCountry->insertItem( tr ( "Argentina" ) );
         cmbCountry->insertItem( tr ( "Armenia" ) );
         cmbCountry->insertItem( tr ( "Aruba" ) );
         cmbCountry->insertItem( tr ( "Australia" ) );
         cmbCountry->insertItem( tr ( "Austria" ) );
         cmbCountry->insertItem( tr ( "Azerbaijan" ) );
         cmbCountry->insertItem( tr ( "Bahamas" ) );
         cmbCountry->insertItem( tr ( "Bahrain" ) );
         cmbCountry->insertItem( tr ( "Bangladesh" ) );
         cmbCountry->insertItem( tr ( "Barbados" ) );
         cmbCountry->insertItem( tr ( "Belarus" ) );
         cmbCountry->insertItem( tr ( "Belgium" ) );
         cmbCountry->insertItem( tr ( "Belize" ) );
         cmbCountry->insertItem( tr ( "Benin" ) );
         cmbCountry->insertItem( tr ( "Bermuda" ) );
         cmbCountry->insertItem( tr ( "Bhutan" ) );
         cmbCountry->insertItem( tr ( "Bolivia" ) );
         cmbCountry->insertItem( tr ( "Botswana" ) );
         cmbCountry->insertItem( tr ( "Bouvet Island" ) );
         cmbCountry->insertItem( tr ( "Brazil" ) );
         cmbCountry->insertItem( tr ( "Brunei Darussalam" ) );
         cmbCountry->insertItem( tr ( "Bulgaria" ) );
         cmbCountry->insertItem( tr ( "Burkina Faso" ) );
         cmbCountry->insertItem( tr ( "Burundi" ) );
         cmbCountry->insertItem( tr ( "Cambodia" ) );
         cmbCountry->insertItem( tr ( "Cameroon" ) );
         cmbCountry->insertItem( tr ( "Canada" ) );
         cmbCountry->insertItem( tr ( "Cape Verde" ) );
         cmbCountry->insertItem( tr ( "Cayman Islands" ) );
         cmbCountry->insertItem( tr ( "Chad" ) );
         cmbCountry->insertItem( tr ( "Chile" ) );
         cmbCountry->insertItem( tr ( "China" ) );
         cmbCountry->insertItem( tr ( "Christmas Island" ) );
         cmbCountry->insertItem( tr ( "Colombia" ) );
         cmbCountry->insertItem( tr ( "Comoros" ) );
         cmbCountry->insertItem( tr ( "Congo" ) );
         cmbCountry->insertItem( tr ( "Cook Island" ) );
         cmbCountry->insertItem( tr ( "Costa Rica" ) );
         cmbCountry->insertItem( tr ( "Cote d'Ivoire" ) );
         cmbCountry->insertItem( tr ( "Croatia" ) );
         cmbCountry->insertItem( tr ( "Cuba" ) );
         cmbCountry->insertItem( tr ( "Cyprus" ) );
         cmbCountry->insertItem( tr ( "Czech Republic" ) );
         cmbCountry->insertItem( tr ( "Denmark" ) );
         cmbCountry->insertItem( tr ( "Djibouti" ) );
         cmbCountry->insertItem( tr ( "Dominica" ) );
         cmbCountry->insertItem( tr ( "Dominican Republic" ) );
         cmbCountry->insertItem( tr ( "East Timor" ) );
         cmbCountry->insertItem( tr ( "Ecuador" ) );
         cmbCountry->insertItem( tr ( "Egypt" ) );
         cmbCountry->insertItem( tr ( "El Salvador" ) );
         cmbCountry->insertItem( tr ( "Equatorial Guinea" ) );
         cmbCountry->insertItem( tr ( "Eritrea" ) );
         cmbCountry->insertItem( tr ( "Estonia" ) );
         cmbCountry->insertItem( tr ( "Ethiopia" ) );
         cmbCountry->insertItem( tr ( "Falkland Islands" ) );
         cmbCountry->insertItem( tr ( "Faroe Islands" ) );
         cmbCountry->insertItem( tr ( "Fiji" ) );
         cmbCountry->insertItem( tr ( "Finland" ) );
         cmbCountry->insertItem( tr ( "France" ) );
         cmbCountry->insertItem( tr ( "French Guiana" ) );
         cmbCountry->insertItem( tr ( "French Polynesia" ) );
         cmbCountry->insertItem( tr ( "Gabon" ) );
         cmbCountry->insertItem( tr ( "Gambia" ) );
         cmbCountry->insertItem( tr ( "Georgia" ) );
         cmbCountry->insertItem( tr ( "Germany" ) );
         cmbCountry->insertItem( tr ( "Ghana" ) );
         cmbCountry->insertItem( tr ( "Gibraltar" ) );
         cmbCountry->insertItem( tr ( "Greece" ) );
         cmbCountry->insertItem( tr ( "Greenland" ) );
         cmbCountry->insertItem( tr ( "Grenada" ) );
         cmbCountry->insertItem( tr ( "Guadeloupe" ) );
         cmbCountry->insertItem( tr ( "Guam" ) );
         cmbCountry->insertItem( tr ( "Guatemala" ) );
         cmbCountry->insertItem( tr ( "Guinea" ) );
         cmbCountry->insertItem( tr ( "Guinea-Bissau" ) );
         cmbCountry->insertItem( tr ( "Guyana" ) );
         cmbCountry->insertItem( tr ( "Haiti" ) );
         cmbCountry->insertItem( tr ( "Holy See" ) );
         cmbCountry->insertItem( tr ( "Honduras" ) );
         cmbCountry->insertItem( tr ( "Hong Kong" ) );
         cmbCountry->insertItem( tr ( "Hungary" ) );
         cmbCountry->insertItem( tr ( "Iceland" ) );
         cmbCountry->insertItem( tr ( "India" ) );
         cmbCountry->insertItem( tr ( "Indonesia" ) );
         cmbCountry->insertItem( tr ( "Ireland" ) );
         cmbCountry->insertItem( tr ( "Israel" ) );
         cmbCountry->insertItem( tr ( "Italy" ) );
         cmbCountry->insertItem( tr ( "Jamaica" ) );
         cmbCountry->insertItem( tr ( "Japan" ) );
         cmbCountry->insertItem( tr ( "Jordan" ) );
         cmbCountry->insertItem( tr ( "Kazakhstan" ) );
         cmbCountry->insertItem( tr ( "Kenya" ) );
         cmbCountry->insertItem( tr ( "Kiribati" ) );
         cmbCountry->insertItem( tr ( "Korea" ) );
         cmbCountry->insertItem( tr ( "Kuwait" ) );
         cmbCountry->insertItem( tr ( "Kyrgyzstan" ) );
         cmbCountry->insertItem( tr ( "Laos" ) );
         cmbCountry->insertItem( tr ( "Latvia" ) );
         cmbCountry->insertItem( tr ( "Lebanon" ) );
         cmbCountry->insertItem( tr ( "Lesotho" ) );
         cmbCountry->insertItem( tr ( "Liberia" ) );
         cmbCountry->insertItem( tr ( "Liechtenstein" ) );
         cmbCountry->insertItem( tr ( "Lithuania" ) );
         cmbCountry->insertItem( tr ( "Luxembourg" ) );
         cmbCountry->insertItem( tr ( "Macau" ) );
         cmbCountry->insertItem( tr ( "Macedonia" ) );
         cmbCountry->insertItem( tr ( "Madagascar" ) );
         cmbCountry->insertItem( tr ( "Malawi" ) );
         cmbCountry->insertItem( tr ( "Malaysia" ) );
         cmbCountry->insertItem( tr ( "Maldives" ) );
         cmbCountry->insertItem( tr ( "Mali" ) );
         cmbCountry->insertItem( tr ( "Malta" ) );
         cmbCountry->insertItem( tr ( "Martinique" ) );
         cmbCountry->insertItem( tr ( "Mauritania" ) );
         cmbCountry->insertItem( tr ( "Mauritius" ) );
         cmbCountry->insertItem( tr ( "Mayotte" ) );
         cmbCountry->insertItem( tr ( "Mexico" ) );
         cmbCountry->insertItem( tr ( "Micronesia" ) );
         cmbCountry->insertItem( tr ( "Moldova" ) );
         cmbCountry->insertItem( tr ( "Monaco" ) );
         cmbCountry->insertItem( tr ( "Mongolia" ) );
         cmbCountry->insertItem( tr ( "Montserrat" ) );
         cmbCountry->insertItem( tr ( "Morocco" ) );
         cmbCountry->insertItem( tr ( "Mozambique" ) );
         cmbCountry->insertItem( tr ( "Myanmar" ) );
         cmbCountry->insertItem( tr ( "Namibia" ) );
         cmbCountry->insertItem( tr ( "Nauru" ) );
         cmbCountry->insertItem( tr ( "Nepal" ) );
         cmbCountry->insertItem( tr ( "Netherlands" ) );
         cmbCountry->insertItem( tr ( "New Caledonia" ) );
         cmbCountry->insertItem( tr ( "New Zealand" ) );
         cmbCountry->insertItem( tr ( "Nicaragua" ) );
         cmbCountry->insertItem( tr ( "Niger" ) );
         cmbCountry->insertItem( tr ( "Nigeria" ) );
         cmbCountry->insertItem( tr ( "Niue" ) );
         cmbCountry->insertItem( tr ( "Norway" ) );
         cmbCountry->insertItem( tr ( "Oman" ) );
         cmbCountry->insertItem( tr ( "Pakistan" ) );
         cmbCountry->insertItem( tr ( "Palau" ) );
         cmbCountry->insertItem( tr ( "Palestinian Sovereign Areas" ) );
         cmbCountry->insertItem( tr ( "Panama" ) );
         cmbCountry->insertItem( tr ( "Papua New Guinea" ) );
         cmbCountry->insertItem( tr ( "Paraguay" ) );
diff --git a/core/pim/addressbook/main.cpp b/core/pim/addressbook/main.cpp
index 97bfa6d..47d370a 100644
--- a/core/pim/addressbook/main.cpp
+++ b/core/pim/addressbook/main.cpp
@@ -1,28 +1,27 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** 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.
 **
 ** 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 "addressbook.h"
 
-#include <qpe/qpeapplication.h>
 
 #include <opie/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<AddressbookWindow> )
 
diff --git a/core/pim/addressbook/picker.cpp b/core/pim/addressbook/picker.cpp
index 9e0c78a..7a20591 100644
--- a/core/pim/addressbook/picker.cpp
+++ b/core/pim/addressbook/picker.cpp
@@ -1,245 +1,243 @@
 #include "picker.h"
 
-#include <qfont.h>
-#include <qstring.h>
 #include <qtimer.h>
 #include <qlayout.h>
 
 char PickerLabel::lastLetter = '\0';
 
 PickerLabel::PickerLabel( QWidget *parent, const char *name ) 
         : QLabel ( parent, name )
 {
         currentLetter = 0;
         //lastLetter = 0;
 
         letter1 = '\0';
         letter2 = '\0';
         letter3 = '\0';
 
         // setFont( QFont( "smallsmooth", 9 ) );
         setFont( QFont::defaultFont() );
         setTextFormat( Qt::RichText );
 
 }
 
 PickerLabel::~PickerLabel()
 {
 
 }
 
 void PickerLabel::setLetters( char ch1, char ch2, char ch3 )
 {
         QString tmpStr;
 
         if (ch1 != '\0') 
                 letter1 = ch1;
         else
                 letter1 = ' ';
 
         if (ch2 != '\0') 
                 letter2 = ch2;
         else
                 letter2 = ' ';
 
         if (ch3 != '\0') 
                 letter3 = ch3;
         else
                 letter3 = ' ';
 
         tmpStr = "<qt>";
         tmpStr += letter1;
         tmpStr += letter2;
         tmpStr += letter3;
         tmpStr += "</qt>";
 
         setText(tmpStr);
 
         currentLetter = 0;
 
 }
 
 void PickerLabel::clearLetter()
 {
 
         QString tmpStr;
         
         tmpStr = "<qt>";
         tmpStr += letter1;
         tmpStr += letter2;
         tmpStr += letter3;
         tmpStr += "</qt>";
 
         setText(tmpStr);
 
         currentLetter = 0;
 
 }
 
 void PickerLabel::mousePressEvent( QMouseEvent* e )
 {
         // If one pickerlabel is was, and an other is now selected, we 
         // have to simulate the releaseevent.. Otherwise the new label
         // will not get a highlighted  letter.. 
         // Maybe there is a more intelligent solution, but this works and I am tired.. (se)
         if ( ( currentLetter == 0 ) && ( lastLetter != '\0' ) ) mouseReleaseEvent( e );
 } 
 
 void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ )
 {
         QString tmpStr;
 
         if (lastLetter != letter1 && lastLetter != letter2 && lastLetter != letter3 && lastLetter != '\0')
                 QTimer::singleShot( 0, this, SLOT(emitClearSignal()) );
         
         switch (currentLetter) {
                 case 0:
                         tmpStr = "<qt><u><b><font color=\"#FF00FF\">";
                         tmpStr += letter1;
                         tmpStr += "</font></b></u>";
                         tmpStr += letter2;
                         tmpStr += letter3;
                         tmpStr += "</qt>";
 
                         setText(tmpStr);
 
                         currentLetter++;
                         lastLetter = letter1;
                         emit selectedLetter( letter1 );
                         break;
 
                 case 1:
                         tmpStr = "<qt>";
                         tmpStr += letter1;
                         tmpStr += "<u><b><font color=\"#FF00FF\">";
                         tmpStr += letter2;
                         tmpStr += "</font></b></u>";
                         tmpStr += letter3;
                         tmpStr += "</qt>";
 
                         setText(tmpStr);
 
                         currentLetter++;
                         lastLetter = letter2;
                         emit selectedLetter( letter2 );
                         break;
                         
                 case 2:
                         tmpStr = "<qt>";
                         tmpStr += letter1;
                         tmpStr += letter2;
                         tmpStr += "<u><b><font color=\"#FF00FF\">";
                         tmpStr += letter3;
                         tmpStr += "</font></b></u></qt>";
 
                         setText(tmpStr);
 
                         currentLetter++;
                         lastLetter = letter3;
                         emit selectedLetter( letter3 );
                         break;
 
                 default:
                         clearLetter();
                         lastLetter = '\0';
                         emit selectedLetter( '\0' );
 
 
         }
 }
 
 void PickerLabel::emitClearSignal() {
         emit clearAll();
 }
         
 LetterPicker::LetterPicker( QWidget *parent, const char *name )
         : QFrame( parent, name )
 {
         QHBoxLayout *l = new QHBoxLayout(this);
 
         lblABC = new PickerLabel( this );
         l->addWidget( lblABC );
         
         lblDEF = new PickerLabel( this );
         l->addWidget( lblDEF );
 
         lblGHI = new PickerLabel( this );
         l->addWidget( lblGHI );
 
         lblJKL = new PickerLabel( this );
         l->addWidget( lblJKL );
 
         lblMNO = new PickerLabel( this );
         l->addWidget( lblMNO );
 
         lblPQR = new PickerLabel( this );
         l->addWidget( lblPQR );
 
         lblSTU = new PickerLabel( this );
         l->addWidget( lblSTU );
 
         lblVWX = new PickerLabel( this );
         l->addWidget( lblVWX );
 
         lblYZ = new PickerLabel( this );
         l->addWidget( lblYZ );
 
         lblABC->setLetters( 'A', 'B', 'C' );
         lblDEF->setLetters( 'D', 'E', 'F' );
         lblGHI->setLetters( 'G', 'H', 'I' );
         lblJKL->setLetters( 'J', 'K', 'L' );
         lblMNO->setLetters( 'M', 'N', 'O' );
         lblPQR->setLetters( 'P', 'Q', 'R' );
         lblSTU->setLetters( 'S', 'T', 'U' );
         lblVWX->setLetters( 'V', 'W', 'X' );
         lblYZ->setLetters( 'Y', 'Z', '#' );
 
         connect(lblABC, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblDEF, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblGHI, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblJKL, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblMNO, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblPQR, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblSTU, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblVWX, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblYZ, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblABC, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblDEF, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblGHI, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblJKL, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblMNO, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblPQR, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblSTU, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblVWX, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblYZ, SIGNAL(clearAll()), this, SLOT(clear()));
 
 }
 
 LetterPicker::~LetterPicker()
 {
 }
 
 QSizePolicy LetterPicker::sizePolicy () const
 {
         return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Maximum);
 }
 
 void LetterPicker::clear()
 {
         lblABC->clearLetter();
         lblDEF->clearLetter();
         lblGHI->clearLetter();
         lblJKL->clearLetter();
         lblMNO->clearLetter();
         lblPQR->clearLetter();
         lblSTU->clearLetter();
         lblVWX->clearLetter();
         lblYZ->clearLetter();
 }
 
 void LetterPicker::newLetter( char letter )
 {
         qWarning("LetterClicked");
         emit letterClicked( letter );
 
 }
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 24affd0..af26302 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -1,448 +1,433 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 ** $Id$
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_FD
 
 #include "datebook.h"
 #include "datebookday.h"
 #include "datebooksettings.h"
 #include "datebookweek.h"
 #include "datebookweeklst.h"
 #include "dateentryimpl.h"
 
 #include <qpe/datebookmonth.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
-#include <qpe/qpedebug.h>
-#include <qpe/event.h>
 #include <qpe/finddialog.h>
 #include <qpe/ir.h>
-#include <qmenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
-#include <qpe/timestring.h>
 #include <qtoolbar.h>
 #include <qpe/tzselect.h>
-#include <qpe/xmlreader.h>
 
 #include <qaction.h>
 #include <qcopchannel_qws.h>
-#include <qdatetime.h>
-#include <qdialog.h>
-#include <qfile.h>
-#include <qlabel.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
-#include <qpopupmenu.h>
-#include <qpushbutton.h>
-#include <qregexp.h>
-#include <qtextcodec.h>
-#include <qtextstream.h>
 #include <qtimer.h>
 #include <qtl.h>
 #include <qwidgetstack.h>
-#include <qwindowsystem_qws.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 
 DateBook::DateBook( QWidget *parent, const char *, WFlags f )
     : QMainWindow( parent, "datebook", f ),
       aPreset( FALSE ),
       presetTime( -1 ),
       startTime( 8 ), // an acceptable default
       rowStyle( 0 ),
       bJumpToCurTime(FALSE),
       syncing(FALSE),
       inSearch(FALSE),
       alarmCounter(0)
 {
         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&)) );
 #endif
 
     // listen on QPE/System
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
         QCopChannel *channel = new QCopChannel( "QPE/System", this );
         connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) );
         channel = new QCopChannel( "QPE/Datebook", this );
         connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) );
 #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 );
                 }
                 saveSettings();
 
                 // make the change obvious
                 if ( views->visibleWidget() ) {
                         if ( views->visibleWidget() == dayView )
                                 dayView->redraw();
                         else if ( views->visibleWidget() == weekView )
                                 weekView->redraw();
                         else if ( views->visibleWidget() == weekLstView )
                                 weekLstView->redraw();
                 }
         }
 }
 
 void DateBook::fileNew()
 {
     slotNewEventFromKey("");
 }
 
 QString DateBook::checkEvent(const Event &e)
 {
     /* check if overlaps with itself */
     bool checkFailed = FALSE;
 
     /* check the next 12 repeats. should catch most problems */
     QDate current_date = e.start().date();
     Event previous = e;
     for(int i = 0; i < 12; i++)
     {
         QDateTime next;
         if (!nextOccurance(previous, current_date.addDays(1), next)) {
             break;  // no more repeats
         }
         if(next < previous.end()) {
             checkFailed = TRUE;
             break;
         }
         current_date = next.date();
     }
 
     if(checkFailed)
         return tr("Event duration is potentially longer\n"
                   "than interval between repeats.");
 
     return QString::null;
 }
 
 QDate DateBook::currentDate()
 {
     QDate d = QDate::currentDate();
 
     if ( dayView && views->visibleWidget() == dayView ) {
         d = dayView->date();
     } else if ( weekView && views->visibleWidget() == weekView ) {
         d = weekView->date();
     } else if ( weekLstView && views->visibleWidget() == weekLstView ) {
         d = weekLstView->date();
     } else if ( monthView && views->visibleWidget() == monthView ) {
         d = monthView->selectedDate();
     }
 
     return d;
 }
 
 void DateBook::view(int v, const QDate &d) {
         if (v==DAY) {
                 initDay();
                 dayAction->setOn( TRUE );
                 dayView->setDate( d );
                 views->raiseWidget( dayView );
                 dayView->redraw();
         } else if (v==WEEK) {
                 initWeek();
                 weekAction->setOn( TRUE );
                 weekView->setDate( d );
                 views->raiseWidget( weekView );
                 weekView->redraw();
         } else if (v==WEEKLST) {
                 initWeekLst();
                 weekLstAction->setOn( TRUE );
                 weekLstView->setDate(d);
                 views->raiseWidget( weekLstView );
                 weekLstView->redraw();
         } else if (v==MONTH) {
                 initMonth();
                 monthAction->setOn( TRUE );
                 monthView->setDate( d.year(), d.month(), d.day() );
                 views->raiseWidget( monthView );
                 monthView->redraw();
         }
 }
 
 void DateBook::viewDefault(const QDate &d) {
         view(defaultView,d);
 }
 
 void DateBook::viewDay() {
         view(DAY,currentDate());
 }
 
 void DateBook::viewWeek() {
         view(WEEK,currentDate());
 }
 
 void DateBook::viewWeekLst() {
         view(WEEKLST,currentDate());
 }
 
 void DateBook::viewMonth() {
         view(MONTH,currentDate());
 }
 
 void DateBook::insertEvent( const Event &e )
 {
         Event dupEvent=e;
         if(!dupEvent.isValidUid() ) // tkcRom seems to be different
             dupEvent.assignUid();
         dupEvent.setLocation(defaultLocation);
         dupEvent.setCategories(defaultCategories);
         db->addEvent(dupEvent);
         emit newEvent();
 }
 
 void DateBook::duplicateEvent( const Event &e )
 {
     // Alot of code duplication, as this is almost like editEvent();
         if (syncing) {
                 QMessageBox::warning( this, tr("Calendar"), tr( "Can not edit data, currently syncing") );
                 return;
     }
 
                 Event dupevent(e);// Make a duplicate.
 
         // workaround added for text input.
         QDialog editDlg( this, 0, TRUE );
         DateEntry *entry;
         editDlg.setCaption( tr("Duplicate 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, dupevent, ampm, &editDlg, "editor" );
         entry->timezone->setEnabled( FALSE );
         sv->addChild( entry );
 
         while ( QPEApplication::execDialog( &editDlg ) ) {
                 Event newEv = entry->event();
                 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;
                 }
         /*
         * 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...
diff --git a/core/pim/datebook/datebookdayallday.cpp b/core/pim/datebook/datebookdayallday.cpp
index 1244fd3..d43d31a 100644
--- a/core/pim/datebook/datebookdayallday.cpp
+++ b/core/pim/datebook/datebookdayallday.cpp
@@ -1,236 +1,226 @@
 /****************************************************************************
 ** GPL by Rajko Albrecht
 **
 **
 **
 **
 **
 ****************************************************************************/
 #include "datebookdayallday.h"
 
-#include <qpushbutton.h>
 #include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qobjectlist.h>
-#include <qpe/event.h>
 #include <qpe/ir.h>
-#include <qpe/datebookdb.h>
-#include <qpe/resource.h>
 #include <qpopupmenu.h>
 #include <qtimer.h>
-#include <qregexp.h>
-#include <qdatetime.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&)));
     ++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);
     int r = m.exec( e->globalPos() );
     setBackgroundColor(b);
     update();
     switch (r) {
     case 1:
         emit editMe( ev );
         break;
     case 2:
         emit deleteMe( ev );
         break;
     case 3:
         emit beamMe( ev );
         break;
     case 4:
         emit duplicateMe( ev );
         break;
     case 5:
         beam_single_event();
         break;
     case 6:
         emit displayMe( ev );
         break;
     default:
         break;
     }
 }
 
 DatebookEventDesc::DatebookEventDesc(QWidget*parent,const char*name)
     :QLabel(parent,name)
 {
    m_Timer=new QTimer(this);
    connect(m_Timer,SIGNAL(timeout()),this,SLOT(hide()));
    setFrameStyle(QFrame::Sunken|QFrame::Panel);
    setTextFormat(RichText);
 }
 
 DatebookEventDesc::~DatebookEventDesc()
 {
 }
 
 void DatebookEventDesc::mousePressEvent(QMouseEvent*)
 {
     hide();
     if (m_Timer->isActive()) m_Timer->stop();
 }
 
 void DatebookEventDesc::disp_event(const Event&e)
 {
     if (m_Timer->isActive()) m_Timer->stop();
     QString text;
     text = "<b><i>"+e.description()+"</i></b><br>";
     if (e.notes().length()>0) {
         text+="<b>"+e.notes()+"</b><br>";
     }
     if (e.location().length()>0) {
         text+="<i>"+e.location()+"</i><br>";
     }
     text = text.replace(QRegExp("\n"),"<br>");
     setText(text);
     QSize s = sizeHint();
     s+=QSize(10,10);
     resize(s);
     move( QMAX(0,(parentWidget()->width()-width()) / 2),
             (parentWidget()->height()-height())/2 );
     show();
     m_Timer->start(2000,true);
 }
diff --git a/core/pim/datebook/datebookdayheaderimpl.cpp b/core/pim/datebook/datebookdayheaderimpl.cpp
index 3e965f5..213c843 100644
--- a/core/pim/datebook/datebookdayheaderimpl.cpp
+++ b/core/pim/datebook/datebookdayheaderimpl.cpp
@@ -1,204 +1,200 @@
 /**********************************************************************
 ** 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 "datebookdayheaderimpl.h"
 
 #include <qpe/datebookmonth.h>
 #include <qpe/resource.h>
-#include <qpe/timestring.h>
 
 #include <qbuttongroup.h>
-#include <qpopupmenu.h>
-#include <qstringlist.h>
-#include <qtimer.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 ) ),
                  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 );
     }
     // update the date...
     setDate( currDate.year(), currDate.month(), currDate.day() );
 }
diff --git a/core/pim/datebook/datebooksettings.cpp b/core/pim/datebook/datebooksettings.cpp
index 675b17f..a6d04ba 100644
--- a/core/pim/datebook/datebooksettings.cpp
+++ b/core/pim/datebook/datebooksettings.cpp
@@ -1,156 +1,155 @@
 /**********************************************************************
 ** 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>
-#include <qcombobox.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 ) ) );
         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;
     }
     ampm = whichClock;
     init();
     setStartTime( saveMe );
 }
 
 void DateBookSettings::setJumpToCurTime( bool bJump )
 {
         chkJumpToCurTime->setChecked( bJump );
 }
 
 bool DateBookSettings::jumpToCurTime() const
 {
         return chkJumpToCurTime->isChecked();
 }
 
 void DateBookSettings::setRowStyle( int style )
 {
         comboRowStyle->setCurrentItem( style );
 }
 
 int DateBookSettings::rowStyle() const
 {
         return comboRowStyle->currentItem();
 }
diff --git a/core/pim/datebook/datebookweekheaderimpl.cpp b/core/pim/datebook/datebookweekheaderimpl.cpp
index 84b4f1b..eaa9730 100644
--- a/core/pim/datebook/datebookweekheaderimpl.cpp
+++ b/core/pim/datebook/datebookweekheaderimpl.cpp
@@ -1,124 +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 "datebookweekheader.h"
 #include "datebookweek.h"
-#include <qlabel.h>
-#include <qspinbox.h>
-#include <qdatetime.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( 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 24fb0ba..42a1753 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -1,393 +1,392 @@
 #include "datebookweeklst.h"
 
 
 #include "datebook.h"
 
 #include <qpe/datebookmonth.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
-#include <qpe/calendar.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( 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 &)),
                         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 &)));
                         }
                         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(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
         connect (w, 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(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
         connect (w, 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(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(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
         connect (view, 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 856837c..018bb5a 100644
--- a/core/pim/datebook/dateentryimpl.cpp
+++ b/core/pim/datebook/dateentryimpl.cpp
@@ -1,425 +1,414 @@
 /**********************************************************************
 ** 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 "dateentryimpl.h"
 #include "repeatentry.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/categoryselect.h>
 #include <qpe/datebookmonth.h>
-#include <qpe/global.h>
-#include <qpe/timeconversion.h>
-#include <qpe/timestring.h>
 #include <qpe/tzselect.h>
 
-#include <qevent.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qlayout.h>
 #include <qlineedit.h>
-#include <qmultilineedit.h>
-#include <qpopupmenu.h>
-#include <qscrollview.h>
 #include <qspinbox.h>
-#include <qtoolbutton.h>
 
 #include <opie/otimepicker.h>
 #include "onoteedit.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 
 /*
  *  Constructs a DateEntry 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.
  */
 
 DateEntry::DateEntry( bool startOnMonday, const QDateTime &start,
                       const QDateTime &end, bool whichClock, QWidget* parent,
                       const char* name )
     : DateEntryBase( parent, name ),
       ampm( whichClock ),
       startWeekOnMonday( startOnMonday ),
       m_showStart(true)
 {
     init();
     setDates(start,end);
     setFocusProxy(comboDescription);
 }
 
 bool DateEntry::eventFilter(QObject *obj, QEvent *ev )
 {
   if( ev->type() == QEvent::FocusIn ){
     if( obj == comboStart ){
       timePickerStart->setHour(startTime.hour());
       timePickerStart->setMinute(startTime.minute());
       TimePickerLabel->setText( tr("Start Time" ) );
       m_showStart= true;
     }else if( obj == comboEnd ){
       timePickerStart->setHour(endTime.hour());
       timePickerStart->setMinute(endTime.minute());
       TimePickerLabel->setText( tr("End Time") );
       m_showStart = false;
     }
   } else if( ev->type() == QEvent::FocusOut ){
 //    if( obj == comboEnd ){
 //      QString s;
 //      s.sprintf("%.2d:%.2d",endTime.hour(), endTime.minute());
 //      comboEnd->setText(s);
 //    }
 //    else if( obj == comboStart ){
 //      QString s;
 //      s.sprintf("%.2d:%.2d",startTime.hour(), startTime.minute());
 //      comboStart->setText(s);
 //    }
   }
 
   return false;
 }
 
 static void addOrPick( QComboBox* combo, const QString& t )
 {
     // Pick an  item if one excists
     for (int i=0; i<combo->count(); i++) {
         if ( combo->text(i) == t ) {
             combo->setCurrentItem(i);
             return;
         }
     }
 
     // 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 ) ),
              this, SLOT( startDateChanged( int, int, int ) ) );
 
     //Let start button change both start and end dates
     connect( startPicker, SIGNAL( dateClicked( int, int, int ) ),
              this, SLOT( endDateChanged( int, int, int ) ) );
     connect( qApp, SIGNAL( clockChanged( 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 ) ),
              this, SLOT( endDateChanged( int, int, int ) ) );
 
     connect(timePickerStart, SIGNAL( timeChanged(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());
 }
 
 /*
  * public slot
  */
 void DateEntry::startDateChanged( int y, int m, int d )
 {
     QDate prev = startDate;
     startDate.setYMD( y, m, d );
     if ( rp.type == Event::Weekly &&
          startDate.dayOfWeek() != prev.dayOfWeek() ) {
         // if we change the start of a weekly repeating event
         // set the repeating day appropriately
         char mask = 1 << (prev.dayOfWeek()-1);
         rp.days &= (~mask);
         rp.days |= 1 << (startDate.dayOfWeek()-1);
     }
 
     buttonStart->setText( TimeString::shortDate( startDate ) );
 
     // our pickers must be reset...
     startPicker->setDate( y, m, d );
     endPicker->setDate( y, m, d );
 }
 
 /*
  * public slot
  */
 void DateEntry::startTimeEdited( const QString &s )
 {
     startTimeChanged(parseTime(s,ampm));
     updateTimeEdit(false,true);
     timePickerStart->setHour(startTime.hour());
     timePickerStart->setMinute(startTime.minute());
 }
 
 void DateEntry::startTimeChanged( const QTime &t )
 {
     int duration=startTime.secsTo(endTime);
     startTime = t;
     endTime=t.addSecs(duration);
 }
 void DateEntry::startTimePicked( const QTime &t ) {
   if(m_showStart ){
     startTimeChanged(t);
     updateTimeEdit(true,true);
   }else{
     endTimeChanged(t);
     updateTimeEdit(false, true );
   }
 }
 
 /*
  * public slot
  */
 void DateEntry::typeChanged( const QString &s )
 {
     bool b = s != "All Day";
     buttonStart->setEnabled( b );
     comboStart->setEnabled( b );
     comboEnd->setEnabled( b );
 }
 
 void DateEntry::slotRepeat()
 {
     // Work around for compiler Bug..
     RepeatEntry *e;
 
     // it is better in my opinion to just grab this from the mother,
     // since, this dialog doesn't need to keep track of it...
     if ( rp.type != Event::NoRepeat )
         e = new RepeatEntry( startWeekOnMonday, rp, startDate, this);
     else
         e = new RepeatEntry( startWeekOnMonday, startDate, this );
 
     if ( QPEApplication::execDialog( e ) ) {
         rp = e->repeatPattern();
         setRepeatLabel();
     }
     // deleting sounds like a nice idea...
     delete e;
 }
 
 void DateEntry::slotChangeStartOfWeek( bool onMonday )
 {
     startWeekOnMonday = onMonday;
 }
 
 Event DateEntry::event()
 {
     Event ev;
     Event::SoundTypeChoice st;
     ev.setDescription( comboDescription->currentText() );
     ev.setLocation( comboLocation->currentText() );
     ev.setCategories( comboCategory->currentCategories() );
     ev.setType( checkAllDay->isChecked() ? Event::AllDay : Event::Normal );
     if ( startDate > endDate ) {
         QDate tmp = endDate;
         endDate = startDate;
         startDate = tmp;
     }
 
     // This is now done in the changed slots
     //    startTime = parseTime( comboStart->text(), ampm );
     //endTime = parseTime( comboEnd->text(), ampm );
 
diff --git a/core/pim/datebook/main.cpp b/core/pim/datebook/main.cpp
index 8004690..421e457 100644
--- a/core/pim/datebook/main.cpp
+++ b/core/pim/datebook/main.cpp
@@ -1,25 +1,24 @@
 /**********************************************************************
 ** 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 "datebook.h"
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
          
 OPIE_EXPORT_APP( OApplicationFactory<DateBook> )
diff --git a/core/pim/datebook/noteentryimpl.cpp b/core/pim/datebook/noteentryimpl.cpp
index 0e45985..14fe98e 100644
--- a/core/pim/datebook/noteentryimpl.cpp
+++ b/core/pim/datebook/noteentryimpl.cpp
@@ -1,17 +1,15 @@
 #include "noteentryimpl.h"
-#include "qstring.h"
-#include "qmultilinedit.h"
 #include "qlabel.h"
 #include "onoteedit.h"
 
 NoteEntry::NoteEntry(const QString &title, const QString &noteStr,
                      QWidget* parent, const char* name, bool modal,
                      WFlags fl) :
   NoteEntryBase(parent, name, modal, fl) {
 
 
   eventLabel->setText(title);
   note->setText(noteStr);
   int l=note->length();
   note->setCursorPosition(l,l,false);
 }
diff --git a/core/pim/datebook/repeatentry.cpp b/core/pim/datebook/repeatentry.cpp
index b1a162d..7cf36da 100644
--- a/core/pim/datebook/repeatentry.cpp
+++ b/core/pim/datebook/repeatentry.cpp
@@ -1,415 +1,411 @@
 /**********************************************************************
 ** 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 "repeatentry.h"
 
 #include <qpe/datebookmonth.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/timestring.h>
 
-#include <qbuttongroup.h>
 #include <qlabel.h>
-#include <qpopupmenu.h>
 #include <qspinbox.h>
-#include <qtoolbutton.h>
 
 #include <time.h>
 
 // Global Templates for use in setting up the repeat label...
 // the problem is these strings get initialized before QPEApplication can install the translator -zecke
 namespace {
 QString strDayTemplate;
 QString strYearTemplate;
 QString strMonthDateTemplate;
 QString strMonthDayTemplate;
 QString strWeekTemplate;
 QString dayLabel[7];
 }
 
 /*
  * static linkage to not polute the symbol table...
  * The problem is that const and static linkage are resolved prior to installing a translator
  * leading to that the above strings are translted but to the original we delay the init of these strings...
  * -zecke
  */
 static void fillStrings() {
     strDayTemplate = QObject::tr("Every");
     strYearTemplate = QObject::tr("%1 %2 every ");
     strMonthDateTemplate = QObject::tr("The %1 every ");
     strMonthDayTemplate = QObject::tr("The %1 %1 of every");
     strWeekTemplate = QObject::tr("Every ");
     dayLabel[0] = QObject::tr("Monday");
     dayLabel[1] = QObject::tr("Tuesday");
     dayLabel[2] = QObject::tr("Wednesday");
     dayLabel[3] = QObject::tr("Thursday");
     dayLabel[4] = QObject::tr("Friday");
     dayLabel[5] = QObject::tr("Saturday");
     dayLabel[6] = QObject::tr("Sunday");
 }
 
         static QString numberPlacing( int x );// return the proper word format for
                                         // x (1st, 2nd, etc)
 static int week( const QDate &dt );    // what week in the month is dt?
 
 RepeatEntry::RepeatEntry( bool startOnMonday,
                           const QDate &newStart, QWidget *parent,
                           const char *name, bool modal, WFlags fl )
     : RepeatEntryBase( parent, name, modal, fl ),
       start( newStart ),
       currInterval( NONE ),
       startWeekOnMonday( startOnMonday )
 {
     if (strDayTemplate.isEmpty() )
         fillStrings();
 
     init();
     fraType->setButton( currInterval );
     chkNoEnd->setChecked( TRUE );
     setupNone();
 }
 
 RepeatEntry::RepeatEntry( bool startOnMonday, const Event::RepeatPattern &rp,
                           const QDate &startDate,
                           QWidget *parent, const char *name, bool modal,
                           WFlags fl )
     : RepeatEntryBase( parent, name, modal, fl ),
       start( startDate ),
       end( rp.endDate() ),
       startWeekOnMonday( startOnMonday )
 {
     if (strDayTemplate.isEmpty() )
         fillStrings();
     // do some stuff with the repeat pattern
     init();
     switch ( rp.type ) {
         default:
         case Event::NoRepeat:
             currInterval = NONE;
             setupNone();
             break;
         case Event::Daily:
             currInterval = DAY;
             setupDaily();
             break;
         case Event::Weekly:
             currInterval = WEEK;
             setupWeekly();
             int day, buttons;
             for ( day = 0x01, buttons = 0; buttons < 7;
                   day = day << 1, buttons++ ) {
                 if ( rp.days & day ) {
                     if ( startWeekOnMonday )
                         fraExtra->setButton( buttons );
                     else {
                         if ( buttons == 7 )
                             fraExtra->setButton( 0 );
                         else
                             fraExtra->setButton( buttons + 1 );
                     }
                 }
             }
             slotWeekLabel();
             break;
         case Event::MonthlyDay:
             currInterval = MONTH;
             setupMonthly();
             fraExtra->setButton( 0 );
             slotMonthLabel( 0 );
             break;
         case Event::MonthlyDate:
             currInterval = MONTH;
             setupMonthly();
             fraExtra->setButton( 1 );
             slotMonthLabel( 1 );
             break;
         case Event::Yearly:
             currInterval = YEAR;
             setupYearly();
             break;
     }
     fraType->setButton( currInterval );
     spinFreq->setValue( rp.frequency );
     if ( !rp.hasEndDate ) {
         cmdEnd->setText( RepeatEntryBase::tr("No End Date") );
         chkNoEnd->setChecked( TRUE );
     } else
         cmdEnd->setText( TimeString::shortDate( end ) );
 }
 
 RepeatEntry::~RepeatEntry()
 {
 }
 
 Event::RepeatPattern RepeatEntry::repeatPattern()
 {
     QListIterator<QToolButton> it( listRTypeButtons );
     QListIterator<QToolButton> itExtra( listExtra );
     Event::RepeatPattern rpTmp;
     int i;
     for ( i = 0; *it; ++it, i++ ) {
         if ( (*it)->isOn() ) {
             switch ( i ) {
                 case NONE:
                    rpTmp.type = Event::NoRepeat;
                    break;
                 case DAY:
                     rpTmp.type = Event::Daily;
                     break;
                 case WEEK:
                     rpTmp.type = Event::Weekly;
                     rpTmp.days = 0;
                     int day;
                     for ( day = 1; *itExtra; ++itExtra, day = day << 1 ) {
                         if ( (*itExtra)->isOn() ) {
                             if ( startWeekOnMonday )
                                 rpTmp.days |= day;
                             else {
                                 if ( day == 1 )
                                     rpTmp.days |= Event::SUN;
                                 else
                                     rpTmp.days |= day >> 1;
                             }
                         }
                     }
                     break;
                 case MONTH:
                     if ( cmdExtra1->isOn() )
                         rpTmp.type = Event::MonthlyDay;
                     else if ( cmdExtra2->isOn() )
                         rpTmp.type = Event::MonthlyDate;
                         // figure out the montly day...
                         rpTmp.position = week( start );
                     break;
                 case YEAR:
                     rpTmp.type = Event::Yearly;
                     break;
             }
             break;  // no need to keep looking!
         }
     }
     rpTmp.frequency = spinFreq->value();
     rpTmp.hasEndDate = !chkNoEnd->isChecked();
     if ( rpTmp.hasEndDate ) {
         rpTmp.setEndDate( end );
     }
     // timestamp it...
     rpTmp.createTime = time( NULL );
     return rpTmp;
 }
 
 void RepeatEntry::slotSetRType( int rtype )
 {
     // now call the right function based on the type...
     currInterval = static_cast<repeatButtons>(rtype);
     switch ( currInterval ) {
         case NONE:
             setupNone();
             break;
         case DAY:
             setupDaily();
             break;
         case WEEK:
             setupWeekly();
             slotWeekLabel();
             break;
         case MONTH:
             setupMonthly();
             cmdExtra2->setOn( TRUE );
             slotMonthLabel( 1 );
             break;
         case YEAR:
             setupYearly();
             break;
     }
 }
 
 void RepeatEntry::setupNone()
 {
     lblRepeat->setText( tr("No Repeat") );
     lblVar1->hide();
     lblVar2->hide();
     hideExtras();
     cmdEnd->hide();
     lblFreq->hide();
     lblEvery->hide();
     lblFreq->hide();
     spinFreq->hide();
     lblEnd->hide();
     lblWeekVar->hide();
 }
 
 void RepeatEntry::setupDaily()
 {
     hideExtras();
     lblWeekVar->hide();
     spinFreq->setValue( 1 );
     lblFreq->setText( tr("day(s)") );
     lblVar2->show();
     showRepeatStuff();
     lblRepeat->setText( strDayTemplate );
     setupRepeatLabel( 1 );
 }
 
 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)),
                       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 )
 {
diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp
index dbd6df6..6891f03 100644
--- a/core/pim/osearch/adresssearch.cpp
+++ b/core/pim/osearch/adresssearch.cpp
@@ -1,61 +1,59 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "adresssearch.h"
 #include "contactitem.h"
 
 #include <qpe/resource.h>
 
-#include <qstring.h>
-#include <qiconset.h>
 //#include <qwhatsthis.h>
 
 AdressSearch::AdressSearch(QListView* parent, QString name):
         SearchGroup(parent, name)
 {
         _contacts = 0;
         QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" );
         setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
 
 
         //QWhatsThis::add( this, QObject::tr("Search the addressbook") );
         /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" );
         QImage img = pix.convertToImage();
         img.smoothScale( 14, 14 );
         pix.convertFromImage( img );
         setPixmap( 0, pix );*/
 }
 
 
 AdressSearch::~AdressSearch()
 {
         delete _contacts;
 }
 
 void AdressSearch::load()
 {
         _contacts = new OPimContactAccess("osearch");
 }
 
 int AdressSearch::search()
 {
         OPimRecordList<OPimContact> results = _contacts->matchRegexp(_search);
         for (uint i = 0; i < results.count(); i++) {
                 (void)new ContactItem( this, new OPimContact( results[i] ));
         }
         return results.count();
 }
 
 void AdressSearch::insertItem( void* )
 {
 
 }
diff --git a/core/pim/osearch/applnkitem.cpp b/core/pim/osearch/applnkitem.cpp
index 06c2b1e..19e765e 100644
--- a/core/pim/osearch/applnkitem.cpp
+++ b/core/pim/osearch/applnkitem.cpp
@@ -1,61 +1,60 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "applnkitem.h"
 
 #include <qpe/applnk.h>
 #include <qpe/qcopenvelope_qws.h>
 
-#include <qfileinfo.h>
 
 AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app)
         : ResultItem(parent)
 {
         _app = app;
         setText(0, _app->name() );
         setPixmap(0, _app->pixmap() );
 }
 
 
 AppLnkItem::~AppLnkItem()
 {
 }
 
 
 QString AppLnkItem::toRichText()
 {
     QString text;
     text += "<b><h3>" + _app->name() + "</b></h3><br>";
     text += _app->comment() + "<br>";
     text += "<br>`" + _app->exec() + "`<br>";
     text += "<br>`" + _app->file() + "`<br>";
     text += "<br>`" + _app->linkFile() + "`<br>";
     return text;
 }
 
 void AppLnkItem::action( int act )
 {
         if (!_app->isValid()) qDebug("INVALID");
         if (act == 0) _app->execute();
         else if (act == 1){
                 QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)");
                 e << _app->linkFile();
         }
 }
 
 QIntDict<QString> AppLnkItem::actions()
 {
         QIntDict<QString> result;
         result.insert( 0, new QString( QObject::tr("execute") ) );
         result.insert( 1, new QString( QObject::tr("open in filemanager") ) );
         return result;
 }
diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp
index 1c84d66..758baf2 100644
--- a/core/pim/osearch/applnksearch.cpp
+++ b/core/pim/osearch/applnksearch.cpp
@@ -1,70 +1,69 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "applnksearch.h"
 #include "applnkitem.h"
 
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
-#include <qiconset.h>
 
 AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name)
 {
         _apps = 0;
         QIconSet is = Resource::loadIconSet( "osearch/applicationsSmall" );
         //QIconSet is = Resource::loadIconSet( "AppsIcon" );
         setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
 }
 
 
 AppLnkSearch::~AppLnkSearch()
 {
         delete _apps;
 }
 
 
 void AppLnkSearch::load()
 {
         _apps = new AppLnkSet(QPEApplication::qpeDir());
 }
 
 int AppLnkSearch::search()
 {
         QList<AppLnk> appList = _apps->children();
 
         for ( AppLnk *app = appList.first(); app != 0; app = appList.next() ){
                 if ( (_search.match( app->name() ) != -1)
                     || (_search.match(app->comment()) != -1)
                     || (_search.match(app->exec()) != -1) ) {
                         insertItem( app );
                 }else
                 if (searchFile( app ))
                         insertItem( app );
                 qApp->processEvents( 100 );
         }
         return _resultCount;
 }
 
 void AppLnkSearch::insertItem( void *rec )
 {
         (void)new AppLnkItem( this, (AppLnk*)rec );
         _resultCount++;
 }
 
 void AppLnkSearch::setSearch(QRegExp re)
 {
         setOpen( false );
         SearchGroup::setSearch( re );
 }
 
diff --git a/core/pim/osearch/contactitem.cpp b/core/pim/osearch/contactitem.cpp
index eedc374..639af46 100644
--- a/core/pim/osearch/contactitem.cpp
+++ b/core/pim/osearch/contactitem.cpp
@@ -1,142 +1,141 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "contactitem.h"
 
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
-#include <qpixmap.h>
 
 
 ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact)
 : ResultItem(parent)
 {
         _contact = contact;
         setText(0, _contact->toShortText());
         setIcon();
 }
 
 void ContactItem::setIcon()
 {
         QPixmap icon;
         switch ( _contact->lastHitField() ) {
         case -1:
                 icon = Resource::loadPixmap( "reset" );
                 break;
         case Qtopia::BusinessPhone:
                 icon = Resource::loadPixmap( "addressbook/phonework" );
                 break;
         case Qtopia::BusinessFax:
                 icon = Resource::loadPixmap( "addressbook/faxwork" );
                 break;
         case Qtopia::BusinessMobile:
                 icon = Resource::loadPixmap( "addressbook/mobilework" );
                 break;
         case Qtopia::DefaultEmail:
         case Qtopia::Emails:
                 icon = Resource::loadPixmap( "addressbook/email" );
                 break;
         case Qtopia::HomePhone:
                 icon = Resource::loadPixmap( "addressbook/phonehome" );
                 break;
         case Qtopia::HomeFax:
                 icon = Resource::loadPixmap( "addressbook/faxhome" );
                 break;
         case Qtopia::HomeMobile:
                 icon = Resource::loadPixmap( "addressbook/mobilehome" );
                 break;
         case Qtopia::HomeWebPage:
                 icon = Resource::loadPixmap( "addressbook/webpagehome" );
                 break;
         case Qtopia::BusinessWebPage:
                 icon = Resource::loadPixmap( "addressbook/webpagework" );
                 break;
         case Qtopia::Title:
          case Qtopia::JobTitle:
         case Qtopia::FirstName:
         case Qtopia::MiddleName:
         case Qtopia::LastName:
         case Qtopia::Suffix:
         case Qtopia::Nickname:
          case Qtopia::FileAs:
                 icon = Resource::loadPixmap( "addressbook/identity" );
                 break;
          case Qtopia::HomeStreet:
          case Qtopia::HomeCity:
          case Qtopia::HomeState:
          case Qtopia::HomeZip:
          case Qtopia::HomeCountry:
                 icon = Resource::loadPixmap( "osearch/addresshome" );
                 break;
          case Qtopia::Company:
          case Qtopia::BusinessCity:
          case Qtopia::BusinessStreet:
          case Qtopia::BusinessZip:
          case Qtopia::BusinessCountry:
          case Qtopia::Department:
          case Qtopia::Office:
          case Qtopia::Manager:
          case Qtopia::BusinessPager:
          case Qtopia::Profession:
                 icon = Resource::loadPixmap( "osearch/addresshome" );
                 break;
          case Qtopia::Assistant:
         case Qtopia::Spouse:
          case Qtopia::Children:
                 icon = Resource::loadPixmap( "osearch/personal" );
                 break;
          case Qtopia::Birthday:
          case Qtopia::Anniversary:
                 icon = Resource::loadPixmap( "osearch/clock" );
                 break;
          case Qtopia::Notes:
                 icon = Resource::loadPixmap( "txt" );
                 break;
         default:
                 icon = Resource::loadPixmap( "DocsIcon" );
                 break;
         }
         setPixmap( 0, icon );
 }
 
 ContactItem::~ContactItem()
 {
         delete _contact;
 }
 
 
 QString ContactItem::toRichText()
 {
     return _contact->toRichText();
 }
 
 void ContactItem::action( int act )
 {
 if (act == 0){
         QCopEnvelope e("QPE/Application/addressbook", "show(int)");
         e << _contact->uid();
 }else if(act == 1){
          QCopEnvelope e("QPE/Application/addressbook", "edit(int)");
          e << _contact->uid();
 }
 
 }
 
 QIntDict<QString> ContactItem::actions()
 {
         QIntDict<QString> result;
         result.insert( 0, new QString( QObject::tr("show") ) );
         result.insert( 1, new QString( QObject::tr("edit") ) );
         return result;
 
 }
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp
index 2b4660a..eeea54b 100644
--- a/core/pim/osearch/datebooksearch.cpp
+++ b/core/pim/osearch/datebooksearch.cpp
@@ -1,95 +1,93 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "datebooksearch.h"
 #include "eventitem.h"
 
 #include <opie2/opimevent.h>
 #include <opie2/opimrecurrence.h>
 
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
-#include <qiconset.h>
 #include <qaction.h>
-#include <qdatetime.h>
 #include <qpopupmenu.h>
 
 
 
 DatebookSearch::DatebookSearch(QListView* parent, QString name)
 : SearchGroup(parent, name), _dates(0), _popupMenu(0)
 {
         QIconSet is = Resource::loadIconSet( "datebook/DateBookSmall" );
         setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
         actionShowPastEvents = new QAction( QObject::tr("show past events"),QString::null,  0, 0, 0, true );
         actionSearchInDates = new QAction( QObject::tr("search in dates"),QString::null,  0, 0, 0, true );
         Config cfg( "osearch", Config::User );
            cfg.setGroup( "datebook_settings" );
            actionShowPastEvents->setOn( cfg.readBoolEntry( "show_past_events", false ) );
            actionSearchInDates->setOn( cfg.readBoolEntry( "search_in_dates", true ) );
 }
 
 DatebookSearch::~DatebookSearch()
 {
         qDebug("SAVE DATEBOOK SEARCH CONFIG");
         Config cfg( "osearch", Config::User );
            cfg.setGroup( "datebook_settings" );
            cfg.writeEntry( "show_past_events", actionShowPastEvents->isOn() );
            cfg.writeEntry( "search_in_dates", actionSearchInDates->isOn() );
         delete _dates;
         delete _popupMenu;
         delete actionShowPastEvents;
         delete actionSearchInDates;
 }
 
 
 void DatebookSearch::load()
 {
          _dates = new ODateBookAccess();
          _dates->load();
 }
 
 int DatebookSearch::search()
 {
         OPimRecordList<OPimEvent> results = _dates->matchRegexp(_search);
         for (uint i = 0; i < results.count(); i++)
                 insertItem( new OPimEvent( results[i] ) );
         return _resultCount;
 }
 
 void DatebookSearch::insertItem( void *rec )
 {
         OPimEvent *ev = (OPimEvent*)rec;
         if ( !actionShowPastEvents->isOn() &&
               ev->endDateTime() < QDateTime::currentDateTime() &&
               !ev->recurrence().doesRecur()
             ) return;
         if ( !actionSearchInDates->isOn() && (
               ev->lastHitField() == Qtopia::StartDateTime ||
                ev->lastHitField() == Qtopia::EndDateTime )
             ) return;
         new EventItem( this, ev );
         _resultCount++;
 }
 
 QPopupMenu* DatebookSearch::popupMenu()
 {
         if (!_popupMenu){
                 _popupMenu = new QPopupMenu( 0 );
                 actionShowPastEvents->addTo( _popupMenu );
                 actionSearchInDates->addTo( _popupMenu );
         }
         return _popupMenu;
 }
 
diff --git a/core/pim/osearch/doclnkitem.cpp b/core/pim/osearch/doclnkitem.cpp
index 1516b8e..df8e856 100644
--- a/core/pim/osearch/doclnkitem.cpp
+++ b/core/pim/osearch/doclnkitem.cpp
@@ -1,80 +1,79 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "doclnkitem.h"
 
 #include <qpe/applnk.h>
 #include <qpe/qcopenvelope_qws.h>
 
-#include <qfile.h>
 #include <qtextstream.h>
 #include <qfileinfo.h>
 
 DocLnkItem::DocLnkItem(OListViewItem* parent, DocLnk *app)
         : ResultItem(parent)
 {
         _doc = app;
         setText(0, _doc->name() );
         setPixmap(0, _doc->pixmap() );
 }
 
 DocLnkItem::~DocLnkItem()
 {
 }
 
 QString DocLnkItem::toRichText()
 {
     QString text;
     text += "<b><h3>" + _doc->name() + "</b></h3><br>";
     text += _doc->comment() + "<br>";
     text += QObject::tr("File: ") + _doc->file() + "<br>";
     text += QObject::tr("Link: ") + _doc->linkFile() + "<br>";
     text += QObject::tr("Mimetype: ") + _doc->type() + "<br>";
     if ( _doc->type().contains( "text" ) ){
         text += "<br><br><hr><br>";
           QFile f(_doc->file());
           if ( f.open(IO_ReadOnly) ) {
                         QTextStream t( &f );
                 while ( !t.eof() )
                                 text += t.readLine() + "<br>";
         }
           f.close();
     }
    /* text += "<br><br>`";
     text += _doc->exec();
     text += "`";*/
     QStringList list = _doc->mimeTypes();
    int i = 0;
     for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
             text += QString::number( i++) + " - " + *it ;
         }
     return text;
 }
 
 void DocLnkItem::action( int act )
 {
         qDebug("action %i",act);
         if (!_doc->isValid()) qDebug("INVALID");
         if (act == 0) _doc->execute();
         else if (act == 1){
                 QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)");
                 e << _doc->file();
         }
 }
 
 QIntDict<QString> DocLnkItem::actions()
 {
         QIntDict<QString> result;
         result.insert( 0, new QString( QObject::tr("open with ") + _doc->exec() ) );
         result.insert( 1, new QString( QObject::tr("open in filemanager") ) );
         return result;
 }
diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp
index c73dcbf..3f0d223 100644
--- a/core/pim/osearch/doclnksearch.cpp
+++ b/core/pim/osearch/doclnksearch.cpp
@@ -1,99 +1,98 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 
 
 #include "doclnkitem.h"
 #include "doclnksearch.h"
 
 #include <opie2/owait.h>
 
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 
 #include <qaction.h>
 #include <qfile.h>
-#include <qiconset.h>
 #include <qpopupmenu.h>
 #include <qtextstream.h>
 
 
 DocLnkSearch::DocLnkSearch(QListView* parent, QString name)
 : AppLnkSearch(parent, name), _popupMenu(0)
 {
         QIconSet is = Resource::loadIconSet( "osearch/documentsSmall" );
         setPixmap( 0, is.pixmap( QIconSet::Automatic, true ) );
 
         actionSearchInFiles = new QAction( QObject::tr("search content"),QString::null,  0, 0, 0, true );
         Config cfg( "osearch", Config::User );
            cfg.setGroup( "doclnk_settings" );
            actionSearchInFiles->setOn( cfg.readBoolEntry( "search_content", false ) );
 }
 
 
 DocLnkSearch::~DocLnkSearch()
 {
         Config cfg( "osearch", Config::User );
            cfg.setGroup( "doclnk_settings" );
            cfg.writeEntry( "search_content", actionSearchInFiles->isOn() );
 }
 
 void DocLnkSearch::load()
 {
         _apps = new DocLnkSet(QPEApplication::documentDir());
 }
 
 bool DocLnkSearch::searchFile( AppLnk *app )
 {
         if (!actionSearchInFiles->isOn()) return false;
         DocLnk *doc = (DocLnk*)app;
         bool found = false;
         if ( doc->type().contains( "text" ) ){
 #ifdef NEW_OWAIT
             QString ouput = QObject::tr("searching %1").arg(doc->file());
                 OWait( output );
 #endif
                   QFile f(doc->file());
                 if ( f.open(IO_ReadOnly) ) {
                                 QTextStream t( &f );
                         while ( !t.eof() )
                                         if (_search.match( t.readLine()) != -1) {
                                         found = true;
                                         break;
                                 }
                        }
                 f.close();
             }
         return found;
 }
 
 void DocLnkSearch::insertItem( void *rec )
 {
         (void)new DocLnkItem( this, (DocLnk*)rec );
         _resultCount++;
 }
 
 
 QPopupMenu* DocLnkSearch::popupMenu()
 {
         if (!_popupMenu){
                 _popupMenu = new QPopupMenu( 0 );
                 actionSearchInFiles->addTo( _popupMenu );
         }
         return _popupMenu;
         //(void) new DocLnkItem( this, (DocLnk*)rec );
                 // rec is undeclared here
 #warning  FIXME
         _resultCount++;
 }
diff --git a/core/pim/osearch/eventitem.cpp b/core/pim/osearch/eventitem.cpp
index f6e34fe..8dcfc70 100644
--- a/core/pim/osearch/eventitem.cpp
+++ b/core/pim/osearch/eventitem.cpp
@@ -1,86 +1,84 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "eventitem.h"
 
 
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
-#include <qdatetime.h>
-#include <qpixmap.h>
 
 EventItem::EventItem(OListViewItem* parent, OPimEvent *event)
  : ResultItem(parent)
 {
         _event = event;
         setText(0, _event->toShortText() );
         setIcon();
 }
 
 
 EventItem::~EventItem()
 {
 }
 
 
 QString EventItem::toRichText()
 {
     return _event->toRichText();
 }
 
 void EventItem::action( int act )
 {
         if (act == 0){
                 QCopEnvelope e("QPE/Application/datebook", "viewDefault(QDate)");
                 e << _event->startDateTime().date();
         }else if(act == 1){
                 QCopEnvelope e("QPE/Application/datebook", "editEvent(int)");
                 e << _event->uid();
         }
 }
 
 QIntDict<QString> EventItem::actions()
 {
         QIntDict<QString> result;
         result.insert( 0, new QString( QObject::tr("show") ) );
         result.insert( 1, new QString( QObject::tr("edit") ) );
         return result;
 }
 
 void EventItem::setIcon()
 {
         QPixmap icon;
         switch ( _event->lastHitField() ) {
         case -1:
                 icon = Resource::loadPixmap( "reset" );
         //      QWhatsThis::add( icon, QObject::tr("Enter your search terms here") );
                 break;
         case Qtopia::DatebookDescription:
                 icon = Resource::loadPixmap( "osearch/summary" );
                 break;
          case Qtopia::Notes:
                 icon = Resource::loadPixmap( "txt" );
                 break;
         case Qtopia::Location:
                 icon = Resource::loadPixmap( "home" );
                 break;
          case Qtopia::StartDateTime:
          case Qtopia::EndDateTime:
                 icon = Resource::loadPixmap( "osearch/clock" );
                 break;
         default:
                 icon = Resource::loadPixmap( "DocsIcon" );
                 break;
         }
         setPixmap( 0, icon );
 }
diff --git a/core/pim/osearch/main.cpp b/core/pim/osearch/main.cpp
index 9a03818..e0a2de3 100644
--- a/core/pim/osearch/main.cpp
+++ b/core/pim/osearch/main.cpp
@@ -1,7 +1,6 @@
 
 #include "mainwindow.h"
 
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index 95f5967..bfe95b0 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -1,317 +1,317 @@
 /***************************************************************************
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 
 
 #include "olistview.h"
 #include "olistviewitem.h"
 #include "resultitem.h"
 #include "adresssearch.h"
 #include "todosearch.h"
 #include "datebooksearch.h"
 #include "applnksearch.h"
 #include "doclnksearch.h"
 #include "mainwindow.h"
 
 #include <opie2/owait.h>
 
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
+
 #include <qpe/qpeapplication.h>
-#include <qpe/config.h>
 #include <qpe/global.h>
 
 #include <qtoolbar.h>
 #include <qaction.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qtoolbutton.h>
 #include <qstring.h>
 #include <qlabel.h>
 #include <qfile.h>
 #include <qhbuttongroup.h>
 #include <qhbox.h>
 #include <qpushbutton.h>
 #include <qintdict.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qsignalmapper.h>
 #include <qtextbrowser.h>
 #include <qregexp.h>
 #include <qwhatsthis.h>
 #include <qmenubar.h>
 
 
 
 static const char* const image1_data[] = {
 "14 14 3 1",
 ". c None",
 "# c #000000",
 "a c #ff0000",
 "..............",
 "..##.......###",
 ".#aa#....##aa#",
 "#aaaa#.##aaaa#",
 ".##aaa#aaaaa##",
 "...#aaaaaaa#..",
 "....#aaaaa#...",
 "...#aaaaa#....",
 "..#aaaaaaa#...",
 ".#aaaaaaaaa#..",
 "#aaaa###aaaa#.",
 "#aaa#..##aaa#.",
 "#aaa#...#aa#..",
 ".###.....##..."};
 
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   QMainWindow( parent, name, f ), _currentItem(0)
 {
   setCaption( tr("OSearch") );
 
   setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
 
   QFrame *mainFrame = new QFrame( this, "mainFrame" );
   mainFrame->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
 
   mainLayout = new QVBoxLayout( mainFrame );
   mainLayout->setSpacing( 0 );
   mainLayout->setMargin( 3 );
 
   resultsList = new OListView( mainFrame );
   resultsList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
   mainLayout->addWidget( resultsList );
 
   detailsFrame = new QFrame( mainFrame, "detailsFrame" );
   QVBoxLayout *detailsLayout = new QVBoxLayout( detailsFrame );
   richEdit = new QTextView( detailsFrame );
   QWhatsThis::add( richEdit, tr("The details of the current result") );
   richEdit->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
   detailsLayout->addWidget( richEdit );
 
   buttonBox = new QHBox( mainFrame, "Button Box" );
 
   _buttonCount = 0;
 
   mainLayout->addWidget( detailsFrame );
   mainLayout->addWidget( buttonBox );
   detailsFrame->hide();
   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( 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();
                 //resultsList->repaint();
         }
 }
 
 void MainWindow::slotAction( int act )
 {
         if ( _currentItem && _currentItem->rtti() == OListViewItem::Result){
                 ResultItem *res = (ResultItem*)_currentItem;
         //      ResultItem *res = dynamic_cast<ResultItem*>(item);
                 res->action(act);
         }
 }
 
 void MainWindow::optionChanged(int )
 {
         searchStringChanged();
 }
diff --git a/core/pim/osearch/olistview.cpp b/core/pim/osearch/olistview.cpp
index 7a7cb26..8fbb31d 100644
--- a/core/pim/osearch/olistview.cpp
+++ b/core/pim/osearch/olistview.cpp
@@ -1,40 +1,39 @@
 /***************************************************************************
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
   // (c) 2002 Patrick S. Vogtp <tille@handhelds.org>
 
 #include "olistview.h"
 #include "olistviewitem.h"
 
 #include <qpe/qpeapplication.h>
 
-#include <qmessagebox.h>
 
 
 OListView::OListView(QWidget *parent, const char *name )
   : QListView(parent,name)
 {
 
         setRootIsDecorated( true );
         addColumn(tr("Results"),qApp->desktop()->width() - 9 );
         //setColumnWidthMode(0, Manual);
 
         setSorting( -1 );
          connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*)));
 }
 
 
 OListView::~OListView()
 {
 }
 
 void OListView::expand(QListViewItem *item)
 {
          ((OListViewItem*)item)->expand();
 }
 
diff --git a/core/pim/osearch/resultitem.cpp b/core/pim/osearch/resultitem.cpp
index f051b12..41c22c0 100644
--- a/core/pim/osearch/resultitem.cpp
+++ b/core/pim/osearch/resultitem.cpp
@@ -1,27 +1,26 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "resultitem.h"
 
 
-#include <qmessagebox.h>
 
 ResultItem::ResultItem(OListViewItem* parent)
 : OListViewItem(parent)
 {
 
 }
 
 
 ResultItem::~ResultItem()
 {
 }
diff --git a/core/pim/osearch/searchgroup.cpp b/core/pim/osearch/searchgroup.cpp
index 5377b9f..7a0b5a7 100644
--- a/core/pim/osearch/searchgroup.cpp
+++ b/core/pim/osearch/searchgroup.cpp
@@ -1,92 +1,89 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include "olistviewitem.h"
 #include "searchgroup.h"
 
 #include <opie2/owait.h>
 
-#include <qobject.h>
-#include <qregexp.h>
 #include <qapplication.h>
 
 #ifndef NEW_OWAIT
 static OWait *wait = 0;
 #endif
 
 SearchGroup::SearchGroup(QListView* parent, QString name)
 : OListViewItem(parent, name)
 {
         _name = name;
         loaded = false;
 }
 
 
 SearchGroup::~SearchGroup()
 {
 }
 
 
 void SearchGroup::expand()
 {
         //expanded = true;
         if (_lastSearch != _search) clearList();
         if (_search.isEmpty()) return;
         OListViewItem *dummy = new OListViewItem( this, "searching...");
         setOpen( true );
         repaint();
         int res_count = realSearch();
         setText(0, _name + " - " + _search.pattern() + " (" + QString::number( res_count ) + ")");
         delete dummy;
         repaint();
 }
 
 void SearchGroup::doSearch()
 {
         clearList();
         if (_search.isEmpty()) return;
         _resultCount = realSearch();
         //repaint();
 }
 
 void SearchGroup::setSearch(QRegExp re)
 {
         if (re == _search) return;
         setText(0, _name+" - "+re.pattern() );
         _search = re;
         if (isOpen()) expand();
         else new OListViewItem( this, "searching...");
 }
 
 int SearchGroup::realSearch()
 {
         if (_lastSearch == _search) return _resultCount;
 #ifndef NEW_OWAIT
         if (!wait) wait = new OWait( qApp->mainWidget(), "osearch" );
         wait->show();
         qApp->processEvents();
 #else
         qDebug("********** NEW_OWAIT *************");
         OWait( "searching" );
 #endif
         if (!loaded) load();
         _resultCount = 0;
         _resultCount = search();
         _lastSearch = _search;
         setText(0, _name + " - " + _search.pattern() + " (" + QString::number( _resultCount ) + ")");
 
 #ifndef NEW_OWAIT
         wait->hide();
 #endif
         return _resultCount;
 }
 
diff --git a/core/pim/osearch/todoitem.cpp b/core/pim/osearch/todoitem.cpp
index c20f1fd..be780a1 100644
--- a/core/pim/osearch/todoitem.cpp
+++ b/core/pim/osearch/todoitem.cpp
@@ -1,83 +1,82 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "todoitem.h"
 
 
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
-#include <qpixmap.h>
 
 
 TodoItem::TodoItem(OListViewItem* parent, OPimTodo *todo)
 : ResultItem(parent)
 {
         _todo = todo;
         setText( 0, todo->toShortText() );
         setIcon();
 }
 
 TodoItem::~TodoItem()
 {
         delete _todo;
 }
 
 QString TodoItem::toRichText()
 {
         return _todo->toRichText();
 }
 
 void TodoItem::action( int act )
 {
         if (act == 0){
                 QCopEnvelope e("QPE/Application/todolist", "show(int)");
                 e << _todo->uid();
         }else if (act == 1){
                 QCopEnvelope e("QPE/Application/todolist", "edit(int)");
                 e << _todo->uid();
         }
 }
 
 QIntDict<QString> TodoItem::actions()
 {
         QIntDict<QString> result;
         result.insert( 0, new QString( QObject::tr("show") ) );
         result.insert( 1, new QString( QObject::tr("edit") ) );
         return result;
 }
 
 void TodoItem::setIcon()
 {
         QPixmap icon;
         switch ( _todo->lastHitField() ) {
         case -1:
                 icon = Resource::loadPixmap( "reset" );
                 break;
         case OPimTodo::Description:
                 icon = Resource::loadPixmap( "txt" );
                 break;
          case OPimTodo::Summary:
                 icon = Resource::loadPixmap( "osearch/summary" );
                 break;
         case OPimTodo::Priority:
                 icon = Resource::loadPixmap( "todo/priority1" );
                 break;
          case OPimTodo::HasDate:
                 icon = Resource::loadPixmap( "osearch/clock" );
                 break;
         default:
                 icon = Resource::loadPixmap( "DocsIcon" );
                 break;
         }
         setPixmap( 0, icon );
 }
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp
index 5042803..cdf3a1c 100644
--- a/core/pim/osearch/todosearch.cpp
+++ b/core/pim/osearch/todosearch.cpp
@@ -1,80 +1,79 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "todosearch.h"
 #include "todoitem.h"
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
-#include <qiconset.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 
 
 TodoSearch::TodoSearch(QListView* parent, QString name)
 : SearchGroup(parent, name), _todos(0), _popupMenu(0)
 {
         //AppLnkSet als(QPEApplication::qpeDir());
         //setPixmap( 0, als.findExec("todolist")->pixmap() );
         QIconSet is = Resource::loadIconSet( "todo/TodoListSmall" );
         setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
         actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null,  0, 0, 0, true );
         Config cfg( "osearch", Config::User );
            cfg.setGroup( "todo_settings" );
            actionShowCompleted->setOn( cfg.readBoolEntry( "show_completed_tasks", false ) );
 
 }
 
 
 TodoSearch::~TodoSearch()
 {
         Config cfg( "osearch", Config::User );
            cfg.setGroup( "todo_settings" );
            cfg.writeEntry( "show_completed_tasks", actionShowCompleted->isOn() );
         delete _popupMenu;
         delete actionShowCompleted;
         delete _todos;
 }
 
 
 void TodoSearch::load()
 {
          _todos = new OPimTodoAccess();
          _todos->load();
 }
 
 int TodoSearch::search()
 {
         OPimRecordList<OPimTodo> results = _todos->matchRegexp(_search);
         for (uint i = 0; i < results.count(); i++)
                 insertItem( new OPimTodo( results[i] ));
         return _resultCount;
 }
 
 void TodoSearch::insertItem( void *rec )
 {
         OPimTodo *todo = (OPimTodo*)rec;
         if (!actionShowCompleted->isOn() &&
                 todo->isCompleted() ) return;
         (void)new TodoItem( this, todo );
         _resultCount++;
 }
 
 QPopupMenu* TodoSearch::popupMenu()
 {
         if (!_popupMenu){
                 _popupMenu = new QPopupMenu( 0 );
                 actionShowCompleted->addTo( _popupMenu );
         }
         return _popupMenu;
 }
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index b55a4a7..72cdfd6 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -1,408 +1,407 @@
 /*
  * 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/global.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 &) ),
               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();
         TodayLabel->hide();
     } else {
         Opiezilla->show();
         TodayLabel->show();
     }
 
     if ( m_big_box ) {
         delete m_big_box;
     }
 
     m_big_box = new QWidget( m_sv->viewport() );
     m_sv->addChild( m_big_box );
     m_bblayout = new QVBoxLayout ( m_big_box );
 }
 
 /**
  * Load the plugins
  */
 void Today::loadPlugins() {
 
     init();
 
     QValueList<TodayPlugin>::Iterator tit;
     if ( !pluginList.isEmpty() ) {
         for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) {
             (*tit).guiBox->hide();
             (*tit).guiBox->reparent( 0, QPoint( 0, 0 ) );
             delete (*tit).guiBox;
             (*tit).library->unload();
             delete (*tit).library;
         }
         pluginList.clear();
     }
 
     QString path = QPEApplication::qpeDir() + "/plugins/today";
 #ifdef Q_OS_MACX
     qWarning("Searching for Plugins in: %s", path.latin1());
     QDir dir( path, "lib*.dylib" );
 #else
     QDir dir( path, "lib*.so" );
 #endif
 
     QStringList list = dir.entryList();
     QStringList::Iterator it;
 
     //   QMap<QString, TodayPlugin> tempList;
 
     for ( it = list.begin(); it != list.end(); ++it ) {
         QInterfacePtr<TodayPluginInterface> iface;
         QLibrary *lib = new QLibrary( path + "/" + *it );
 
         qDebug( "querying: %s", QString( path + "/" + *it ).latin1() );
         if ( lib->queryInterface( IID_TodayPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) {
             qDebug( "accepted: %s", QString( path + "/" + *it ).latin1() );
             qDebug( QString(*it) );
 
             TodayPlugin plugin;
             plugin.library = lib;
             plugin.iface = iface;
             plugin.name = QString(*it);
 
             QString type = (*it).left( (*it).find(".") );
 
             QString lang;
             Config config("locale");
             config.setGroup("Language");
             lang = config.readEntry( "Language", "en" );
 
             qDebug( "Languages: " + lang );
             QTranslator * trans = new QTranslator( qApp );
             QString tfn = QPEApplication::qpeDir()+"/i18n/" + lang + "/" + type + ".qm";
             if ( trans->load( tfn ) )  {
                 qApp->installTranslator( trans );
             }  else {
                 delete trans;
             }
 
 
             // find out if plugins should be shown
             if ( m_excludeApplets.grep( *it ).isEmpty() ) {
                 plugin.active = true;
             } else {
                 plugin.active = false;
             }
 
             plugin.guiPart = plugin.iface->guiPart();
             plugin.excludeRefresh = plugin.guiPart->excludeFromRefresh();
 
             // package the whole thing into a qwidget so it can be shown and hidden
             plugin.guiBox = new QWidget( m_big_box );
             QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox );
             QPixmap plugPix;
             plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( m_iconSize, m_iconSize ), 0 );
             OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox );
             plugIcon->setPixmap( plugPix );
             QWhatsThis::add( plugIcon, tr("Click here to launch the associated app") );
             plugIcon->setName( plugin.guiPart->appName() );
             connect( plugIcon, SIGNAL( clicked() ), this, SLOT( startApplication() ) );
 
             QWidget *plugWidget = plugin.guiPart->widget( plugin.guiBox );
             boxLayout->addWidget( plugIcon, 0, AlignTop );
             boxLayout->addWidget( plugWidget, 0, AlignTop );
             boxLayout->setStretchFactor( plugIcon, 1 );
             boxLayout->setStretchFactor( plugWidget, 9 );
 
            // "prebuffer" it in one more list, to get the sorting done
             tempList.insert( plugin.name, plugin );
 
             // on first start the list is off course empty
             if ( m_allApplets.isEmpty() ) {
                 pluginList.append( plugin );
                 m_bblayout->addWidget( plugin.guiBox );
             }
 
             // if plugin is not yet in the list, add it to the layout too
             else if ( !m_allApplets.contains( plugin.name ) ) {
                 pluginList.append( plugin );
             }
         } else {
             qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() );
             delete lib;
         }
 
     }
 
 
     if ( !m_allApplets.isEmpty() ) {
         TodayPlugin tempPlugin;
         QStringList::Iterator stringit;
 
         for( stringit = m_allApplets.begin(); stringit !=  m_allApplets.end(); ++stringit ) {
             tempPlugin = ( tempList.find( *stringit ) ).data();
             if ( !( (tempPlugin.name).isEmpty() ) ) {
                 pluginList.append( tempPlugin );
                 m_bblayout->addWidget( tempPlugin.guiBox );
             }
         }
     }
     m_bblayout->addStretch( 2 );
     draw();
 }
 
 
 
 
 /**
  * Repaint method. Reread all fields.
  */
 void Today::draw() {
 
     if ( pluginList.count() == 0 ) {
         QLabel *noPlugins = new QLabel( this );
         noPlugins->setText( tr( "No plugins found" ) );
         layout->addWidget( noPlugins );
         return;
     }
 
     uint count = 0;
     TodayPlugin plugin;
     for ( uint i = 0; i < pluginList.count(); i++ ) {
         plugin = pluginList[i];
 
         if ( plugin.active ) {
             //   qDebug( plugin.name + " is ACTIVE " );
             plugin.guiBox->show();
         } else {
             //  qDebug( plugin.name + " is INACTIVE" );
             plugin.guiBox->hide();
         }
         count++;
     }
 
     if ( count == 0 ) {
         QLabel *noPluginsActive = new QLabel( this );
         noPluginsActive->setText( tr( "No plugins activated" ) );
         layout->addWidget( noPluginsActive );
     }
     repaint();
 }
 
 
 /**
  * The method for the configuration dialog.
  */
 void Today::startConfig() {
 
     // disconnect timer to prevent problems while being on config dialog
     disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
     m_refreshTimer->stop( );
 
     TodayConfig conf( this, "dialog", true );
 
     TodayPlugin plugin;
     QList<TodayConfigWidget> configWidgetList;
 
     for ( int i = pluginList.count() - 1; i >= 0; i-- ) {
         plugin = pluginList[i];
 
         // load the config widgets in the tabs
         if ( plugin.guiPart->configWidget( this ) != 0l ) {
             TodayConfigWidget* widget = plugin.guiPart->configWidget( conf.TabWidget3  );
             configWidgetList.append( widget );
             conf.TabWidget3->addTab( widget, plugin.guiPart->pixmapNameConfig()
                                      , plugin.guiPart->appName() );
         }
         // set the order/activate tab
         conf.pluginManagement( plugin.name, plugin.guiPart->pluginName(),
                               Resource::loadPixmap( plugin.guiPart->pixmapNameWidget() ) );
     }
 
     if ( conf.exec() == QDialog::Accepted ) {
         conf.writeConfig();
         TodayConfigWidget *confWidget;
         for ( confWidget = configWidgetList.first(); confWidget != 0;
               confWidget = configWidgetList.next() ) {
             confWidget->writeConfig();
         }
 
         // make the plugins to reinitialize ( reread its configs )
         reinitialize();
         draw();
 
     } else {
         // since refresh is not called in that case , reconnect the signal
         m_refreshTimer->start( 15000 ); // get the config value in here later
         connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
     }
 }
 
 
 
 void Today::reinitialize()  {
 
     Config cfg( "today" );
     cfg.setGroup( "Plugins" );
     m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
     m_allApplets = cfg.readListEntry( "AllApplets", ',' );
 
     /* reinitialize all plugins */
     QValueList<TodayPlugin>::Iterator it;
     for ( it = pluginList.begin(); it != pluginList.end(); ++it ) {
         if ( !(*it).excludeRefresh ) {
             (*it).guiPart->reinitialize();
             qDebug( "reinit" );
         }
 
         /* check if plugins is still to be shown */
         if ( m_excludeApplets.grep( (*it).name ).isEmpty() ) {
             (*it).active = true;
         } else {
             (*it).active = false;
         }
 
     }
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index 0613f2c..b68aad2 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -1,439 +1,433 @@
 /*
                =.            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 <unistd.h>
 
 #include <opie2/opimrecurrence.h>
 #include <opie2/opimnotifymanager.h>
 #include <opie2/otodoaccessvcal.h>
 #include <opie2/oapplicationfactory.h>
 
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/ir.h>
 #include <qpe/resource.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/alarmserver.h>
-#include <qpe/timestring.h>
 #include <qpe/qpeapplication.h>
 
 #include <qmenubar.h>
 #include <qmessagebox.h>
-#include <qtoolbar.h>
-#include <qpopupmenu.h>
 #include <qpushbutton.h>
-#include <qwidgetstack.h>
 #include <qaction.h>
 #include <qtimer.h>
-#include <qvbox.h>
 #include <qlayout.h>
-#include <qlineedit.h>
 #include <qwhatsthis.h>
 
 #include "quickeditimpl.h"
 #include "todotemplatemanager.h"
 #include "templateeditor.h"
 #include "tableview.h"
 
 #include "textviewshow.h"
 #include "todoeditor.h"
 #include "mainwindow.h"
 
 OPIE_EXPORT_APP( OApplicationFactory<Todo::MainWindow> )
 
 using namespace Todo;
 
 MainWindow::MainWindow( QWidget* parent,
                         const char* name, WFlags )
     : OPimMainWindow( "Todolist", parent, name, WType_TopLevel | WStyle_ContextHelp )
 {
     if (!name)
         setName("todo window");
 
     m_syncing = false;
     m_showing = false;
     m_counter = 0;
     m_tempManager = new TemplateManager();
     m_tempManager->load();
 
     initUI();
     initConfig();
     initViews();
     initActions();
     initEditor();
     initShow();
     initTemplate();
 
     populateTemplates();
     raiseCurrentView();
     QTimer::singleShot(0, this, SLOT(populateCategories() ) );
 }
 void MainWindow::initTemplate() {
     m_curTempEd = new TemplateEditor( this, templateManager() );
 }
 void MainWindow::initActions() {
 
     // Data menu
     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 ) ) );
 
     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
      */
     if ( recur ) {
         ; // FIXME
     }
 
     return menu;
 }
 QPopupMenu* MainWindow::options() {
     qWarning("Options");
     return m_options;
 }
 QPopupMenu* MainWindow::edit() {
     return m_edit;
 }
 QToolBar* MainWindow::toolbar() {
     return m_tool;
 }
 OPimTodoAccess::List MainWindow::list()const {
     return m_todoMgr.list();
 }
 OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) {
     int cat = 0;
     if ( m_curCat != QWidget::tr("All Categories") )
         cat = currentCatId();
     if ( m_curCat == QWidget::tr("Unfiled") )
         cat = -1;
 
     qWarning(" Category %d %s",  cat, m_curCat.latin1() );
 
     int filter = 1;
 
     if (!m_completed )
         filter |= 4;
     if (m_overdue)
         filter |= 2;
 
     return m_todoMgr.sorted( asc, sortOrder, filter, cat );
 }
 OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder, int addFilter) {
     int cat = 0;
     if ( m_curCat != QWidget::tr("All Categories") )
         cat = currentCatId();
 
     if ( m_curCat == QWidget::tr("Unfiled") )
         cat = -1;
 
     return m_todoMgr.sorted(asc, sortOrder, addFilter,  cat );
 }
 OPimTodo MainWindow::event( int uid ) {
     return m_todoMgr.event( uid );
 }
 bool MainWindow::isSyncing()const {
     return m_syncing;
 }
 TemplateManager* MainWindow::templateManager() {
     return m_tempManager;
 }
 Editor* MainWindow::currentEditor() {
     return m_curEdit;
 }
 TodoShow* MainWindow::currentShow() {
     return m_curShow;
 }
 void MainWindow::slotReload() {
     m_syncing = FALSE;
     m_todoMgr.reload();
     currentView()->updateView( );
     raiseCurrentView();
 }
 void MainWindow::closeEvent( QCloseEvent* e ) {
     if (m_stack->visibleWidget() == currentShow()->widget() ) {
         m_showing = false;
         raiseCurrentView();
         e->ignore();
         return;
     }
     /*
      * we should have flushed and now we're still saving
      * so there is no need to flush
      */
     if (m_syncing ) {
         e->accept();
         return;
     }
     bool quit = false;
     if ( m_todoMgr.saveAll() ){
         qWarning("saved");
         quit = true;
     }else {
         if ( QMessageBox::critical( this, QWidget::tr("Out of space"),
                                     QWidget::tr("Todo was unable\n"
                                        "to save your changes.\n"
                                        "Free up some space\n"
                                        "and try again.\n"
                                        "\nQuit Anyway?"),
                                     QMessageBox::Yes|QMessageBox::Escape,
                                     QMessageBox::No|QMessageBox::Default)
              != QMessageBox::No ) {
             e->accept();
             quit = true;
         }else
             e->ignore();
 
     }
 
     if (quit ) {
         Config config( "todo" );
         config.setGroup( "View" );
         config.writeEntry( "ShowComplete", showCompleted() );
         config.writeEntry( "Category", currentCategory() );
         config.writeEntry( "ShowDeadLine", showDeadline());
         config.writeEntry( "ShowOverDue", showOverDue() );
         config.writeEntry( "ShowQuickTask", showQuickTask() );
         /* save templates */
         templateManager()->save();
         e->accept();
         QTimer::singleShot(0, qApp, SLOT(closeAllWindows()) );
     }
 }
 void MainWindow::populateTemplates() {
     m_template->clear();
     QStringList list = templateManager()->templates();
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         m_template->insertItem( (*it) );
     }
 }
 /*
  * slotNewFromTemplate
  * We use the edit widget to do
  * the config but we setUid(1)
  * to get a new uid
  */
 /*
  * first we get the name of the template
  * then we will use the TemplateManager
  */
 void MainWindow::slotNewFromTemplate( int id ) {
     QString name = m_template->text( id );
 
     OPimTodo event = templateManager()->templateEvent( name );
     event = currentEditor()->edit(this,
                                   event );
 
     if ( currentEditor()->accepted() ) {
         /* assign new todo */