Fix addressbook sort by implementing sorting by 'File As' name

1 files changed, 6 insertions, 2 deletions

diff --git a/libopie2/opiepim/private/opimcontactsortvector.cpp b/libopie2/opiepim/private/opimcontactsortvector.cpp
index 9e186fe..8c7d5ca 100644
--- a/libopie2/opiepim/private/opimcontactsortvector.cpp
+++ b/libopie2/opiepim/private/opimcontactsortvector.cpp
@@ -32,27 +32,27 @@
 
 namespace Opie {
 namespace Internal {
 OPimContactSortVector::OPimContactSortVector( uint size, bool asc, int sort )
     : OPimSortVector<OPimContact>( size, asc, sort ) {}
 
 int OPimContactSortVector::compareItems( const OPimContact& left,
                                          const OPimContact& right ) {
     if ( left.uid() == right.uid() )
         return 0;
 
     bool soTitle, soSummary, soFirstName, soMiddleName, soSuffix, soEmail,
-        soNick, soAnni, soBirth, soGender;
+        soNick, soFileAs, soAnni, soBirth, soGender;
     soTitle = soSummary = soFirstName = soMiddleName = soSuffix = soEmail =
-     soNick = soAnni = soBirth = soGender = false;
+     soNick = soFileAs = soAnni = soBirth = soGender = false;
     int ret = 0;
     bool asc = sortAscending();
 
     switch( sortOrder() ) {
     case OPimContactAccess::SortSummary:
         ret = testString( left.fileAs(), right.fileAs() );
         soSummary = true;
         break;
     case OPimContactAccess::SortTitle:
         ret = testString( left.title(), right.title() );
         soTitle = true;
         break;
@@ -67,24 +67,28 @@ int OPimContactSortVector::compareItems( const OPimContact& left,
     case OPimContactAccess::SortSuffix:
         ret = testString( left.suffix(), right.suffix() );
         soSuffix = true;
         break;
     case OPimContactAccess::SortEmail:
         ret = testString( left.defaultEmail(), right.defaultEmail() );
         soEmail = true;
         break;
     case OPimContactAccess::SortNickname:
         ret = testString( left.nickname(), right.nickname() );
         soNick = true;
         break;
+    case OPimContactAccess::SortFileAsName:
+        ret = testString( left.fileAs(), right.fileAs() );
+        soFileAs = true;
+        break;
     case OPimContactAccess::SortAnniversary:
         ret = testDate( left.anniversary(), right.anniversary() );
         soAnni = true;
         break;
     case OPimContactAccess::SortByDate:
     case OPimContactAccess::SortBirthday:
         ret = testDate( left.birthday(), right.birthday() );
         soBirth = true;
         break;
     case OPimContactAccess::SortGender:
         ret = testString( left.gender(), right.gender() );
         soGender = true;