author | eilers <eilers> | 2002-11-13 14:14:51 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-11-13 14:14:51 (UTC) |
commit | 2255284b2e80bdc2881ab9106e9afa614a08c140 (patch) (unidiff) | |
tree | 89e53028d842061371e6414ee037f96fa0fbef5e /libopie | |
parent | eaecbed44924ece119c5b41db2828b4554f263d2 (diff) | |
download | opie-2255284b2e80bdc2881ab9106e9afa614a08c140.zip opie-2255284b2e80bdc2881ab9106e9afa614a08c140.tar.gz opie-2255284b2e80bdc2881ab9106e9afa614a08c140.tar.bz2 |
Added sorted for Contacts..
-rw-r--r-- | libopie/pim/ocontactaccess.cpp | 8 | ||||
-rw-r--r-- | libopie/pim/ocontactaccess.h | 11 | ||||
-rw-r--r-- | libopie/pim/ocontactaccessbackend.h | 4 | ||||
-rw-r--r-- | libopie/pim/ocontactaccessbackend_vcard.cpp | 10 | ||||
-rw-r--r-- | libopie/pim/ocontactaccessbackend_vcard.h | 4 | ||||
-rw-r--r-- | libopie/pim/ocontactaccessbackend_xml.h | 32 |
6 files changed, 69 insertions, 0 deletions
diff --git a/libopie/pim/ocontactaccess.cpp b/libopie/pim/ocontactaccess.cpp index f868b53..9c9338e 100644 --- a/libopie/pim/ocontactaccess.cpp +++ b/libopie/pim/ocontactaccess.cpp | |||
@@ -22,4 +22,7 @@ | |||
22 | * History: | 22 | * History: |
23 | * $Log$ | 23 | * $Log$ |
24 | * Revision 1.7 2002/11/13 14:14:51 eilers | ||
25 | * Added sorted for Contacts.. | ||
26 | * | ||
24 | * Revision 1.6 2002/11/01 15:10:42 eilers | 27 | * Revision 1.6 2002/11/01 15:10:42 eilers |
25 | * Added regExp-search in database for all fields in a contact. | 28 | * Added regExp-search in database for all fields in a contact. |
@@ -138,4 +141,9 @@ bool OContactAccess::hasQuerySettings ( int querySettings ) const | |||
138 | return ( m_backEnd->hasQuerySettings ( querySettings ) ); | 141 | return ( m_backEnd->hasQuerySettings ( querySettings ) ); |
139 | } | 142 | } |
143 | ORecordList<OContact> OContactAccess::sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const | ||
144 | { | ||
145 | QArray<int> matchingContacts = m_backEnd -> sorted( ascending, sortOrder, sortFilter, cat ); | ||
146 | return ( ORecordList<OContact>(matchingContacts, this) ); | ||
147 | } | ||
140 | 148 | ||
141 | 149 | ||
diff --git a/libopie/pim/ocontactaccess.h b/libopie/pim/ocontactaccess.h index b4921d5..961968f 100644 --- a/libopie/pim/ocontactaccess.h +++ b/libopie/pim/ocontactaccess.h | |||
@@ -18,4 +18,7 @@ | |||
18 | * History: | 18 | * History: |
19 | * $Log$ | 19 | * $Log$ |
20 | * Revision 1.5 2002/11/13 14:14:51 eilers | ||
21 | * Added sorted for Contacts.. | ||
22 | * | ||
20 | * Revision 1.4 2002/11/01 15:10:42 eilers | 23 | * Revision 1.4 2002/11/01 15:10:42 eilers |
21 | * Added regExp-search in database for all fields in a contact. | 24 | * Added regExp-search in database for all fields in a contact. |
@@ -92,4 +95,12 @@ class OContactAccess: public QObject, public OPimAccessTemplate<OContact> | |||
92 | ORecordList<OContact> matchRegexp( const QRegExp &r )const; | 95 | ORecordList<OContact> matchRegexp( const QRegExp &r )const; |
93 | 96 | ||
97 | /** Return all Contacts in a sorted manner. | ||
98 | * @param ascending true: Sorted in acending order. | ||
99 | * @param sortOrder Currently not implemented. Just defined to stay compatible to otodoaccess | ||
100 | * @param sortFilter Currently not implemented. Just defined to stay compatible to otodoaccess | ||
101 | * @param cat Currently not implemented. Just defined to stay compatible to otodoaccess | ||
102 | */ | ||
103 | List sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const; | ||
104 | |||
94 | /** Return all possible settings. | 105 | /** Return all possible settings. |
95 | * @return All settings provided by the current backend | 106 | * @return All settings provided by the current backend |
diff --git a/libopie/pim/ocontactaccessbackend.h b/libopie/pim/ocontactaccessbackend.h index c898f61..821f5bf 100644 --- a/libopie/pim/ocontactaccessbackend.h +++ b/libopie/pim/ocontactaccessbackend.h | |||
@@ -20,4 +20,7 @@ | |||
20 | * History: | 20 | * History: |
21 | * $Log$ | 21 | * $Log$ |
22 | * Revision 1.4 2002/11/13 14:14:51 eilers | ||
23 | * Added sorted for Contacts.. | ||
24 | * | ||
22 | * Revision 1.3 2002/11/01 15:10:42 eilers | 25 | * Revision 1.3 2002/11/01 15:10:42 eilers |
23 | * Added regExp-search in database for all fields in a contact. | 26 | * Added regExp-search in database for all fields in a contact. |
@@ -77,4 +80,5 @@ class OContactAccessBackend: public OPimAccessBackend<OContact> { | |||
77 | virtual bool hasQuerySettings (uint querySettings) const = 0; | 80 | virtual bool hasQuerySettings (uint querySettings) const = 0; |
78 | 81 | ||
82 | virtual QArray<int> sorted( bool ascending, int sortOrder, int sortFilter, int cat ) = 0; | ||
79 | 83 | ||
80 | }; | 84 | }; |
diff --git a/libopie/pim/ocontactaccessbackend_vcard.cpp b/libopie/pim/ocontactaccessbackend_vcard.cpp index faa72b4..09ae37b 100644 --- a/libopie/pim/ocontactaccessbackend_vcard.cpp +++ b/libopie/pim/ocontactaccessbackend_vcard.cpp | |||
@@ -18,4 +18,7 @@ | |||
18 | * History: | 18 | * History: |
19 | * $Log$ | 19 | * $Log$ |
20 | * Revision 1.4 2002/11/13 14:14:51 eilers | ||
21 | * Added sorted for Contacts.. | ||
22 | * | ||
20 | * Revision 1.3 2002/11/11 16:41:09 kergoth | 23 | * Revision 1.3 2002/11/11 16:41:09 kergoth |
21 | * no default arguments in implementation | 24 | * no default arguments in implementation |
@@ -179,4 +182,11 @@ bool OContactAccessBackend_VCard::wasChangedExternally() | |||
179 | } | 182 | } |
180 | 183 | ||
184 | // Not implemented | ||
185 | QArray<int> OContactAccessBackend_VCard::sorted( bool , int, int, int ) | ||
186 | { | ||
187 | QArray<int> ar(0); | ||
188 | return ar; | ||
189 | } | ||
190 | |||
181 | // *** Private stuff *** | 191 | // *** Private stuff *** |
182 | 192 | ||
diff --git a/libopie/pim/ocontactaccessbackend_vcard.h b/libopie/pim/ocontactaccessbackend_vcard.h index 177ec24..4437756 100644 --- a/libopie/pim/ocontactaccessbackend_vcard.h +++ b/libopie/pim/ocontactaccessbackend_vcard.h | |||
@@ -18,4 +18,7 @@ | |||
18 | * History: | 18 | * History: |
19 | * $Log$ | 19 | * $Log$ |
20 | * Revision 1.3 2002/11/13 14:14:51 eilers | ||
21 | * Added sorted for Contacts.. | ||
22 | * | ||
20 | * Revision 1.2 2002/11/10 15:41:53 eilers | 23 | * Revision 1.2 2002/11/10 15:41:53 eilers |
21 | * Bugfixes.. | 24 | * Bugfixes.. |
@@ -54,4 +57,5 @@ class OContactAccessBackend_VCard : public OContactAccessBackend { | |||
54 | const uint querySettings(); | 57 | const uint querySettings(); |
55 | bool hasQuerySettings (uint querySettings) const; | 58 | bool hasQuerySettings (uint querySettings) const; |
59 | QArray<int> sorted( bool ascending, int sortOrder, int sortFilter, int cat ); | ||
56 | bool wasChangedExternally(); | 60 | bool wasChangedExternally(); |
57 | 61 | ||
diff --git a/libopie/pim/ocontactaccessbackend_xml.h b/libopie/pim/ocontactaccessbackend_xml.h index f7e8207..8b95102 100644 --- a/libopie/pim/ocontactaccessbackend_xml.h +++ b/libopie/pim/ocontactaccessbackend_xml.h | |||
@@ -18,4 +18,7 @@ | |||
18 | * History: | 18 | * History: |
19 | * $Log$ | 19 | * $Log$ |
20 | * Revision 1.6 2002/11/13 14:14:51 eilers | ||
21 | * Added sorted for Contacts.. | ||
22 | * | ||
20 | * Revision 1.5 2002/11/01 15:10:42 eilers | 23 | * Revision 1.5 2002/11/01 15:10:42 eilers |
21 | * Added regExp-search in database for all fields in a contact. | 24 | * Added regExp-search in database for all fields in a contact. |
@@ -48,4 +51,5 @@ | |||
48 | #include <qregexp.h> | 51 | #include <qregexp.h> |
49 | #include <qarray.h> | 52 | #include <qarray.h> |
53 | #include <qmap.h> | ||
50 | 54 | ||
51 | #include <qpe/global.h> | 55 | #include <qpe/global.h> |
@@ -302,4 +306,32 @@ class OContactAccessBackend_XML : public OContactAccessBackend { | |||
302 | } | 306 | } |
303 | 307 | ||
308 | // Currently only asc implemented.. | ||
309 | QArray<int> sorted( bool asc, int , int , int ) | ||
310 | { | ||
311 | QMap<QString, int> nameToUid; | ||
312 | QStringList names; | ||
313 | QArray<int> m_currentQuery( m_contactList.count() ); | ||
314 | |||
315 | // First fill map and StringList with all Names ( better LastNames ? ) | ||
316 | // Afterwards sort namelist and use map to fill array to return.. | ||
317 | QValueListConstIterator<OContact> it; | ||
318 | for( it = m_contactList.begin(); it != m_contactList.end(); ++it ){ | ||
319 | names.append( (*it).lastName() ); | ||
320 | nameToUid.insert( (*it).lastName(), (*it).uid() ); | ||
321 | } | ||
322 | names.sort(); | ||
323 | |||
324 | int i = 0; | ||
325 | if ( asc ){ | ||
326 | for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it ) | ||
327 | m_currentQuery[i++] = nameToUid[ (*it) ]; | ||
328 | }else{ | ||
329 | for ( QStringList::Iterator it = names.end(); it != names.begin(); --it ) | ||
330 | m_currentQuery[i++] = nameToUid[ (*it) ]; | ||
331 | } | ||
332 | |||
333 | return m_currentQuery; | ||
334 | |||
335 | } | ||
304 | bool add ( const OContact &newcontact ) | 336 | bool add ( const OContact &newcontact ) |
305 | { | 337 | { |