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
@@ -1004,47 +1004,47 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
                                 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;
@@ -1060,35 +1060,35 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
                                 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 );
@@ -1370,24 +1370,25 @@ void ContactEditor::saveEntry() {
                 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() );