1 files changed, 1 insertions, 0 deletions

diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 124ff6c..e9e6a0b 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -1,222 +1,223 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_CONTACT_MRE
 
 #include <qpe/categoryselect.h>
 #include <qpe/config.h>
 #include <qpe/stringutil.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qasciidict.h>
 #include <qdatetime.h>
 #include <qfile.h>
+#include <qregexp.h>
 
 #include "abtable.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 
 #include <ctype.h> //toupper() for key hack
 
 static bool contactCompare( const Contact &cnt, const QRegExp &r, int category );
 
 //### qtmail/addresslist.cpp hardcodes this filename as well
 static QString journalFileName()
 {
     QString str = getenv("HOME");
     str +="/.abjournal";
     return str;
 }
 
 
 
 /*!
   \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 );
 }
 
 /*!
   \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 )
 // #ifdef QT_QTABLE_NOHEADER_CONSTRUCTOR
 //     : QTable( 0, 0, parent, name, TRUE ),
 // #else
     : QTable( parent, name ),
 // #endif
       lastSortCol( -1 ),
       asc( TRUE ),
       intFields( order ),
       currFindRow( -2 ),
       mCat( 0 )
 {
     mCat.load( categoryFileName() );
     setSelectionMode( NoSelection );
     init();
     setSorting( TRUE );
     connect( this, SIGNAL(clicked(int,int,int,const QPoint &)),
              this, SLOT(itemClicked(int,int)) );
 }
 
 AbTable::~AbTable()
 {
 }
 
 void AbTable::init()
 {
     showChar = '\0';
     setNumRows( 0 );
     setNumCols( 2 );
 
     horizontalHeader()->setLabel( 0, tr( "Full Name" ));
     horizontalHeader()->setLabel( 1, tr( "Contact" ));
     setLeftMargin( 0 );
     verticalHeader()->hide();
 }
 
 void AbTable::columnClicked( int col )
 {
     if ( !sorting() )
 	return;
 
     if ( lastSortCol == -1 )
 	lastSortCol = col;
 
     if ( col == lastSortCol ) {
 	asc = !asc;
     } else {
 	lastSortCol = col;
 	asc = TRUE;
     }
     resort();
 }
 
 void AbTable::resort()
 {
     if ( sorting() ) {
 	if ( lastSortCol == -1 )
 	    lastSortCol = 0;
 	sortColumn( lastSortCol, asc, TRUE );
 	updateVisible();
     }
 }
 
 Contact AbTable::currentEntry()
 {
     Contact cnt;
     AbTableItem *abItem;
     abItem = static_cast<AbTableItem*>(item( currentRow(), 0 ));
     if ( abItem ) {
 	cnt = contactList[abItem];
     }
     return cnt;
 }
 
 void AbTable::replaceCurrentEntry( const Contact &newContact )
 {
     int row = currentRow();
     updateJournal( newContact, Contact::ACTION_REPLACE, row );
     updateVisible();
 
     journalFreeReplace( newContact, row );
 }
 
 void AbTable::deleteCurrentEntry()
 {
     int row = currentRow();
     AbTableItem *abItem;
     abItem = static_cast<AbTableItem*>(item( row, 0 ));
     Contact oldContact;
     oldContact = contactList[abItem];
     updateJournal( oldContact, Contact::ACTION_REMOVE, row );
 
     // a little wasteful, but it ensure's there is only one place
     // where we delete.
     journalFreeRemove( row );
     updateVisible();