usbaility updates

3 files changed, 148 insertions, 119 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
@@ -906,6 +906,7 @@ void AddressbookWindow::populateCategories()
     int id,
 	rememberId;
     id = 1;
+    rememberId = 0;
     catMenu->insertItem( tr( "All" ), id++ );
     QStringList categories = abList->categories();
     categories.append( tr( "Unfiled" ) );
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
@@ -57,7 +57,7 @@ ContactEditor::ContactEditor(	const Contact &entry,
 				WFlags fl )
 	: QDialog( parent, name, TRUE, fl ),
 	  orderedValues( newOrderedValues ),
-	  slOrdered( slNewOrdered )
+	  slOrdered( *slNewOrdered )
 {
 	
 	init();
@@ -74,19 +74,19 @@ 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( "" );
 	}
 
 	{
@@ -102,61 +102,61 @@ void ContactEditor::init() {
 		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;
 			}
@@ -262,7 +262,7 @@ void ContactEditor::init() {
 				continue;
 			}
 
-			slDynamicEntries->append( *it );
+			slDynamicEntries.append( *it );
 		}
 	}
 
@@ -346,7 +346,7 @@ void ContactEditor::init() {
 	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" ) );
@@ -607,6 +607,12 @@ void ContactEditor::init() {
 	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 );
@@ -623,8 +629,8 @@ void ContactEditor::init() {
 
 	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 );
@@ -634,12 +640,12 @@ void ContactEditor::init() {
 	}
 
 	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" ) );
 	
@@ -652,7 +658,7 @@ void ContactEditor::init() {
 
 	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 );
@@ -673,11 +679,15 @@ void ContactEditor::init() {
 	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 );
@@ -687,23 +697,39 @@ void ContactEditor::init() {
 			
 	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( 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( 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);
 }
 
@@ -739,7 +765,7 @@ void ContactEditor::slotChooser1Change( const QString &textChanged ) {
 
 	int index = cmbChooserField1->currentItem();
 
-	(*slChooserValues)[index] = textChanged;
+	slChooserValues[index] = textChanged;
 
 }
 
@@ -747,7 +773,7 @@ void ContactEditor::slotChooser2Change( const QString &textChanged ) {
 
 	int index = cmbChooserField2->currentItem();
 
-	(*slChooserValues)[index] = textChanged;
+	slChooserValues[index] = textChanged;
 
 }
 
@@ -755,7 +781,7 @@ void ContactEditor::slotChooser3Change( const QString &textChanged ) {
 
 	int index = cmbChooserField3->currentItem();
 
-	(*slChooserValues)[index] = textChanged;
+	slChooserValues[index] = textChanged;
 
 }
 
@@ -763,43 +789,43 @@ 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;
 	}
 }
 
@@ -807,51 +833,53 @@ 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();
 
 }
 
@@ -859,25 +887,25 @@ 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] );
 
 	}
 
@@ -904,7 +932,7 @@ 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 );
 	}
 }
@@ -1130,19 +1158,19 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 
 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( "" );
 	}
 
@@ -1201,8 +1229,8 @@ void ContactEditor::setEntry( const Contact &entry ) {
 		txtNote->setText( ent.notes() );
 
 	if (hasStreet) {
-		(*slHomeAddress)[0] = ent.homeStreet();
-		(*slBusinessAddress)[0] = ent.businessStreet();
+		slHomeAddress[0] = ent.homeStreet();
+		slBusinessAddress[0] = ent.businessStreet();
 	}
 /*
 	if (hasStreet2) {
@@ -1216,28 +1244,28 @@ void ContactEditor::setEntry( const Contact &entry ) {
 	}
 */
 	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() );
 
@@ -1274,7 +1302,7 @@ void ContactEditor::setEntry( const Contact &entry ) {
 	}
 
 	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();
@@ -1398,8 +1426,8 @@ void ContactEditor::saveEntry() {
 		ent.setNotes( txtNote->text() );
 
 	if (hasStreet) {
-		ent.setHomeStreet( (*slHomeAddress)[0] );
-		ent.setBusinessStreet( (*slBusinessAddress)[0] );
+		ent.setHomeStreet( slHomeAddress[0] );
+		ent.setBusinessStreet( slBusinessAddress[0] );
 	}
 /*
 	if (hasStreet2) {
@@ -1413,28 +1441,28 @@ void ContactEditor::saveEntry() {
 	}
 */
 	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() );
 
@@ -1471,7 +1499,7 @@ void ContactEditor::saveEntry() {
 	}
 
 	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 );
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
@@ -109,13 +109,13 @@ class ContactEditor : public QDialog {
 		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;