Diffstat (limited to 'libopie2/opiepim/private/opimcontactsortvector.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiepim/private/opimcontactsortvector.cpp | 14 |
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, | |||
55 | case OPimContactAccess::SortTitle: | 55 | case OPimContactAccess::SortTitle: |
56 | ret = testString( left.title(), right.title() ); | 56 | ret = testString( left.title(), right.title() ); |
57 | soTitle = true; | 57 | soTitle = true; |
58 | break; | 58 | break; |
59 | case OPimContactAccess::SortFirstName: | 59 | case OPimContactAccess::SortFirstName: |
60 | ret = testString( left.firstName(), right.firstName() ); | 60 | ret = testString( left.firstName(), right.firstName() ); |
61 | soFirstName = true; | 61 | soFirstName = true; |
62 | break; | 62 | break; |
63 | case OPimContactAccess::SortMiddleName: | 63 | case OPimContactAccess::SortMiddleName: |
64 | ret = testString( left.middleName(), right.middleName() ); | 64 | ret = testString( left.middleName(), right.middleName() ); |
65 | soMiddleName = true; | 65 | soMiddleName = true; |
66 | break; | 66 | break; |
67 | case OPimContactAccess::SortLastName: | ||
68 | ret = testString( left.lastName(), right.lastName() ); | ||
69 | break; | ||
67 | case OPimContactAccess::SortSuffix: | 70 | case OPimContactAccess::SortSuffix: |
68 | ret = testString( left.suffix(), right.suffix() ); | 71 | ret = testString( left.suffix(), right.suffix() ); |
69 | soSuffix = true; | 72 | soSuffix = true; |
70 | break; | 73 | break; |
71 | case OPimContactAccess::SortEmail: | 74 | case OPimContactAccess::SortEmail: |
72 | ret = testString( left.defaultEmail(), right.defaultEmail() ); | 75 | ret = testString( left.defaultEmail(), right.defaultEmail() ); |
73 | soEmail = true; | 76 | soEmail = true; |
74 | break; | 77 | break; |
75 | case OPimContactAccess::SortNickname: | 78 | case OPimContactAccess::SortNickname: |
76 | ret = testString( left.nickname(), right.nickname() ); | 79 | ret = testString( left.nickname(), right.nickname() ); |
77 | soNick = true; | 80 | soNick = true; |
78 | break; | 81 | break; |
@@ -84,24 +87,35 @@ int OPimContactSortVector::compareItems( const OPimContact& left, | |||
84 | ret = testDate( left.anniversary(), right.anniversary() ); | 87 | ret = testDate( left.anniversary(), right.anniversary() ); |
85 | soAnni = true; | 88 | soAnni = true; |
86 | break; | 89 | break; |
87 | case OPimContactAccess::SortByDate: | 90 | case OPimContactAccess::SortByDate: |
88 | case OPimContactAccess::SortBirthday: | 91 | case OPimContactAccess::SortBirthday: |
89 | ret = testDate( left.birthday(), right.birthday() ); | 92 | ret = testDate( left.birthday(), right.birthday() ); |
90 | soBirth = true; | 93 | soBirth = true; |
91 | break; | 94 | break; |
92 | case OPimContactAccess::SortGender: | 95 | case OPimContactAccess::SortGender: |
93 | ret = testString( left.gender(), right.gender() ); | 96 | ret = testString( left.gender(), right.gender() ); |
94 | soGender = true; | 97 | soGender = true; |
95 | break; | 98 | break; |
99 | case OPimContactAccess::SortBirthdayWithoutYear: | ||
100 | // This doesn't actually just sort by the date without year, | ||
101 | // it actually works out the days until the next occurrence, | ||
102 | // which is more useful since it will work correctly when | ||
103 | // crossing year boundaries. - Paul Eggleton Dec 2006 | ||
104 | ret = testDaysUntilNextDate( left.birthday(), right.birthday() ); | ||
105 | break; | ||
106 | case OPimContactAccess::SortAnniversaryWithoutYear: | ||
107 | // (as above) | ||
108 | ret = testDaysUntilNextDate( left.anniversary(), right.anniversary() ); | ||
109 | break; | ||
96 | } | 110 | } |
97 | 111 | ||
98 | /* twist to honor ascending/descending setting as QVector only sorts ascending*/ | 112 | /* twist to honor ascending/descending setting as QVector only sorts ascending*/ |
99 | if ( !asc ) | 113 | if ( !asc ) |
100 | ret *= -1; | 114 | ret *= -1; |
101 | 115 | ||
102 | // Maybe differentiate as in OPimTodoSortVector ### FIXME | 116 | // Maybe differentiate as in OPimTodoSortVector ### FIXME |
103 | // if( ret ) | 117 | // if( ret ) |
104 | return ret; | 118 | return ret; |
105 | } | 119 | } |
106 | 120 | ||
107 | } | 121 | } |