1 files changed, 14 insertions, 0 deletions
diff --git a/libopie2/opiepim/private/opimcontactsortvector.cpp b/libopie2/opiepim/private/opimcontactsortvector.cpp
index 8c7d5ca..c8de4d1 100644
--- a/libopie2/opiepim/private/opimcontactsortvector.cpp
+++ b/libopie2/opiepim/private/opimcontactsortvector.cpp
@@ -55,24 +55,27 @@ int OPimContactSortVector::compareItems( const OPimContact& left,
     case OPimContactAccess::SortTitle:
         ret = testString( left.title(), right.title() );
         soTitle = true;
         break;
     case OPimContactAccess::SortFirstName:
         ret = testString( left.firstName(), right.firstName() );
         soFirstName = true;
         break;
     case OPimContactAccess::SortMiddleName:
         ret = testString( left.middleName(), right.middleName() );
         soMiddleName = true;
         break;
+    case OPimContactAccess::SortLastName:
+        ret = testString( left.lastName(), right.lastName() );
+        break;
     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;
@@ -84,24 +87,35 @@ int OPimContactSortVector::compareItems( const OPimContact& left,
         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;
         break;
+    case OPimContactAccess::SortBirthdayWithoutYear:
+        // This doesn't actually just sort by the date without year,
+        // it actually works out the days until the next occurrence,
+        // which is more useful since it will work correctly when
+        // crossing year boundaries. - Paul Eggleton Dec 2006
+        ret = testDaysUntilNextDate( left.birthday(), right.birthday() );
+        break;
+    case OPimContactAccess::SortAnniversaryWithoutYear:
+        // (as above)
+        ret = testDaysUntilNextDate( left.anniversary(), right.anniversary() );
+        break;
     }
 
     /* twist to honor ascending/descending setting as QVector only sorts ascending*/
     if ( !asc )
         ret *= -1;
 
     //  Maybe differentiate as in OPimTodoSortVector ### FIXME
     //  if( ret )
     return ret;
 }
 
 }