usbaility updates

3 files changed, 208 insertions, 179 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index beb953a..8229212 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -187,15 +187,15 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 				 "neccessary startup files.\n"
 				 "\nFree up some space before\nentering data!")
 			      );
     }
 
     listContainer = new QWidget( this );
-    
+
     QVBoxLayout *vb = new QVBoxLayout( listContainer );
-    
+
     abList = new AbTable( &orderedFields, listContainer, "table" );
     vb->addWidget(abList);
     abList->setHScrollBarMode( QScrollView::AlwaysOff );
     connect( abList, SIGNAL( empty( bool ) ),
 	     this, SLOT( listIsEmpty( bool ) ) );
     connect( abList, SIGNAL( details() ),
@@ -230,13 +230,13 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
     fontMenu->insertItem(tr( "Normal" ), 1);
     fontMenu->insertItem(tr( "Large" ), 2);
 
     defaultFont = new QFont( abList->font() );
 
     slotSetFont(startFontSize);
-		    
+
     mbList->insertItem( tr("Font"), fontMenu);
     setCentralWidget(listContainer);
 
     //    qDebug("adressbook contrsuction: t=%d", t.elapsed() );
 }
 void AddressbookWindow::slotSetFont( int size ) {
@@ -244,13 +244,13 @@ void AddressbookWindow::slotSetFont( int size ) {
 	if (size > 2 || size < 0)
 		size = 1;
 
 	startFontSize = size;
 
 	QFont *currentFont;
-	
+
 	switch (size) {
 		case 0:
 			fontMenu->setItemChecked(0, true);
 			fontMenu->setItemChecked(1, false);
 			fontMenu->setItemChecked(2, false);
 			abList->setFont( QFont( defaultFont->family(), defaultFont->pointSize() - 2 ) );
@@ -468,13 +468,13 @@ static void parseName( const QString& name, QString *first, QString *middle,
     if ( space <= 0 ) {
 	*first = rest;
     } else {
 	*first = rest.left( space );
 	*middle = rest.mid( space+1 );
     }
-	
+
 }
 
 
 void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 {
     if (msg == "editPersonal()") {
@@ -500,13 +500,13 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 
 	if ( bAbEditFirstTime ) {
 	    abEditor = new ContactEditor( cnt, &orderedFields, &slOrderedFields,
 				     this, "editor" );
 	    bAbEditFirstTime = FALSE;
 	} else {
-	    abEditor->setEntry( cnt );	
+	    abEditor->setEntry( cnt );
 	}
 	abView()->init( cnt );
 	editEntry( NewEntry );
 
 
 
@@ -791,13 +791,13 @@ void AddressbookWindow::initFields()
 	    }
 	    slOrderedFields.append( zn );
 	    zn = cfg.readEntry( "Category" + QString::number(++i), QString::null );
 	}
 	cfg.setGroup( "Font" );
 	startFontSize = cfg.readNumEntry( "fontSize", 1 );
-	
+
 
     } else {
 	QString str;
 	str = getenv("HOME");
 	str += "/Settings/AddressBook.conf";
 	QFile::remove( str );
@@ -856,20 +856,20 @@ AbLabel *AddressbookWindow::abView()
 
 void AddressbookWindow::slotFind()
 {
 #ifndef MAKE_FOR_SHARP_ROM
     if ( centralWidget() == abView() )
 	showList();
-    
+
     FindDialog frmFind( "Contacts", this );
     QObject::connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)), abList, SLOT(slotDoFind( const QString&,bool,bool,int)));
     QObject::connect( abList, SIGNAL(signalNotFound()), &frmFind, SLOT(slotNotFound()) );
     QObject::connect( abList, SIGNAL(signalWrapAround()), &frmFind, SLOT(slotWrapAround()) );
-    
+
     frmFind.exec();
-    
+
     if ( abList->numSelections() )
 	abList->clearSelection();
 
     abList->clearFindRow();
 #endif
 }
@@ -903,12 +903,13 @@ void AddressbookWindow::populateCategories()
 {
     catMenu->clear();
 
     int id,
 	rememberId;
     id = 1;
+    rememberId = 0;
     catMenu->insertItem( tr( "All" ), id++ );
     QStringList categories = abList->categories();
     categories.append( tr( "Unfiled" ) );
     for ( QStringList::Iterator it = categories.begin();
 	  it != categories.end(); ++it ) {
 	catMenu->insertItem( *it, id );
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index e74da87..fa60f98 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -54,15 +54,15 @@ ContactEditor::ContactEditor(	const Contact &entry,
 				QStringList *slNewOrdered,
 				QWidget *parent,
 				const char *name,
 				WFlags fl )
 	: QDialog( parent, name, TRUE, fl ),
 	  orderedValues( newOrderedValues ),
-	  slOrdered( slNewOrdered )
+	  slOrdered( *slNewOrdered )
 {
-	
+
 	init();
 	initMap();
 	setEntry( entry );
 	qDebug("finish");
 }
 
@@ -71,25 +71,25 @@ ContactEditor::~ContactEditor() {
 
 void ContactEditor::init() {
 
 	useFullName = TRUE;
 
 	int i = 0;
-
+/** SHut up and stop leaking
 	slHomeAddress = new QStringList;
 	slBusinessAddress = new QStringList;
 	slChooserNames = new QStringList;
 	slChooserValues = new QStringList;
 
 	slDynamicEntries = new QStringList;
-
+*/
 	//*slDynamicEntries = *slOrdered;
 
 	for (i = 0; i <= 6; i++) {
-		slHomeAddress->append( "" );
-		slBusinessAddress->append( "" );
+		slHomeAddress.append( "" );
+		slBusinessAddress.append( "" );
 	}
 
 	{
 		hasGender = FALSE;
 		hasTitle = FALSE;
 		hasCompany = FALSE;
@@ -98,182 +98,182 @@ void ContactEditor::init() {
 		hasStreet2 = FALSE;
 		hasPOBox = FALSE;
 		hasCity = FALSE;
 		hasState = FALSE;
 		hasZip = FALSE;
 		hasCountry = FALSE;
-		
-		QStringList::ConstIterator it = slOrdered->begin();
-		for ( i = 0; it != slOrdered->end(); i++, ++it ) {
+
+		QStringList::ConstIterator it = slOrdered.begin();
+		for ( i = 0; it != slOrdered.end(); i++, ++it ) {
 
 			if ( (*it).right( 3 ) == tr( "Fax" ) ) {
-				slChooserNames->append( *it );
-				slChooserValues->append( tr( "" ) );
+				slChooserNames.append( *it );
+				slChooserValues.append("" );
 				//slDynamicEntries->remove( it );
 				continue;
 			}
 
 			if ( (*it).right( 5 ) == tr( "Phone" ) ) {
-				slChooserNames->append( *it );
-				slChooserValues->append( "" );
+				slChooserNames.append( *it );
+				slChooserValues.append( "" );
 				//slDynamicEntries->remove( it );
 				continue;
 			}
 
 			if ( (*it).right( 2 ) == tr( "IM" ) ) {
-				slChooserNames->append( *it );
-				slChooserValues->append( ""  );
+				slChooserNames.append( *it );
+				slChooserValues.append( ""  );
 				//slDynamicEntries->remove( it );
 				continue;
 			}
 
 			if ( (*it).right( 6 ) == tr( "Mobile" ) ) {
-				slChooserNames->append( *it );
-				slChooserValues->append( "" );
+				slChooserNames.append( *it );
+				slChooserValues.append( "" );
 				//slDynamicEntries->remove( it );
 				continue;
 			}
 
 			if ( (*it).right( 4 ) == tr( "Page" ) ) {
-				slChooserNames->append( *it );
-				slChooserValues->append( "" );
+				slChooserNames.append( *it );
+				slChooserValues.append( "" );
 				//slDynamicEntries->remove( it );
 				continue;
 			}
 
 			if ( (*it).right( 5 ) == tr( "Pager" ) ) {
-				slChooserNames->append( *it );
-				slChooserValues->append( "" );
+				slChooserNames.append( *it );
+				slChooserValues.append( "" );
 				//slDynamicEntries->remove( it );
 				continue;
 			}
 
 			if ( *it == tr( "Default Email" ) ) {
-				slChooserNames->append( *it );
-				slChooserValues->append( "" );
+				slChooserNames.append( *it );
+				slChooserValues.append( "" );
 				//slDynamicEntries->remove( it );
 				continue;
 			}
 
 			if ( *it == tr( "Emails" ) ) {
-				slChooserNames->append( *it );
-				slChooserValues->append( "" );
+				slChooserNames.append( *it );
+				slChooserValues.append( "" );
 				//slDynamicEntries->remove( it );
 				continue;
 			}
 
 			if ( *it == tr( "Name Title" ) ) {
 				//slDynamicEntries->remove( it );
 				continue;
 			}
-	
+
 			if ( *it == tr( "First Name" ) ) {
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
-			
+
 			if ( *it == tr( "Middle Name" ) ) {
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
-			
+
 			if ( *it == tr( "Last Name" ) ) {
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
-	
+
 			if ( *it == tr( "Suffix" ) ) {
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
 
 			if ( *it == tr( "File As" ) ) {
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
-	
+
 			if ( *it == tr( "Gender" ) ) {
 				hasGender = TRUE;
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
-	
+
 			if ( *it == tr( "Job Title" ) ) {
 				hasTitle = TRUE;
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
-	
+
 			if ( *it == tr( "Company" ) ) {
 				hasCompany = TRUE;
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
-	
+
 			if ( *it == tr( "Notes" ) ) {
 				hasNotes = TRUE;
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
-	
+
 			if ( *it == tr( "Groups" ) ) {
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
-	
+
 			if ( (*it).right( 6 ) == tr( "Street" ) ) {
 				hasStreet = TRUE;
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
-	
+
 			if ( (*it).right( 8 ) == tr( "Street 2" ) ) {
 				hasStreet2 = TRUE;
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
-	
+
 			if ( (*it).right( 8 ) == tr( "P.O. Box" ) ) {
 				hasPOBox = TRUE;
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
-	
+
 			if ( (*it).right( 4 ) == tr( "City" ) ) {
 				hasCity = TRUE;
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
-	
+
 			if ( (*it).right( 5 ) == tr( "State" ) ) {
 				hasState = TRUE;
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
-	
+
 			if ( (*it).right( 3 ) == tr( "Zip" ) ) {
 				hasZip = TRUE;
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
-	
+
 			if ( (*it).right( 7 ) == tr( "Country" ) ) {
 				hasCountry = TRUE;
 			//	slDynamicEntries->remove( it );
 				continue;
 			}
 
-			slDynamicEntries->append( *it );
+			slDynamicEntries.append( *it );
 		}
 	}
 
 	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 );
@@ -343,13 +343,13 @@ void ContactEditor::init() {
 	svAddress->setResizePolicy( QScrollView::AutoOneFit );
 	svAddress->setFrameStyle( QFrame::NoFrame );
 
 	container = new QWidget( svAddress->viewport() );
 	svAddress->addChild( container );
 
-	gl = new QGridLayout( container, 6, 3, 2, 4 );
+	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 );
 
@@ -357,13 +357,13 @@ void ContactEditor::init() {
 	gl->addWidget( l, 1, 0 );
 	txtAddress = new QLineEdit( container );
 	gl->addMultiCellWidget( txtAddress, 1, 1, 1, 2 );
 /*
 	l = new QLabel( tr( "Address 2" ), container );
 	gl->addWidget( l, 2, 0 );
-	txtAddress2 = new QLineEdit( container ); 
+	txtAddress2 = new QLineEdit( container );
 	gl->addMultiCellWidget( txtAddress2, 2, 2, 1, 2 );
 
 	l = new QLabel( tr( "P.O. Box" ), container );
 	gl->addWidget( l, 3, 0 );
 	txtPOBox = new QLineEdit( container );
 	gl->addMultiCellWidget( txtPOBox, 3, 3, 1, 2 );
@@ -604,12 +604,18 @@ void ContactEditor::init() {
 
 	cmbChooserField4 = new QComboBox( FALSE, container );
 	cmbChooserField4->setMaximumWidth( 90 );
 	gl->addWidget( cmbChooserField4, 6, 0 );
 	txtChooserField4 = new QLineEdit( container );
 	gl->addMultiCellWidget( txtChooserField4, 6, 6, 1, 2 );
+
+	QSpacerItem *space = new QSpacerItem(1,1,
+                                             QSizePolicy::Maximum,
+                                             QSizePolicy::MinimumExpanding );
+	gl->addItem( space, 7, 0 );
+
 	tabMain->insertTab( tabViewport, tr( "Address" ) );
 
 	tabViewport = new QWidget ( tabMain );
 
 	vb = new QVBoxLayout( tabViewport );
 
@@ -620,42 +626,42 @@ void ContactEditor::init() {
 
 	container = new QWidget( svDetails->viewport() );
 	svDetails->addChild( container );
 
 	gl = new QGridLayout( container, 1, 2, 2, 4 );
 
-	QStringList::ConstIterator it = slDynamicEntries->begin();
-	for (i = 0; it != slDynamicEntries->end(); i++, ++it) {
+	QStringList::ConstIterator it = slDynamicEntries.begin();
+	for (i = 0; it != slDynamicEntries.end(); i++, ++it) {
 		l = new QLabel( *it, container );
 		listName.append( l );
 		gl->addWidget( l, i, 0 );
 		QLineEdit *e = new QLineEdit( container );
 		listValue.append( e );
 		gl->addWidget( e, i, 1);
 	}
 
 	l = new QLabel( tr("Gender"), container );
-	gl->addWidget( l, slDynamicEntries->count(), 0 );
+	gl->addWidget( l, slDynamicEntries.count(), 0 );
 	cmbGender = new QComboBox( container );
 	cmbGender->insertItem( "", 0 );
 	cmbGender->insertItem( tr("Male"), 1);
 	cmbGender->insertItem( tr("Female"), 2);
-	gl->addWidget( cmbGender, slDynamicEntries->count(), 1 );
-	
+	gl->addWidget( cmbGender, slDynamicEntries.count(), 1 );
+
 	tabMain->insertTab( tabViewport, tr( "Details" ) );
-	
+
 	dlgNote = new QDialog( this, "Note Dialog", TRUE );
 	dlgNote->setCaption( tr("Enter Note") );
 	QVBoxLayout *vbNote = new QVBoxLayout( dlgNote );
 	txtNote = new QMultiLineEdit( dlgNote );
 	vbNote->addWidget( txtNote );
 	connect( btnNote, SIGNAL(clicked()), this, SLOT(slotNote()) );
 
 	dlgName = new QDialog( this, "Name Dialog", TRUE );
 	dlgName->setCaption( tr("Edit Name") );
-	gl = new QGridLayout( dlgName, 4, 2, 2, 3 );
+	gl = new QGridLayout( dlgName, 5, 2, 2, 3 );
 
 	l = new QLabel( tr("First Name"), dlgName );
 	gl->addWidget( l, 0, 0 );
 	txtFirstName = new QLineEdit( dlgName );
 	gl->addWidget( txtFirstName, 0, 1 );
 
@@ -670,43 +676,63 @@ void ContactEditor::init() {
 	gl->addWidget( txtLastName, 2, 1 );
 
 	l = new QLabel( tr("Suffix"), dlgName );
 	gl->addWidget( l, 3, 0 );
 	txtSuffix = new QLineEdit( dlgName );
 	gl->addWidget( txtSuffix, 3, 1 );
+        space = new QSpacerItem(1,1,
+                                QSizePolicy::Maximum,
+                                QSizePolicy::MinimumExpanding );
+        gl->addItem( space, 4,  0 );
 
-	cmbChooserField1->insertStringList( *slChooserNames );
-	cmbChooserField2->insertStringList( *slChooserNames );
-	cmbChooserField3->insertStringList( *slChooserNames );
-	cmbChooserField4->insertStringList( *slChooserNames );
+	cmbChooserField1->insertStringList( slChooserNames );
+	cmbChooserField2->insertStringList( slChooserNames );
+	cmbChooserField3->insertStringList( slChooserNames );
+	cmbChooserField4->insertStringList( slChooserNames );
 
 	cmbChooserField1->setCurrentItem( 0 );
 	cmbChooserField2->setCurrentItem( 1 );
 	cmbChooserField3->setCurrentItem( 2 );
-	
+
 	connect( btnFullName, SIGNAL(clicked()), this, SLOT(slotName()) );
-			
+
 	connect( txtFullName, SIGNAL(textChanged(const QString &)), this, SLOT(slotFullNameChange(const QString &)) );
-	
-	connect( txtChooserField1, SIGNAL(textChanged(const QString &)), this, SLOT(slotChooser1Change(const QString &)) ); 
-	connect( txtChooserField2, SIGNAL(textChanged(const QString &)), this, SLOT(slotChooser2Change(const QString &)) ); 
-	connect( txtChooserField3, SIGNAL(textChanged(const QString &)), this, SLOT(slotChooser3Change(const QString &)) ); 
-	connect( txtChooserField4, SIGNAL(textChanged(const QString &)), this, SLOT(slotChooser4Change(const QString &)) ); 
-	connect( txtAddress, SIGNAL(textChanged(const QString &)), this, SLOT(slotAddressChange(const QString &)) ); 
-	//connect( txtAddress2, SIGNAL(textChanged(const QString &)), this, SLOT(slotAddress2Change(const QString &)) ); 
-	//connect( txtPOBox, SIGNAL(textChanged(const QString &)), this, SLOT(slotPOBoxChange(const QString &)) ); 
-	connect( txtCity, SIGNAL(textChanged(const QString &)), this, SLOT(slotCityChange(const QString &)) ); 
-	connect( txtState, SIGNAL(textChanged(const QString &)), this, SLOT(slotStateChange(const QString &)) ); 
-	connect( txtZip, SIGNAL(textChanged(const QString &)), this, SLOT(slotZipChange(const QString &)) ); 
-	connect( cmbCountry, SIGNAL(textChanged(const QString &)), this, SLOT(slotCountryChange(const QString &)) ); 
-	connect( cmbCountry, SIGNAL(activated(const QString &)), this, SLOT(slotCountryChange(const QString &)) ); 
-	connect( cmbChooserField1, SIGNAL(activated(int)), this, SLOT(slotCmbChooser1Change(int)) );
-	connect( cmbChooserField2, SIGNAL(activated(int)), this, SLOT(slotCmbChooser2Change(int)) );
-	connect( cmbChooserField3, SIGNAL(activated(int)), this, SLOT(slotCmbChooser3Change(int)) );
-	connect( cmbChooserField4, SIGNAL(activated(int)), this, SLOT(slotCmbChooser4Change(int)) );
-	connect( cmbAddress, SIGNAL(activated(int)), this, SLOT(slotAddressTypeChange(int)) );
+
+	connect( txtChooserField1, SIGNAL(textChanged(const QString &)),
+                 this, SLOT(slotChooser1Change(const QString &)) );
+	connect( txtChooserField2, SIGNAL(textChanged(const QString &)),
+                 this, SLOT(slotChooser2Change(const QString &)) );
+	connect( txtChooserField3, SIGNAL(textChanged(const QString &)),
+                 this, SLOT(slotChooser3Change(const QString &)) );
+	connect( txtChooserField4, SIGNAL(textChanged(const QString &)),
+                 this, SLOT(slotChooser4Change(const QString &)) );
+	connect( txtAddress, SIGNAL(textChanged(const QString &)),
+                 this, SLOT(slotAddressChange(const QString &)) );
+	//connect( txtAddress2, SIGNAL(textChanged(const QString &)), this, SLOT(slotAddress2Change(const QString &)) );
+	//connect( txtPOBox, SIGNAL(textChanged(const QString &)), this, SLOT(slotPOBoxChange(const QString &)) );
+	connect( txtCity, SIGNAL(textChanged(const QString &)),
+                 this, SLOT(slotCityChange(const QString &)) );
+	connect( txtState, SIGNAL(textChanged(const QString &)),
+                 this, SLOT(slotStateChange(const QString &)) );
+	connect( txtZip, SIGNAL(textChanged(const QString &)),
+                 this, SLOT(slotZipChange(const QString &)) );
+	connect( cmbCountry, SIGNAL(textChanged(const QString &)),
+                 this, SLOT(slotCountryChange(const QString &)) );
+	connect( cmbCountry, SIGNAL(activated(const QString &)),
+                 this, SLOT(slotCountryChange(const QString &)) );
+	connect( cmbChooserField1, SIGNAL(activated(int)),
+                 this, SLOT(slotCmbChooser1Change(int)) );
+	connect( cmbChooserField2, SIGNAL(activated(int)),
+                 this, SLOT(slotCmbChooser2Change(int)) );
+	connect( cmbChooserField3, SIGNAL(activated(int)),
+                 this, SLOT(slotCmbChooser3Change(int)) );
+	connect( cmbChooserField4, SIGNAL(activated(int)),
+                 this, SLOT(slotCmbChooser4Change(int)) );
+	connect( cmbAddress, SIGNAL(activated(int)),
+                 this, SLOT(slotAddressTypeChange(int)) );
+
 	new QPEDialogListener(this);
 }
 
 void ContactEditor::initMap()
 {
     /*
@@ -736,151 +762,153 @@ o    cfg2.setGroup( "XMLFields" );
 }
 
 void ContactEditor::slotChooser1Change( const QString &textChanged ) {
 
 	int index = cmbChooserField1->currentItem();
 
-	(*slChooserValues)[index] = textChanged;
+	slChooserValues[index] = textChanged;
 
 }
 
 void ContactEditor::slotChooser2Change( const QString &textChanged ) {
 
 	int index = cmbChooserField2->currentItem();
 
-	(*slChooserValues)[index] = textChanged;
+	slChooserValues[index] = textChanged;
 
 }
 
 void ContactEditor::slotChooser3Change( const QString &textChanged ) {
 
 	int index = cmbChooserField3->currentItem();
 
-	(*slChooserValues)[index] = textChanged;
+	slChooserValues[index] = textChanged;
 
 }
 
 void ContactEditor::slotChooser4Change( const QString &textChanged ) {
 
 	int index = cmbChooserField4->currentItem();
 
-	(*slChooserValues)[index] = textChanged;
+	slChooserValues[index] = textChanged;
 
 }
 
 void ContactEditor::slotAddressChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
-		(*slBusinessAddress)[0] = textChanged;
+		slBusinessAddress[0] = textChanged;
 	} else {
-		(*slHomeAddress)[0] = textChanged;
+		slHomeAddress[0] = textChanged;
 	}
 }
 
 void ContactEditor::slotAddress2Change( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
-		(*slBusinessAddress)[1] = textChanged;
+		slBusinessAddress[1] = textChanged;
 	} else {
-		(*slHomeAddress)[1] = textChanged;
+		slHomeAddress[1] = textChanged;
 	}
 }
 
 void ContactEditor::slotPOBoxChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
-		(*slBusinessAddress)[2] = textChanged;
+		slBusinessAddress[2] = textChanged;
 	} else {
-		(*slHomeAddress)[2] = textChanged;
+		slHomeAddress[2] = textChanged;
 	}
 }
 
 void ContactEditor::slotCityChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
-		(*slBusinessAddress)[3] = textChanged;
+		slBusinessAddress[3] = textChanged;
 	} else {
-		(*slHomeAddress)[3] = textChanged;
+		slHomeAddress[3] = textChanged;
 	}
 }
 
 void ContactEditor::slotStateChange( const QString &textChanged ) {
 
-	
+
 	if ( cmbAddress->currentItem() == 0 ) {
-		(*slBusinessAddress)[4] = textChanged;
+		slBusinessAddress[4] = textChanged;
 	} else {
-		(*slHomeAddress)[4] = textChanged;
+		slHomeAddress[4] = textChanged;
 	}
 }
 
 void ContactEditor::slotZipChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
-		(*slBusinessAddress)[5] = textChanged;
+		slBusinessAddress[5] = textChanged;
 	} else {
-		(*slHomeAddress)[5] = textChanged;
+		slHomeAddress[5] = textChanged;
 	}
 }
 
 void ContactEditor::slotCountryChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
-		(*slBusinessAddress)[6] = textChanged;
+		slBusinessAddress[6] = textChanged;
 	} else {
-		(*slHomeAddress)[6] = textChanged;
+		slHomeAddress[6] = textChanged;
 	}
 }
 
 void ContactEditor::slotCmbChooser1Change( int index ) {
 
-	txtChooserField1->setText( (*slChooserValues)[index] );
-
+	txtChooserField1->setText( slChooserValues[index] );
+        txtChooserField1->setFocus();
 }
 
 void ContactEditor::slotCmbChooser2Change( int index ) {
 
-	txtChooserField2->setText( (*slChooserValues)[index] );
-
+	txtChooserField2->setText( slChooserValues[index] );
+        txtChooserField2->setFocus();
 }
 
 void ContactEditor::slotCmbChooser3Change( int index ) {
 
-	txtChooserField3->setText( (*slChooserValues)[index] );
+	txtChooserField3->setText( slChooserValues[index] );
+        txtChooserField3->setFocus();
 
 }
 
 void ContactEditor::slotCmbChooser4Change( int index ) {
 
-	txtChooserField4->setText( (*slChooserValues)[index] );
+	txtChooserField4->setText( slChooserValues[index] );
+        txtChooserField4->setFocus();
 
 }
 
 void ContactEditor::slotAddressTypeChange( int index ) {
 
 	if ( index == 0 ) {
 
-		txtAddress->setText( (*slBusinessAddress)[0] );
+		txtAddress->setText( slBusinessAddress[0] );
 		//txtAddress2->setText( (*slBusinessAddress)[1] );
 		//txtPOBox->setText( (*slBusinessAddress)[2] );
-		txtCity->setText( (*slBusinessAddress)[3] );
-		txtState->setText( (*slBusinessAddress)[4] );
-		txtZip->setText( (*slBusinessAddress)[5] );
+		txtCity->setText( slBusinessAddress[3] );
+		txtState->setText( slBusinessAddress[4] );
+		txtZip->setText( slBusinessAddress[5] );
 		QLineEdit *txtTmp = cmbCountry->lineEdit();
-		txtTmp->setText( (*slBusinessAddress)[6] );
+		txtTmp->setText( slBusinessAddress[6] );
 
 	} else {
 
-		txtAddress->setText( (*slHomeAddress)[0] );
+		txtAddress->setText( slHomeAddress[0] );
 		//txtAddress2->setText( (*slHomeAddress)[1] );
 		//txtPOBox->setText( (*slHomeAddress)[2] );
-		txtCity->setText( (*slHomeAddress)[3] );
-		txtState->setText( (*slHomeAddress)[4] );
-		txtZip->setText( (*slHomeAddress)[5] );
+		txtCity->setText( slHomeAddress[3] );
+		txtState->setText( slHomeAddress[4] );
+		txtZip->setText( slHomeAddress[5] );
 		QLineEdit *txtTmp = cmbCountry->lineEdit();
-		txtTmp->setText( (*slHomeAddress)[6] );
+		txtTmp->setText( slHomeAddress[6] );
 
 	}
 
 }
 
 void ContactEditor::slotFullNameChange( const QString &textChanged ) {
@@ -895,19 +923,19 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) {
 	cmbFileAs->insertItem( parseName( textChanged, 3 ) );
 
 	cmbFileAs->setCurrentItem( index );
 
 	useFullName = TRUE;
 
-}	
+}
 
 void ContactEditor::loadFields() {
 
 	QStringList::ConstIterator it;
 	QListIterator<QLabel> lit( listName );
-	for ( it = slDynamicEntries->begin(); *lit; ++lit, ++it) {
+	for ( it = slDynamicEntries.begin(); *lit; ++lit, ++it) {
 		(*lit)->setText( *it );
 	}
 }
 
 void ContactEditor::accept() {
 
@@ -956,15 +984,15 @@ void ContactEditor::setNameFocus() {
 
 bool ContactEditor::isEmpty() {
 	// Test and see if the record should be saved.
 	// More strict than the original qtopia, needs name or fileas to save
 
 	QString t = txtFullName->text();
-	if ( !t.isEmpty() && containsAlphaNum( t ) ) 
+	if ( !t.isEmpty() && containsAlphaNum( t ) )
 		return false;
-	
+
 	t = cmbFileAs->currentText();
 	if ( !t.isEmpty() && containsAlphaNum( t ) )
 		return false;
 
 	return true;
 
@@ -979,19 +1007,19 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 	QString strSuffix;
 	QString strTitle;
 	int commapos;
 	int spCount;
 	int spPos;
 	int spPos2;
-	
+
 
 	commapos = simplifiedName.find( ',', 0, TRUE);
 	spCount = simplifiedName.contains( ' ', TRUE );
 
 	if ( commapos == -1 ) {
-		
+
 		switch (spCount) {
 			case 0:
 				return simplifiedName;
 
 			case 1:
 				spPos = simplifiedName.find( ' ', 0, TRUE );
@@ -1041,13 +1069,13 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 				strSuffix = simplifiedName.mid( spPos2 + 1 );
 				break;
 		}
 	} else {
 		simplifiedName.replace( commapos, 1, " " );
 		simplifiedName = simplifiedName.simplifyWhiteSpace();
-		
+
 		switch (spCount) {
 			case 0:
 				return simplifiedName;
 
 			case 1:
 				spPos = simplifiedName.find( ' ', 0, TRUE );
@@ -1095,13 +1123,13 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 				spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
 				strMiddleName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
 				strSuffix = simplifiedName.mid( spPos2 + 1 );
 				break;
 		}
 	}
-	
+
 	switch (type) {
 		case NAME_FL:
 			return strFirstName + " " + strLastName;
 
 		case NAME_LF:
 			return strLastName + ", " + strFirstName;
@@ -1127,25 +1155,25 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 	}
 	return QString::null;
 }
 
 void ContactEditor::cleanupFields() {
 
-	QStringList::Iterator it = slChooserValues->begin();
-	for ( int i = 0; it != slChooserValues->end(); i++, ++it ) {
+	QStringList::Iterator it = slChooserValues.begin();
+	for ( int i = 0; it != slChooserValues.end(); i++, ++it ) {
 		(*it) = "";
 	}
 
 	for ( int i = 0; i < 7; i++ ) {
-		(*slHomeAddress)[i] = "";
-		(*slBusinessAddress)[i] = "";
+		slHomeAddress[i] = "";
+		slBusinessAddress[i] = "";
 	}
 
 	QStringList::ConstIterator cit;
 	QListIterator<QLineEdit> itLE( listValue );
-	for ( cit = slDynamicEntries->begin(); cit != slDynamicEntries->end(); ++cit, ++itLE) {
+	for ( cit = slDynamicEntries.begin(); cit != slDynamicEntries.end(); ++cit, ++itLE) {
 		(*itLE)->setText( "" );
 	}
 
 	txtFirstName->setText("");
 	txtMiddleName->setText("");
 	txtLastName->setText("");
@@ -1171,41 +1199,41 @@ void ContactEditor::cleanupFields() {
 }
 
 void ContactEditor::setEntry( const Contact &entry ) {
 
 	cleanupFields();
 
-	
+
 	ent = entry;
 
 	useFullName = FALSE;
 	txtFirstName->setText( ent.firstName() );
 	txtMiddleName->setText( ent.middleName() );
 	txtLastName->setText( ent.lastName() );
 	txtSuffix->setText( ent.suffix() );
 
 	QString *tmpString = new QString;
-	*tmpString = ent.firstName() + " " + ent.middleName() + 
+	*tmpString = ent.firstName() + " " + ent.middleName() +
 		+ " " + ent.lastName() + " " + ent.suffix();
-	
+
 	txtFullName->setText( tmpString->simplifyWhiteSpace() );
 
 	cmbFileAs->setEditText( ent.fileAs() );
 
 	if (hasTitle)
 		txtJobTitle->setText( ent.jobTitle() );
 
-	if (hasCompany) 
+	if (hasCompany)
 		txtOrganization->setText( ent.company() );
 
 	if (hasNotes)
 		txtNote->setText( ent.notes() );
 
 	if (hasStreet) {
-		(*slHomeAddress)[0] = ent.homeStreet();
-		(*slBusinessAddress)[0] = ent.businessStreet();
+		slHomeAddress[0] = ent.homeStreet();
+		slBusinessAddress[0] = ent.businessStreet();
 	}
 /*
 	if (hasStreet2) {
 		(*slHomeAddress)[1] = ent.homeStreet2();
 		(*slBusinessAddress)[1] = ent.businessStreet2();
 	}
@@ -1213,34 +1241,34 @@ void ContactEditor::setEntry( const Contact &entry ) {
 	if (hasPOBox) {
 		(*slHomeAddress)[2] = ent.homePOBox();
 		(*slBusinessAddress)[2] = ent.businessPOBox();
 	}
 */
 	if (hasCity) {
-		(*slHomeAddress)[3] = ent.homeCity();
-		(*slBusinessAddress)[3] = ent.businessCity();
+		slHomeAddress[3] = ent.homeCity();
+		slBusinessAddress[3] = ent.businessCity();
 	}
 
 	if (hasState) {
-		(*slHomeAddress)[4] = ent.homeState();
-		(*slBusinessAddress)[4] = ent.businessState();
+		slHomeAddress[4] = ent.homeState();
+		slBusinessAddress[4] = ent.businessState();
 	}
 
 	if (hasZip) {
-		(*slHomeAddress)[5] = ent.homeZip();
-		(*slBusinessAddress)[5] = ent.businessZip();
+		slHomeAddress[5] = ent.homeZip();
+		slBusinessAddress[5] = ent.businessZip();
 	}
 
 	if (hasCountry) {
-		(*slHomeAddress)[6] = ent.homeCountry();
-		(*slBusinessAddress)[6] = ent.businessCountry();
+		slHomeAddress[6] = ent.homeCountry();
+		slBusinessAddress[6] = ent.businessCountry();
 	}
 
 	QStringList::ConstIterator it;
 	QListIterator<QLineEdit> itLE( listValue );
-	for ( it = slDynamicEntries->begin(); it != slDynamicEntries->end(); ++it, ++itLE) {
+	for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) {
 		if ( *it == "Department" )
 			(*itLE)->setText( ent.department() );
 
 		if ( *it == "Company" )
 			(*itLE)->setText( ent.company() );
 
@@ -1271,13 +1299,13 @@ void ContactEditor::setEntry( const Contact &entry ) {
 		if ( *it == "Children" )
 			(*itLE)->setText( ent.children() );
 
 	}
 
 	QStringList::Iterator itV;
-	for ( it = slChooserNames->begin(), itV = slChooserValues->begin(); it != slChooserNames->end(); ++it, ++itV ) {
+	for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
 
 		if ( *it == "Business Phone" || *it == "Work Phone" )
 			*itV = ent.businessPhone();
 /*
 		if ( *it == "Business 2 Phone" )
 			*itV = ent.business2Phone();
@@ -1343,13 +1371,13 @@ void ContactEditor::setEntry( const Contact &entry ) {
 			*itV = ent.homeWebpage();
 		if ( *it == "Business Web Page" || *it == "Work Web Page" )
 			*itV = ent.businessWebpage();
 
 
 	}
-	
+
 	cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") );
 
 	QString gender = ent.gender();
 	cmbGender->setCurrentItem( gender.toInt() );
 
 	txtNote->setText( ent.notes() );
@@ -1366,43 +1394,43 @@ void ContactEditor::saveEntry() {
 
 	if ( useFullName == TRUE ) {
 		txtFirstName->setText( parseName( txtFullName->text(), NAME_F ) );
 		txtMiddleName->setText( parseName( txtFullName->text(), NAME_M ) );
 		txtLastName->setText( parseName( txtFullName->text(), NAME_L ) );
 		txtSuffix->setText( parseName( txtFullName->text(), NAME_S ) );
-		
+
 		useFullName = FALSE;
 	}
 
-	/*if ( ent.firstName() != txtFirstName->text() || 
+	/*if ( ent.firstName() != txtFirstName->text() ||
 			ent.lastName != txtLastName->text() ||
 			ent.middleName != txtMiddleName->text() ) {
 	*/
 		ent.setFirstName( txtFirstName->text() );
 		ent.setLastName( txtLastName->text() );
 		ent.setMiddleName( txtMiddleName->text() );
 		ent.setSuffix( txtSuffix->text() );
 
 	//}
 
 	ent.setFileAs( cmbFileAs->currentText() );
-	
+
 	ent.setCategories( cmbCat->currentCategories() );
 
 	if (hasTitle)
 		ent.setJobTitle( txtJobTitle->text() );
 
-	if (hasCompany) 
+	if (hasCompany)
 		ent.setCompany( txtOrganization->text() );
 
 	if (hasNotes)
 		ent.setNotes( txtNote->text() );
 
 	if (hasStreet) {
-		ent.setHomeStreet( (*slHomeAddress)[0] );
-		ent.setBusinessStreet( (*slBusinessAddress)[0] );
+		ent.setHomeStreet( slHomeAddress[0] );
+		ent.setBusinessStreet( slBusinessAddress[0] );
 	}
 /*
 	if (hasStreet2) {
 		ent.setHomeStreet2( (*slHomeAddress)[1] );
 		ent.setBusinessStreet2( (*slBusinessAddress)[1] );
 	}
@@ -1410,34 +1438,34 @@ void ContactEditor::saveEntry() {
 	if (hasPOBox) {
 		ent.setHomePOBox( (*slHomeAddress)[2] );
 		ent.setBusinessPOBox( (*slBusinessAddress)[2] );
 	}
 */
 	if (hasCity) {
-		ent.setHomeCity( (*slHomeAddress)[3] );
-		ent.setBusinessCity( (*slBusinessAddress)[3] );
+		ent.setHomeCity( slHomeAddress[3] );
+		ent.setBusinessCity( slBusinessAddress[3] );
 	}
 
 	if (hasState) {
-		ent.setHomeState( (*slHomeAddress)[4] );
-		ent.setBusinessState( (*slBusinessAddress)[4] );
+		ent.setHomeState( slHomeAddress[4] );
+		ent.setBusinessState( slBusinessAddress[4] );
 	}
 
 	if (hasZip) {
-		ent.setHomeZip( (*slHomeAddress)[5] );
-		ent.setBusinessZip( (*slBusinessAddress)[5] );
+		ent.setHomeZip( slHomeAddress[5] );
+		ent.setBusinessZip( slBusinessAddress[5] );
 	}
-	
+
 	if (hasCountry) {
-		ent.setHomeCountry( (*slHomeAddress)[6] );
-		ent.setBusinessCountry( (*slBusinessAddress)[6] );
+		ent.setHomeCountry( slHomeAddress[6] );
+		ent.setBusinessCountry( slBusinessAddress[6] );
 	}
 
 	QStringList::ConstIterator it;
 	QListIterator<QLineEdit> itLE( listValue );
-	for ( it = slDynamicEntries->begin(); it != slDynamicEntries->end(); ++it, ++itLE) {
+	for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) {
 		if ( *it == "Department" )
 			ent.setDepartment( (*itLE)->text() );
 
 		if ( *it == "Company" )
 			ent.setCompany( (*itLE)->text() );
 
@@ -1468,13 +1496,13 @@ void ContactEditor::saveEntry() {
 		if ( *it == "Children" )
 			ent.setChildren( (*itLE)->text() );
 
 	}
 
 	QStringList::ConstIterator itV;
-	for ( it = slChooserNames->begin(), itV = slChooserValues->begin(); it != slChooserNames->end(); ++it, ++itV ) {
+	for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
 
 		if ( *it == "Business Phone" || *it == "Work Phone" )
 			ent.setBusinessPhone( *itV );
 /*
 		if ( *it == "Business 2 Phone" )
 			ent.setBusiness2Phone( *itV );
@@ -1545,13 +1573,13 @@ void ContactEditor::saveEntry() {
 			ent.setHomeWebpage( *itV );
 		if ( *it == "Business Web Page" || *it == "Work Web Page" )
 			ent.setBusinessWebpage( *itV );
 
 
 	}
-	
+
 	int gender = cmbGender->currentItem();
 	ent.setGender( QString::number( gender ) );
 
 	QString str = txtNote->text();
 	if ( !str.isNull() )
 		ent.setNotes( str );
diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h
index a58a860..4f3b56e 100644
--- a/core/pim/addressbook/contacteditor.h
+++ b/core/pim/addressbook/contacteditor.h
@@ -47,13 +47,13 @@ class QComboBox;
 class QPushButton;
 class CategorySelect;
 class QLabel;
 
 class ContactEditor : public QDialog {
 	Q_OBJECT
-	
+
 	public:
 		ContactEditor(	const Contact &entry,
 				const QValueList<int> *newOrderedValues,
 				QStringList *slNewOrdered,
 				QWidget *parent = 0,
 				const char *name = 0,
@@ -75,13 +75,13 @@ class ContactEditor : public QDialog {
 		void init();
 		void initMap();
 		void saveEntry();
 		bool isEmpty();
 		void cleanupFields();
 		QString parseName( QString fullName, int type );
-		
+
 	private slots:
 		void slotChooser1Change( const QString &textChanged );
 		void slotChooser2Change( const QString &textChanged );
 		void slotChooser3Change( const QString &textChanged );
 		void slotChooser4Change( const QString &textChanged );
 		void slotCmbChooser1Change( int index );
@@ -106,19 +106,19 @@ class ContactEditor : public QDialog {
 		QDialog *dlgNote;
 		QDialog *dlgName;
 
 		QList<QLineEdit> listValue;
 		QList<QLabel> listName;
 		const QValueList<int> *orderedValues;
-		QStringList *slOrdered;
-		QStringList *slDynamicEntries;
+		QStringList slOrdered;
+		QStringList slDynamicEntries;
 
-		QStringList *slHomeAddress;
-		QStringList *slBusinessAddress;
-		QStringList *slChooserNames;
-		QStringList *slChooserValues;
+		QStringList slHomeAddress;
+		QStringList slBusinessAddress;
+		QStringList slChooserNames;
+		QStringList slChooserValues;
 
 		QMultiLineEdit *txtNote;
 		QLabel *lblNote;
 
 		//QLineEdit *txtTitle;
 		QLineEdit *txtFirstName;
@@ -140,13 +140,13 @@ class ContactEditor : public QDialog {
 		QComboBox *cmbChooserField1;
 		QComboBox *cmbChooserField2;
 		QComboBox *cmbChooserField3;
 		QComboBox *cmbChooserField4;
 		QComboBox *cmbFileAs;
 		CategorySelect *cmbCat;
-		
+
 		QScrollView *svAddress;
 		QLineEdit *txtAddress;
 		//QLineEdit *txtAddress2;
 		//QLineEdit *txtPOBox;
 		QLineEdit *txtCity;
 		QLineEdit *txtState;