Fixed a bug with Suffixes due to a missing 2

1 files changed, 6 insertions, 5 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index cbcd11f..adea1a1 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -992,115 +992,115 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 		switch (spCount) {
 			case 0:
 				return simplifiedName;
 
 			case 1:
 				spPos = simplifiedName.find( ' ', 0, TRUE );
 				strFirstName = simplifiedName.left( spPos );
 				strLastName = simplifiedName.mid( spPos + 1 );
 				break;
 
 			case 2:
 				spPos = simplifiedName.find( ' ', 0, TRUE );
 				strFirstName = simplifiedName.left( spPos );
 				spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
 				strMiddleName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
 				strLastName = simplifiedName.mid( spPos2 + 1 );
 				break;
 
 			case 3:
 				spPos = simplifiedName.find( ' ', 0, TRUE );
 				strFirstName = simplifiedName.left( spPos );
 				spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
 				strMiddleName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
 				spPos = simplifiedName.find( ' ', spPos2 + 1, TRUE );
-				strLastName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos );
+				strLastName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos2 );
 				strSuffix = simplifiedName.mid( spPos + 1 );
 				break;
 
 			case 4:
 				spPos = simplifiedName.find( ' ', 0, TRUE );
 				strTitle = simplifiedName.left( spPos );
 				spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
 				strFirstName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
 				spPos = simplifiedName.find( ' ', spPos2 + 1, TRUE );
-				strMiddleName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos );
+				strMiddleName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos2 );
 				spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
 				strLastName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
 				strSuffix = simplifiedName.mid( spPos2 + 1 );
 				break;
 
 			default:
 				spPos = simplifiedName.find( ' ', 0, TRUE );
 				strTitle = simplifiedName.left( spPos );
 				spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
 				strFirstName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
 				spPos = simplifiedName.find( ' ', spPos2 + 1, TRUE );
-				strMiddleName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos );
+				strMiddleName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos2 );
 				spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
 				strLastName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
 				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 );
 				strLastName = simplifiedName.left( spPos );
 				strFirstName = simplifiedName.mid( spPos + 1 );
 				break;
 
 			case 2:
 				spPos = simplifiedName.find( ' ', 0, TRUE );
 				strLastName = simplifiedName.left( spPos );
 				spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
 				strFirstName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
 				strMiddleName = simplifiedName.mid( spPos2 + 1 );
 				break;
 
 			case 3:
 				spPos = simplifiedName.find( ' ', 0, TRUE );
 				strLastName = simplifiedName.left( spPos );
 				spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
 				strFirstName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
 				spPos = simplifiedName.find( ' ', spPos2 + 1, TRUE );
-				strMiddleName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos );
+				strMiddleName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos2 );
 				strSuffix = simplifiedName.mid( spPos + 1 );
 				break;
 
 			case 4:
 				spPos = simplifiedName.find( ' ', 0, TRUE );
 				strLastName = simplifiedName.left( spPos );
 				spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
 				strTitle = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
 				spPos = simplifiedName.find( ' ', spPos2 + 1, TRUE );
-				strFirstName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos );
+				strFirstName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos2 );
 				spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
 				strMiddleName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
 				strSuffix = simplifiedName.mid( spPos2 + 1 );
 				break;
 
 			default:
 				spPos = simplifiedName.find( ' ', 0, TRUE );
 				strLastName = simplifiedName.left( spPos );
 				spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
 				strTitle = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
 				spPos = simplifiedName.find( ' ', spPos2 + 1, TRUE );
 				strFirstName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos );
 				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:
@@ -1358,48 +1358,49 @@ void ContactEditor::setEntry( const Contact &entry ) {
 	slotCmbChooser3Change( cmbChooserField3->currentItem() );
 
 	slotAddressTypeChange( cmbAddress->currentItem() );
 
 }
 
 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() || 
 			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) 
 		ent.setCompany( txtOrganization->text() );
 
 	if (hasNotes)
 		ent.setNotes( txtNote->text() );
 
 	if (hasStreet) {
 		ent.setHomeStreet( (*slHomeAddress)[0] );
 		ent.setBusinessStreet( (*slBusinessAddress)[0] );
 	}
 /*
 	if (hasStreet2) {
 		ent.setHomeStreet2( (*slHomeAddress)[1] );
 		ent.setBusinessStreet2( (*slBusinessAddress)[1] );