summaryrefslogtreecommitdiff
path: root/libopie2
Unidiff
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/private/opimcontactsortvector.cpp14
-rw-r--r--libopie2/opiepim/private/opimsortvector.h24
2 files changed, 38 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
@@ -61,12 +61,15 @@ int OPimContactSortVector::compareItems( const OPimContact& left,
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() );
@@ -90,12 +93,23 @@ int OPimContactSortVector::compareItems( const OPimContact& left,
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
diff --git a/libopie2/opiepim/private/opimsortvector.h b/libopie2/opiepim/private/opimsortvector.h
index 11a40ac..9684ca1 100644
--- a/libopie2/opiepim/private/opimsortvector.h
+++ b/libopie2/opiepim/private/opimsortvector.h
@@ -53,12 +53,14 @@ public:
53protected: 53protected:
54 int testString( const QString&, const QString& )const; 54 int testString( const QString&, const QString& )const;
55 int testDate( const QDate&, const QDate& )const; 55 int testDate( const QDate&, const QDate& )const;
56 int testTime( const QTime&, const QTime& )const; 56 int testTime( const QTime&, const QTime& )const;
57 int testDateTime( const QDateTime& left, 57 int testDateTime( const QDateTime& left,
58 const QDateTime& right )const; 58 const QDateTime& right )const;
59 int testDaysUntilNextDate( const QDate& left,
60 const QDate& right )const;
59protected: 61protected:
60 bool sortAscending()const; 62 bool sortAscending()const;
61 int sortOrder()const; 63 int sortOrder()const;
62 64
63private: 65private:
64 bool m_ascending : 1; 66 bool m_ascending : 1;
@@ -163,10 +165,32 @@ inline int OPimSortVector<T>::testDateTime( const QDateTime& left,
163 } 165 }
164 166
165 return ret; 167 return ret;
166 168
167} 169}
168 170
171template<class T>
172inline int OPimSortVector<T>::testDaysUntilNextDate( const QDate& left,
173 const QDate& right )const {
174 int ret = 0;
175 if ( !left .isValid() ) ret++;
176 if ( !right.isValid() ) ret--;
177
178 if ( left.isValid() && right.isValid() ){
179 int currentYear = QDate::currentDate().year();
180 QDate nextLeft( currentYear, left.month(), left.day() );
181 if ( QDate::currentDate().daysTo(nextLeft) < 0 )
182 nextLeft.setYMD( currentYear+1, left.month(), left.day() );
183 QDate nextRight( currentYear, right.month(), right.day() );
184 if ( QDate::currentDate().daysTo(nextRight) < 0 )
185 nextRight.setYMD( currentYear+1, right.month(), right.day() );
186
187 ret += QDate::currentDate().daysTo(nextLeft) < QDate::currentDate().daysTo(nextRight) ? -1 : 1;
188 }
189
190 return ret;
191}
192
169} 193}
170} 194}
171 195
172#endif 196#endif