summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/ocontactaccessbackend_xml.h9
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_xml.h9
2 files changed, 12 insertions, 6 deletions
diff --git a/libopie/pim/ocontactaccessbackend_xml.h b/libopie/pim/ocontactaccessbackend_xml.h
index 8b95102..adc8dc3 100644
--- a/libopie/pim/ocontactaccessbackend_xml.h
+++ b/libopie/pim/ocontactaccessbackend_xml.h
@@ -14,12 +14,15 @@
14 * 14 *
15 * ===================================================================== 15 * =====================================================================
16 * Version: $Id$ 16 * Version: $Id$
17 * ===================================================================== 17 * =====================================================================
18 * History: 18 * History:
19 * $Log$ 19 * $Log$
20 * Revision 1.7 2002/11/13 15:02:46 eilers
21 * Small Bug in sorted fixed
22 *
20 * Revision 1.6 2002/11/13 14:14:51 eilers 23 * Revision 1.6 2002/11/13 14:14:51 eilers
21 * Added sorted for Contacts.. 24 * Added sorted for Contacts..
22 * 25 *
23 * Revision 1.5 2002/11/01 15:10:42 eilers 26 * Revision 1.5 2002/11/01 15:10:42 eilers
24 * Added regExp-search in database for all fields in a contact. 27 * Added regExp-search in database for all fields in a contact.
25 * 28 *
@@ -309,18 +312,18 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
309 QArray<int> sorted( bool asc, int , int , int ) 312 QArray<int> sorted( bool asc, int , int , int )
310 { 313 {
311 QMap<QString, int> nameToUid; 314 QMap<QString, int> nameToUid;
312 QStringList names; 315 QStringList names;
313 QArray<int> m_currentQuery( m_contactList.count() ); 316 QArray<int> m_currentQuery( m_contactList.count() );
314 317
315 // First fill map and StringList with all Names ( better LastNames ? ) 318 // First fill map and StringList with all Names
316 // Afterwards sort namelist and use map to fill array to return.. 319 // Afterwards sort namelist and use map to fill array to return..
317 QValueListConstIterator<OContact> it; 320 QValueListConstIterator<OContact> it;
318 for( it = m_contactList.begin(); it != m_contactList.end(); ++it ){ 321 for( it = m_contactList.begin(); it != m_contactList.end(); ++it ){
319 names.append( (*it).lastName() ); 322 names.append( (*it).fileAs() );
320 nameToUid.insert( (*it).lastName(), (*it).uid() ); 323 nameToUid.insert( (*it).fileAs(), (*it).uid() );
321 } 324 }
322 names.sort(); 325 names.sort();
323 326
324 int i = 0; 327 int i = 0;
325 if ( asc ){ 328 if ( asc ){
326 for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it ) 329 for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it )
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h
index 8b95102..adc8dc3 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h
@@ -14,12 +14,15 @@
14 * 14 *
15 * ===================================================================== 15 * =====================================================================
16 * Version: $Id$ 16 * Version: $Id$
17 * ===================================================================== 17 * =====================================================================
18 * History: 18 * History:
19 * $Log$ 19 * $Log$
20 * Revision 1.7 2002/11/13 15:02:46 eilers
21 * Small Bug in sorted fixed
22 *
20 * Revision 1.6 2002/11/13 14:14:51 eilers 23 * Revision 1.6 2002/11/13 14:14:51 eilers
21 * Added sorted for Contacts.. 24 * Added sorted for Contacts..
22 * 25 *
23 * Revision 1.5 2002/11/01 15:10:42 eilers 26 * Revision 1.5 2002/11/01 15:10:42 eilers
24 * Added regExp-search in database for all fields in a contact. 27 * Added regExp-search in database for all fields in a contact.
25 * 28 *
@@ -309,18 +312,18 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
309 QArray<int> sorted( bool asc, int , int , int ) 312 QArray<int> sorted( bool asc, int , int , int )
310 { 313 {
311 QMap<QString, int> nameToUid; 314 QMap<QString, int> nameToUid;
312 QStringList names; 315 QStringList names;
313 QArray<int> m_currentQuery( m_contactList.count() ); 316 QArray<int> m_currentQuery( m_contactList.count() );
314 317
315 // First fill map and StringList with all Names ( better LastNames ? ) 318 // First fill map and StringList with all Names
316 // Afterwards sort namelist and use map to fill array to return.. 319 // Afterwards sort namelist and use map to fill array to return..
317 QValueListConstIterator<OContact> it; 320 QValueListConstIterator<OContact> it;
318 for( it = m_contactList.begin(); it != m_contactList.end(); ++it ){ 321 for( it = m_contactList.begin(); it != m_contactList.end(); ++it ){
319 names.append( (*it).lastName() ); 322 names.append( (*it).fileAs() );
320 nameToUid.insert( (*it).lastName(), (*it).uid() ); 323 nameToUid.insert( (*it).fileAs(), (*it).uid() );
321 } 324 }
322 names.sort(); 325 names.sort();
323 326
324 int i = 0; 327 int i = 0;
325 if ( asc ){ 328 if ( asc ){
326 for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it ) 329 for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it )