-rw-r--r-- | libopie2/opiepim/private/opimeventsortvector.cpp | 134 | ||||
-rw-r--r-- | libopie2/opiepim/private/opimeventsortvector.h | 48 | ||||
-rw-r--r-- | libopie2/opiepim/private/opimsortvector.h | 34 | ||||
-rw-r--r-- | libopie2/opiepim/private/opimtodosortvector.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiepim/private/private.pro | 2 |
5 files changed, 220 insertions, 0 deletions
diff --git a/libopie2/opiepim/private/opimeventsortvector.cpp b/libopie2/opiepim/private/opimeventsortvector.cpp new file mode 100644 index 0000000..4220c63 --- a/dev/null +++ b/libopie2/opiepim/private/opimeventsortvector.cpp | |||
@@ -0,0 +1,134 @@ | |||
1 | /* | ||
2 | This file is part of the Opie Project | ||
3 | Copyright (C) 2004 Stefan Eilers <stefan@eilers-online.net> | ||
4 | =. Copyright (C) The Opie Team <opie-devel@handhelds.org> | ||
5 | .=l. | ||
6 | .>+-= | ||
7 | _;:, .> :=|. This program is free software; you can | ||
8 | .> <`_, > . <= redistribute it and/or modify it under | ||
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | ||
10 | .="- .-=="i, .._ License as published by the Free Software | ||
11 | - . .-<_> .<> Foundation; either version 2 of the License, | ||
12 | ._= =} : or (at your option) any later version. | ||
13 | .%`+i> _;_. | ||
14 | .i_,=:_. -<s. This program is distributed in the hope that | ||
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
16 | : .. .:, . . . without even the implied warranty of | ||
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | ||
19 | ..}^=.= = ; Library General Public License for more | ||
20 | ++= -. .` .: details. | ||
21 | : = ...= . :.=- | ||
22 | -. .:....=;==+<; You should have received a copy of the GNU | ||
23 | -_. . . )=. = Library General Public License along with | ||
24 | -- :-=` this library; see the file COPYING.LIB. | ||
25 | If not, write to the Free Software Foundation, | ||
26 | Inc., 59 Temple Place - Suite 330, | ||
27 | Boston, MA 02111-1307, USA. | ||
28 | */ | ||
29 | |||
30 | #include "opimeventsortvector.h" | ||
31 | #include <opie2/ocontactaccess.h> | ||
32 | #include <opie2/opimnotifymanager.h> | ||
33 | #include <opie2/odatebookaccess.h> | ||
34 | |||
35 | #include <qvaluelist.h> | ||
36 | |||
37 | namespace Opie { | ||
38 | namespace Internal { | ||
39 | |||
40 | namespace{ | ||
41 | |||
42 | inline int testAlarmNotifiers( const OPimNotifyManager& leftnotifiers, const OPimNotifyManager& rightnotifiers ){ | ||
43 | OPimNotifyManager::Alarms left_alarms = leftnotifiers.alarms(); | ||
44 | OPimNotifyManager::Alarms right_alarms = rightnotifiers.alarms(); | ||
45 | |||
46 | // Well.. How could we compare two lists of alarms? I think we should find the most early datetimes | ||
47 | // and compare them.. (se) | ||
48 | // Find the first alarm of the left list | ||
49 | OPimNotifyManager::Alarms::Iterator it; | ||
50 | QDateTime left_earliest; // This datetime is initialized as invalid!! | ||
51 | for ( it = left_alarms.begin(); it != left_alarms.end(); ++it ){ | ||
52 | if ( !left_earliest.isValid() || left_earliest > (*it).dateTime() ){ | ||
53 | left_earliest = (*it).dateTime(); | ||
54 | } | ||
55 | } | ||
56 | QDateTime right_earliest; // This datetime is initialized as invalid!! | ||
57 | for ( it = right_alarms.begin(); it != right_alarms.end(); ++it ){ | ||
58 | if ( !right_earliest.isValid() || right_earliest > (*it).dateTime() ){ | ||
59 | right_earliest = (*it).dateTime(); | ||
60 | } | ||
61 | } | ||
62 | |||
63 | int ret; | ||
64 | |||
65 | // Now compare this found alarms | ||
66 | if ( !left_earliest .isValid() ) ret++; | ||
67 | if ( !right_earliest.isValid() ) ret--; | ||
68 | |||
69 | if ( left_earliest.isValid() && right_earliest.isValid() ){ | ||
70 | ret += left_earliest < right_earliest ? -1 : 1; | ||
71 | } | ||
72 | |||
73 | return ret; | ||
74 | |||
75 | } | ||
76 | } | ||
77 | |||
78 | OPimEventSortVector::OPimEventSortVector( uint size, bool asc, int sort ) | ||
79 | : OPimSortVector<OPimEvent>( size, asc, sort ) {} | ||
80 | |||
81 | int OPimEventSortVector::compareItems( const OPimEvent& left, | ||
82 | const OPimEvent& right ) { | ||
83 | if ( left.uid() == right.uid() ) | ||
84 | return 0; | ||
85 | |||
86 | int ret = 0; | ||
87 | bool asc = sortAscending(); | ||
88 | |||
89 | switch( sortOrder() ) { | ||
90 | case ODateBookAccess::SortDescription: | ||
91 | ret = testString( left.description(), right.description() ); | ||
92 | break; | ||
93 | case ODateBookAccess::SortLocation: | ||
94 | ret = testString( left.location(), right.location() ); | ||
95 | break; | ||
96 | case ODateBookAccess::SortNote: | ||
97 | ret = testString( left.note(),right.note() ); | ||
98 | break; | ||
99 | case ODateBookAccess::SortStartTime: | ||
100 | ret = testTime( left.startDateTime().time(), right.startDateTime().time() ); | ||
101 | break; | ||
102 | case ODateBookAccess::SortEndTime: | ||
103 | ret = testTime( left.endDateTime().time(), right.endDateTime().time() ); | ||
104 | break; | ||
105 | case ODateBookAccess::SortStartDate: | ||
106 | ret = testDate( left.startDateTime().date(), right.startDateTime().date() ); | ||
107 | break; | ||
108 | case ODateBookAccess::SortEndDate: | ||
109 | ret = testDate( left.endDateTime().date(), right.endDateTime().date() ); | ||
110 | break; | ||
111 | case ODateBookAccess::SortStartDateTime: | ||
112 | ret = testDateTime( left.startDateTime(), right.startDateTime() ); | ||
113 | break; | ||
114 | case ODateBookAccess::SortEndDateTime: | ||
115 | ret = testDateTime( left.endDateTime(), right.endDateTime() ); | ||
116 | break; | ||
117 | case ODateBookAccess::SortAlarmDateTime: | ||
118 | ret = testAlarmNotifiers( left.notifiers(), right.notifiers() ); | ||
119 | break; | ||
120 | default: | ||
121 | odebug << "OpimEventSortVector: Unknown sortOrder: " << sortOrder() << oendl; | ||
122 | } | ||
123 | |||
124 | /* twist to honor ascending/descending setting as QVector only sorts ascending */ | ||
125 | if ( !asc ) | ||
126 | ret *= -1; | ||
127 | |||
128 | // Maybe differentiate as in OPimTodoSortVector ### FIXME | ||
129 | // if( ret ) | ||
130 | return ret; | ||
131 | } | ||
132 | |||
133 | } | ||
134 | } | ||
diff --git a/libopie2/opiepim/private/opimeventsortvector.h b/libopie2/opiepim/private/opimeventsortvector.h new file mode 100644 index 0000000..dde26df --- a/dev/null +++ b/libopie2/opiepim/private/opimeventsortvector.h | |||
@@ -0,0 +1,48 @@ | |||
1 | /* | ||
2 | This file is part of the Opie Project | ||
3 | Copyright (C) 2004 Stefan Eilers <stefan@eilers-online.net> | ||
4 | =. Copyright (C) The Opie Team <opie-devel@handhelds.org> | ||
5 | .=l. | ||
6 | .>+-= | ||
7 | _;:, .> :=|. This program is free software; you can | ||
8 | .> <`_, > . <= redistribute it and/or modify it under | ||
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | ||
10 | .="- .-=="i, .._ License as published by the Free Software | ||
11 | - . .-<_> .<> Foundation; either version 2 of the License, | ||
12 | ._= =} : or (at your option) any later version. | ||
13 | .%`+i> _;_. | ||
14 | .i_,=:_. -<s. This program is distributed in the hope that | ||
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
16 | : .. .:, . . . without even the implied warranty of | ||
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | ||
19 | ..}^=.= = ; Library General Public License for more | ||
20 | ++= -. .` .: details. | ||
21 | : = ...= . :.=- | ||
22 | -. .:....=;==+<; You should have received a copy of the GNU | ||
23 | -_. . . )=. = Library General Public License along with | ||
24 | -- :-=` this library; see the file COPYING.LIB. | ||
25 | If not, write to the Free Software Foundation, | ||
26 | Inc., 59 Temple Place - Suite 330, | ||
27 | Boston, MA 02111-1307, USA. | ||
28 | */ | ||
29 | |||
30 | #ifndef OPIM_CONTACT_SORT_VECTOR_H | ||
31 | #define OPIM_CONTACT_SORT_VECTOR_H | ||
32 | |||
33 | #include <opie2/opimevent.h> | ||
34 | #include <opie2/private/opimsortvector.h> | ||
35 | |||
36 | namespace Opie { | ||
37 | namespace Internal { | ||
38 | class OPimEventSortVector : public OPimSortVector<OPimEvent> { | ||
39 | public: | ||
40 | OPimEventSortVector( uint size, bool asc, int sort ); | ||
41 | private: | ||
42 | int compareItems( const OPimEvent&, const OPimEvent& ); | ||
43 | }; | ||
44 | } | ||
45 | } | ||
46 | |||
47 | |||
48 | #endif | ||
diff --git a/libopie2/opiepim/private/opimsortvector.h b/libopie2/opiepim/private/opimsortvector.h index 6c21339..11a40ac 100644 --- a/libopie2/opiepim/private/opimsortvector.h +++ b/libopie2/opiepim/private/opimsortvector.h | |||
@@ -32,48 +32,51 @@ | |||
32 | 32 | ||
33 | #include <opie2/opimglobal.h> | 33 | #include <opie2/opimglobal.h> |
34 | 34 | ||
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; | ||
57 | int testDateTime( const QDateTime& left, | ||
58 | const QDateTime& right )const; | ||
56 | protected: | 59 | protected: |
57 | bool sortAscending()const; | 60 | bool sortAscending()const; |
58 | int sortOrder()const; | 61 | int sortOrder()const; |
59 | 62 | ||
60 | private: | 63 | private: |
61 | bool m_ascending : 1; | 64 | bool m_ascending : 1; |
62 | int m_sort; | 65 | int m_sort; |
63 | virtual int compareItems( const T& item1, const T& item2 ) = 0; | 66 | virtual int compareItems( const T& item1, const T& item2 ) = 0; |
64 | }; | 67 | }; |
65 | 68 | ||
66 | template<class T> | 69 | template<class T> |
67 | OPimSortVector<T>::OPimSortVector( uint size, bool asc, int sort ) | 70 | OPimSortVector<T>::OPimSortVector( uint size, bool asc, int sort ) |
68 | : QVector<VectorItem>( size ), m_ascending( asc ), | 71 | : QVector<VectorItem>( size ), m_ascending( asc ), |
69 | m_sort( sort ) { | 72 | m_sort( sort ) { |
70 | this->setAutoDelete( true ); | 73 | this->setAutoDelete( true ); |
71 | } | 74 | } |
72 | 75 | ||
73 | /** | 76 | /** |
74 | * Returns: | 77 | * Returns: |
75 | * 0 if item1 == item2 | 78 | * 0 if item1 == item2 |
76 | * | 79 | * |
77 | * non-zero if item1 != item2 | 80 | * non-zero if item1 != item2 |
78 | * | 81 | * |
79 | * This function returns int rather than bool so that reimplementations | 82 | * This function returns int rather than bool so that reimplementations |
@@ -99,40 +102,71 @@ bool OPimSortVector<T>::sortAscending()const { | |||
99 | 102 | ||
100 | template<class T> | 103 | template<class T> |
101 | int OPimSortVector<T>::sortOrder()const { | 104 | int OPimSortVector<T>::sortOrder()const { |
102 | return m_sort; | 105 | return m_sort; |
103 | } | 106 | } |
104 | 107 | ||
105 | template<class T> | 108 | template<class T> |
106 | bool OPimSortVector<T>::insert( uint i, const T& record ) { | 109 | bool OPimSortVector<T>::insert( uint i, const T& record ) { |
107 | VectorItem *item = new VectorItem; | 110 | VectorItem *item = new VectorItem; |
108 | item->item = record; | 111 | item->item = record; |
109 | return QVector<VectorItem>::insert( i, item ); | 112 | return QVector<VectorItem>::insert( i, item ); |
110 | } | 113 | } |
111 | 114 | ||
112 | template<class T> | 115 | template<class T> |
113 | UID OPimSortVector<T>::uidAt( uint index )const { | 116 | UID OPimSortVector<T>::uidAt( uint index )const { |
114 | return this->at( index )->item.uid(); | 117 | return this->at( index )->item.uid(); |
115 | } | 118 | } |
116 | 119 | ||
117 | template<class T> | 120 | template<class T> |
118 | inline int OPimSortVector<T>::testString( const QString& left, | 121 | inline int OPimSortVector<T>::testString( const QString& left, |
119 | const QString& right )const { | 122 | const QString& right )const { |
120 | return QString::compare( left, right ); | 123 | return QString::compare( left, right ); |
121 | } | 124 | } |
122 | 125 | ||
126 | |||
123 | template<class T> | 127 | template<class T> |
124 | inline int OPimSortVector<T>::testDate( const QDate& left, | 128 | inline int OPimSortVector<T>::testDate( const QDate& left, |
125 | const QDate& right )const { | 129 | const QDate& right )const { |
126 | int ret = 0; | 130 | int ret = 0; |
127 | if ( !left .isValid() ) ret++; | 131 | if ( !left .isValid() ) ret++; |
128 | if ( !right.isValid() ) ret--; | 132 | if ( !right.isValid() ) ret--; |
129 | 133 | ||
130 | if ( left.isValid() && right.isValid() ) | 134 | if ( left.isValid() && right.isValid() ) |
131 | ret += left < right ? -1 : 1; | 135 | ret += left < right ? -1 : 1; |
132 | 136 | ||
133 | return ret; | 137 | return ret; |
134 | } | 138 | } |
139 | |||
140 | template<class T> | ||
141 | inline int OPimSortVector<T>::testTime( const QTime& left, | ||
142 | const QTime& right )const { | ||
143 | int ret = 0; | ||
144 | if ( !left .isValid() ) ret++; | ||
145 | if ( !right.isValid() ) ret--; | ||
146 | |||
147 | if ( left.isValid() && right.isValid() ){ | ||
148 | ret += left < right ? -1 : 1; | ||
149 | } | ||
150 | |||
151 | return ret; | ||
152 | } | ||
153 | |||
154 | template<class T> | ||
155 | inline int OPimSortVector<T>::testDateTime( const QDateTime& left, | ||
156 | const QDateTime& right )const { | ||
157 | int ret = 0; | ||
158 | if ( !left .isValid() ) ret++; | ||
159 | if ( !right.isValid() ) ret--; | ||
160 | |||
161 | if ( left.isValid() && right.isValid() ){ | ||
162 | ret += left < right ? -1 : 1; | ||
163 | } | ||
164 | |||
165 | return ret; | ||
166 | |||
167 | } | ||
168 | |||
135 | } | 169 | } |
136 | } | 170 | } |
137 | 171 | ||
138 | #endif | 172 | #endif |
diff --git a/libopie2/opiepim/private/opimtodosortvector.cpp b/libopie2/opiepim/private/opimtodosortvector.cpp index 8d15710..1db20df 100644 --- a/libopie2/opiepim/private/opimtodosortvector.cpp +++ b/libopie2/opiepim/private/opimtodosortvector.cpp | |||
@@ -12,84 +12,86 @@ | |||
12 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
13 | .%`+i> _;_. | 13 | .%`+i> _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
16 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
20 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
21 | : = ...= . :.=- | 21 | : = ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "opimtodosortvector.h" | 30 | #include "opimtodosortvector.h" |
31 | #include <opie2/otodoaccess.h> | 31 | #include <opie2/otodoaccess.h> |
32 | 32 | ||
33 | namespace Opie { | 33 | namespace Opie { |
34 | namespace Internal { | 34 | namespace Internal { |
35 | 35 | ||
36 | namespace{ | ||
36 | inline QString string( const OPimTodo& todo) { | 37 | inline QString string( const OPimTodo& todo) { |
37 | return todo.summary().isEmpty() ? | 38 | return todo.summary().isEmpty() ? |
38 | todo.description().left(20 ) : | 39 | todo.description().left(20 ) : |
39 | todo.summary(); | 40 | todo.summary(); |
40 | } | 41 | } |
41 | 42 | ||
42 | inline int completed( const OPimTodo& todo1, const OPimTodo& todo2) { | 43 | inline int completed( const OPimTodo& todo1, const OPimTodo& todo2) { |
43 | int ret = 0; | 44 | int ret = 0; |
44 | if ( todo1.isCompleted() ) ret++; | 45 | if ( todo1.isCompleted() ) ret++; |
45 | if ( todo2.isCompleted() ) ret--; | 46 | if ( todo2.isCompleted() ) ret--; |
46 | return ret; | 47 | return ret; |
47 | } | 48 | } |
48 | 49 | ||
49 | inline int priority( const OPimTodo& t1, const OPimTodo& t2) { | 50 | inline int priority( const OPimTodo& t1, const OPimTodo& t2) { |
50 | return ( t1.priority() - t2.priority() ); | 51 | return ( t1.priority() - t2.priority() ); |
51 | } | 52 | } |
52 | 53 | ||
53 | inline int summary( const OPimTodo& t1, const OPimTodo& t2) { | 54 | inline int summary( const OPimTodo& t1, const OPimTodo& t2) { |
54 | return QString::compare( string(t1), string(t2) ); | 55 | return QString::compare( string(t1), string(t2) ); |
55 | } | 56 | } |
56 | 57 | ||
57 | inline int deadline( const OPimTodo& t1, const OPimTodo& t2) { | 58 | inline int deadline( const OPimTodo& t1, const OPimTodo& t2) { |
58 | int ret = 0; | 59 | int ret = 0; |
59 | if ( t1.hasDueDate() && | 60 | if ( t1.hasDueDate() && |
60 | t2.hasDueDate() ) | 61 | t2.hasDueDate() ) |
61 | ret = t2.dueDate().daysTo( t1.dueDate() ); | 62 | ret = t2.dueDate().daysTo( t1.dueDate() ); |
62 | else if ( t1.hasDueDate() ) | 63 | else if ( t1.hasDueDate() ) |
63 | ret = -1; | 64 | ret = -1; |
64 | else if ( t2.hasDueDate() ) | 65 | else if ( t2.hasDueDate() ) |
65 | ret = 1; | 66 | ret = 1; |
66 | else | 67 | else |
67 | ret = 0; | 68 | ret = 0; |
68 | 69 | ||
69 | return ret; | 70 | return ret; |
70 | } | 71 | } |
71 | 72 | ||
73 | } | ||
72 | 74 | ||
73 | OPimTodoSortVector::OPimTodoSortVector( uint size, bool asc, int sort ) | 75 | OPimTodoSortVector::OPimTodoSortVector( uint size, bool asc, int sort ) |
74 | : OPimSortVector<OPimTodo>( size, asc, sort ) | 76 | : OPimSortVector<OPimTodo>( size, asc, sort ) |
75 | {} | 77 | {} |
76 | 78 | ||
77 | int OPimTodoSortVector::compareItems( const OPimTodo& con1, const OPimTodo& con2 ) { | 79 | int OPimTodoSortVector::compareItems( const OPimTodo& con1, const OPimTodo& con2 ) { |
78 | bool seComp, sePrio, seSum, seDeadline; | 80 | bool seComp, sePrio, seSum, seDeadline; |
79 | seComp = sePrio = seDeadline = seSum = false; | 81 | seComp = sePrio = seDeadline = seSum = false; |
80 | int ret =0; | 82 | int ret =0; |
81 | bool asc = sortAscending(); | 83 | bool asc = sortAscending(); |
82 | 84 | ||
83 | /* same item */ | 85 | /* same item */ |
84 | if ( con1.uid() == con2.uid() ) | 86 | if ( con1.uid() == con2.uid() ) |
85 | return 0; | 87 | return 0; |
86 | 88 | ||
87 | switch ( sortOrder() ) { | 89 | switch ( sortOrder() ) { |
88 | case OPimTodoAccess::Completed: { | 90 | case OPimTodoAccess::Completed: { |
89 | ret = completed( con1, con2 ); | 91 | ret = completed( con1, con2 ); |
90 | seComp = TRUE; | 92 | seComp = TRUE; |
91 | break; | 93 | break; |
92 | } | 94 | } |
93 | case OPimTodoAccess::Priority: { | 95 | case OPimTodoAccess::Priority: { |
94 | ret = priority( con1, con2 ); | 96 | ret = priority( con1, con2 ); |
95 | sePrio = TRUE; | 97 | sePrio = TRUE; |
diff --git a/libopie2/opiepim/private/private.pro b/libopie2/opiepim/private/private.pro index 618c2d6..92c24cb 100644 --- a/libopie2/opiepim/private/private.pro +++ b/libopie2/opiepim/private/private.pro | |||
@@ -1,9 +1,11 @@ | |||
1 | HEADERS += private/vobject_p.h \ | 1 | HEADERS += private/vobject_p.h \ |
2 | private/opimcontactsortvector.h \ | 2 | private/opimcontactsortvector.h \ |
3 | private/opimeventsortvector.h \ | ||
3 | private/opimoccurrence_p.h \ | 4 | private/opimoccurrence_p.h \ |
4 | private/opimsortvector.h \ | 5 | private/opimsortvector.h \ |
5 | private/opimtodosortvector.h | 6 | private/opimtodosortvector.h |
6 | 7 | ||
7 | SOURCES += private/opimcontactsortvector.cpp \ | 8 | SOURCES += private/opimcontactsortvector.cpp \ |
9 | private/opimeventsortvector.cpp \ | ||
8 | private/opimtodosortvector.cpp | 10 | private/opimtodosortvector.cpp |
9 | 11 | ||