summaryrefslogtreecommitdiff
path: root/libopie2/opiepim/private/opimsortvector.h
Unidiff
Diffstat (limited to 'libopie2/opiepim/private/opimsortvector.h') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/private/opimsortvector.h24
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
@@ -56,6 +56,8 @@ protected:
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;
@@ -166,6 +168,28 @@ inline int OPimSortVector<T>::testDateTime( const QDateTime& left,
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