summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (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
@@ -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;
}
}
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
@@ -47,24 +47,26 @@ class OPimSortVector : public QVector<OPimSortVectorContainer<T> > {
public:
OPimSortVector( uint size, bool asc, int sort );
int compareItems( QCollection::Item d1, QCollection::Item d2 );
bool insert( uint, const T& t );
UID uidAt( uint i )const;
protected:
int testString( const QString&, const QString& )const;
int testDate( const QDate&, const QDate& )const;
int testTime( const QTime&, const QTime& )const;
int testDateTime( const QDateTime& left,
const QDateTime& right )const;
+ int testDaysUntilNextDate( const QDate& left,
+ const QDate& right )const;
protected:
bool sortAscending()const;
int sortOrder()const;
private:
bool m_ascending : 1;
int m_sort;
virtual int compareItems( const T& item1, const T& item2 ) = 0;
};
template<class T>
OPimSortVector<T>::OPimSortVector( uint size, bool asc, int sort )
@@ -157,16 +159,38 @@ inline int OPimSortVector<T>::testDateTime( const QDateTime& left,
int ret = 0;
if ( !left .isValid() ) ret++;
if ( !right.isValid() ) ret--;
if ( left.isValid() && right.isValid() ){
ret += left < right ? -1 : 1;
}
return ret;
}
+template<class T>
+inline int OPimSortVector<T>::testDaysUntilNextDate( const QDate& left,
+ const QDate& right )const {
+ int ret = 0;
+ if ( !left .isValid() ) ret++;
+ if ( !right.isValid() ) ret--;
+
+ if ( left.isValid() && right.isValid() ){
+ int currentYear = QDate::currentDate().year();
+ QDate nextLeft( currentYear, left.month(), left.day() );
+ if ( QDate::currentDate().daysTo(nextLeft) < 0 )
+ nextLeft.setYMD( currentYear+1, left.month(), left.day() );
+ QDate nextRight( currentYear, right.month(), right.day() );
+ if ( QDate::currentDate().daysTo(nextRight) < 0 )
+ nextRight.setYMD( currentYear+1, right.month(), right.day() );
+
+ ret += QDate::currentDate().daysTo(nextLeft) < QDate::currentDate().daysTo(nextRight) ? -1 : 1;
+ }
+
+ return ret;
+}
+
}
}
#endif