author | paule <paule> | 2007-01-13 09:00:15 (UTC) |
---|---|---|
committer | paule <paule> | 2007-01-13 09:00:15 (UTC) |
commit | 5c03ec2b2d0d6b10f7581b8b447cbcb1935e7e67 (patch) (unidiff) | |
tree | 0ae38a54d489376ce3ac7df2441046075fb8cf14 /libopie2/opiepim/private/opimsortvector.h | |
parent | a1360b0af73518d97ebe63ad3cd156cd8b57c8b5 (diff) | |
download | opie-5c03ec2b2d0d6b10f7581b8b447cbcb1935e7e67.zip opie-5c03ec2b2d0d6b10f7581b8b447cbcb1935e7e67.tar.gz opie-5c03ec2b2d0d6b10f7581b8b447cbcb1935e7e67.tar.bz2 |
Implement default sort functions for contact last name and birthday/anniversary. The latter is required for sorting birthdays/anniversaries correctly on the today screen.
Fixes bug #1760.
Diffstat (limited to 'libopie2/opiepim/private/opimsortvector.h') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiepim/private/opimsortvector.h | 24 |
1 files changed, 24 insertions, 0 deletions
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 | |||
@@ -35,48 +35,50 @@ | |||
35 | #include <qvector.h> | 35 | #include <qvector.h> |
36 | 36 | ||
37 | namespace Opie { | 37 | namespace Opie { |
38 | namespace Internal { | 38 | namespace Internal { |
39 | template<class T> | 39 | template<class T> |
40 | struct OPimSortVectorContainer { | 40 | struct OPimSortVectorContainer { |
41 | T item; | 41 | T item; |
42 | }; | 42 | }; |
43 | 43 | ||
44 | template<class T> | 44 | template<class T> |
45 | class OPimSortVector : public QVector<OPimSortVectorContainer<T> > { | 45 | class OPimSortVector : public QVector<OPimSortVectorContainer<T> > { |
46 | typedef OPimSortVectorContainer<T> VectorItem; | 46 | typedef OPimSortVectorContainer<T> VectorItem; |
47 | public: | 47 | public: |
48 | OPimSortVector( uint size, bool asc, int sort ); | 48 | OPimSortVector( uint size, bool asc, int sort ); |
49 | int compareItems( QCollection::Item d1, QCollection::Item d2 ); | 49 | int compareItems( QCollection::Item d1, QCollection::Item d2 ); |
50 | bool insert( uint, const T& t ); | 50 | bool insert( uint, const T& t ); |
51 | UID uidAt( uint i )const; | 51 | UID uidAt( uint i )const; |
52 | 52 | ||
53 | protected: | 53 | protected: |
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; | ||
59 | protected: | 61 | protected: |
60 | bool sortAscending()const; | 62 | bool sortAscending()const; |
61 | int sortOrder()const; | 63 | int sortOrder()const; |
62 | 64 | ||
63 | private: | 65 | private: |
64 | bool m_ascending : 1; | 66 | bool m_ascending : 1; |
65 | int m_sort; | 67 | int m_sort; |
66 | virtual int compareItems( const T& item1, const T& item2 ) = 0; | 68 | virtual int compareItems( const T& item1, const T& item2 ) = 0; |
67 | }; | 69 | }; |
68 | 70 | ||
69 | template<class T> | 71 | template<class T> |
70 | OPimSortVector<T>::OPimSortVector( uint size, bool asc, int sort ) | 72 | OPimSortVector<T>::OPimSortVector( uint size, bool asc, int sort ) |
71 | : QVector<VectorItem>( size ), m_ascending( asc ), | 73 | : QVector<VectorItem>( size ), m_ascending( asc ), |
72 | m_sort( sort ) { | 74 | m_sort( sort ) { |
73 | this->setAutoDelete( true ); | 75 | this->setAutoDelete( true ); |
74 | } | 76 | } |
75 | 77 | ||
76 | /** | 78 | /** |
77 | * Returns: | 79 | * Returns: |
78 | * 0 if item1 == item2 | 80 | * 0 if item1 == item2 |
79 | * | 81 | * |
80 | * non-zero if item1 != item2 | 82 | * non-zero if item1 != item2 |
81 | * | 83 | * |
82 | * This function returns int rather than bool so that reimplementations | 84 | * This function returns int rather than bool so that reimplementations |
@@ -145,28 +147,50 @@ inline int OPimSortVector<T>::testTime( const QTime& left, | |||
145 | if ( !right.isValid() ) ret--; | 147 | if ( !right.isValid() ) ret--; |
146 | 148 | ||
147 | if ( left.isValid() && right.isValid() ){ | 149 | if ( left.isValid() && right.isValid() ){ |
148 | ret += left < right ? -1 : 1; | 150 | ret += left < right ? -1 : 1; |
149 | } | 151 | } |
150 | 152 | ||
151 | return ret; | 153 | return ret; |
152 | } | 154 | } |
153 | 155 | ||
154 | template<class T> | 156 | template<class T> |
155 | inline int OPimSortVector<T>::testDateTime( const QDateTime& left, | 157 | inline int OPimSortVector<T>::testDateTime( const QDateTime& left, |
156 | const QDateTime& right )const { | 158 | const QDateTime& right )const { |
157 | int ret = 0; | 159 | int ret = 0; |
158 | if ( !left .isValid() ) ret++; | 160 | if ( !left .isValid() ) ret++; |
159 | if ( !right.isValid() ) ret--; | 161 | if ( !right.isValid() ) ret--; |
160 | 162 | ||
161 | if ( left.isValid() && right.isValid() ){ | 163 | if ( left.isValid() && right.isValid() ){ |
162 | ret += left < right ? -1 : 1; | 164 | ret += left < right ? -1 : 1; |
163 | } | 165 | } |
164 | 166 | ||
165 | return ret; | 167 | return ret; |
166 | 168 | ||
167 | } | 169 | } |
168 | 170 | ||
171 | template<class T> | ||
172 | inline 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 |