12 files changed, 138 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
@@ -12,24 +12,27 @@
 * Info: This class could just work with a change in the header-file
 *       of the Contact class ! Therefore our libopie only compiles
 *       with our version of libqpe
 * =====================================================================
 * ToDo: XML-Backend: Automatic reload if something was changed...
 *
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.7  2002/11/13 14:14:51  eilers
+ * Added sorted for Contacts..
+ *
 * Revision 1.6  2002/11/01 15:10:42  eilers
 * Added regExp-search in database for all fields in a contact.
 *
 * Revision 1.5  2002/10/16 10:52:40  eilers
 * Added some docu to the interface and now using the cache infrastucture by zecke.. :)
 *
 * Revision 1.4  2002/10/14 16:21:54  eilers
 * Some minor interface updates
 *
 * Revision 1.3  2002/10/07 17:34:24  eilers
 * added OBackendFactory for advanced backend access
 *
@@ -128,24 +131,29 @@ ORecordList<OContact> OContactAccess::matchRegexp(  const QRegExp &r ) const{
        return ( ORecordList<OContact>(matchingContacts, this) );
 }
 const uint OContactAccess::querySettings()
 {
        return ( m_backEnd->querySettings() );
 }
 bool OContactAccess::hasQuerySettings ( int querySettings ) const
 {
        return ( m_backEnd->hasQuerySettings ( querySettings ) );
 }
+ORecordList<OContact> OContactAccess::sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const
+{
+        QArray<int> matchingContacts = m_backEnd -> sorted( ascending, sortOrder, sortFilter, cat );
+        return ( ORecordList<OContact>(matchingContacts, this) );
+}
 bool OContactAccess::wasChangedExternally()const
 {
        return ( m_backEnd->wasChangedExternally() );
 }
 void OContactAccess::copMessage( const QCString &msg, const QByteArray & )
 {
        if ( msg == "addressbookUpdated()" ){
                qWarning ("OContactAccess: Received addressbokUpdated()");
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
@@ -8,24 +8,27 @@
         *This program is free software; you can redistribute it and/or
         *modify it under the terms of the GNU Library General Public
 *      License as published by the Free Software Foundation;
 *      either version 2 of the License, or (at your option) any later
 *      version.
 * =====================================================================
 * ToDo: Define enum for query settings
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.5  2002/11/13 14:14:51  eilers
+ * Added sorted for Contacts..
+ *
 * Revision 1.4  2002/11/01 15:10:42  eilers
 * Added regExp-search in database for all fields in a contact.
 *
 * Revision 1.3  2002/10/16 10:52:40  eilers
 * Added some docu to the interface and now using the cache infrastucture by zecke.. :)
 *
 * Revision 1.2  2002/10/14 16:21:54  eilers
 * Some minor interface updates
 *
 * Revision 1.1  2002/09/27 17:11:44  eilers
 * Added API for accessing the Contact-Database ! It is compiling, but
 * please do not expect that anything is working !
@@ -82,24 +85,32 @@ class OContactAccess: public QObject, public OPimAccessTemplate<OContact>
         */
        enum QuerySettings {
                WildCards  = 0x0001,
                IgnoreCase = 0x0002,
                RegExp     = 0x0004,
                ExactMatch = 0x0008,
                MatchOne   = 0x0010  // Only one Entry must match
        };
        
        ORecordList<OContact> matchRegexp(  const QRegExp &r )const;
+        /** Return all Contacts in a sorted manner.
+         *  @param ascending true: Sorted in acending order.
+         *  @param sortOrder Currently not implemented. Just defined to stay compatible to otodoaccess
+         *  @param sortFilter Currently not implemented. Just defined to stay compatible to otodoaccess
+         *  @param cat Currently not implemented. Just defined to stay compatible to otodoaccess
+         */
+        List sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const;
        /** Return all possible settings.
         *  @return All settings provided by the current backend
         * (i.e.: query_WildCards & query_IgnoreCase)
         */
        const uint querySettings();
        /** Check whether settings are correct.
         * @return <i>true</i> if the given settings are correct and possible.
         */
        bool hasQuerySettings ( int querySettings ) const;
        /**
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
@@ -10,24 +10,27 @@
         *This program is free software; you can redistribute it and/or
         *modify it under the terms of the GNU Library General Public
 *      License as published by the Free Software Foundation;
 *      either version 2 of the License, or (at your option) any later
 *      version.
 * =====================================================================
 * ToDo: Define enum for query settings
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.4  2002/11/13 14:14:51  eilers
+ * Added sorted for Contacts..
+ *
 * Revision 1.3  2002/11/01 15:10:42  eilers
 * Added regExp-search in database for all fields in a contact.
 *
 * Revision 1.2  2002/10/07 17:34:24  eilers
 * added OBackendFactory for advanced backend access
 *
 * Revision 1.1  2002/09/27 17:11:44  eilers
 * Added API for accessing the Contact-Database ! It is compiling, but
 * please do not expect that anything is working !
 * I will debug that stuff in the next time ..
 * Please read README_COMPILE for compiling !
 *
@@ -67,15 +70,16 @@ class OContactAccessBackend: public OPimAccessBackend<OContact> {
        /** Return all possible settings.
         *  @return All settings provided by the current backend
         * (i.e.: query_WildCards & query_IgnoreCase)
         */
        virtual const uint querySettings() = 0;
        /** Check whether settings are correct.
         * @return <i>true</i> if the given settings are correct and possible.
         */
        virtual bool hasQuerySettings (uint querySettings) const = 0;
+        virtual QArray<int> sorted( bool ascending, int sortOrder, int sortFilter, int cat ) = 0;
 };
 #endif
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
@@ -8,24 +8,27 @@
         *This program is free software; you can redistribute it and/or
         *modify it under the terms of the GNU Library General Public
 *      License as published by the Free Software Foundation; either
 *      version 2 of the License, or (at your option) any later version.
 * =====================================================================
 * ToDo:
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.4  2002/11/13 14:14:51  eilers
+ * Added sorted for Contacts..
+ *
 * Revision 1.3  2002/11/11 16:41:09  kergoth
 * no default arguments in implementation
 *
 * Revision 1.2  2002/11/10 15:41:53  eilers
 * Bugfixes..
 *
 * Revision 1.1  2002/11/09 14:34:52  eilers
 * Added VCard Backend.
 *
 */
 #include "ocontactaccessbackend_vcard.h"
 #include "../../library/backend/vobject_p.h"
@@ -169,24 +172,31 @@ const uint OContactAccessBackend_VCard::querySettings()
 }
 bool OContactAccessBackend_VCard::hasQuerySettings (uint ) const
 {
        return false; // No search possible, therefore all settings invalid ;)
 }
 bool OContactAccessBackend_VCard::wasChangedExternally()
 {
        return false; // Don't expect concurrent access
 }
+// Not implemented
+QArray<int> OContactAccessBackend_VCard::sorted( bool , int, int, int )
+{
+        QArray<int> ar(0);
+        return ar;
+}
 // *** Private stuff ***
 OContact OContactAccessBackend_VCard::parseVObject( VObject *obj )
 {
        OContact c;
        
        VObjectIterator it;
        initPropIterator( &it, obj );
        while( moreIteration( &it ) ) {
                VObject *o = nextVObject( &it );
                QCString name = vObjectName( o );
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
@@ -8,24 +8,27 @@
         *This program is free software; you can redistribute it and/or
         *modify it under the terms of the GNU Library General Public
 *      License as published by the Free Software Foundation; either
 *      version 2 of the License, or (at your option) any later version.
 * =====================================================================
 * ToDo:
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.3  2002/11/13 14:14:51  eilers
+ * Added sorted for Contacts..
+ *
 * Revision 1.2  2002/11/10 15:41:53  eilers
 * Bugfixes..
 *
 * Revision 1.1  2002/11/09 14:34:52  eilers
 * Added VCard Backend.
 *
 */
 #ifndef __OCONTACTACCESSBACKEND_VCARD_H_
 #define __OCONTACTACCESSBACKEND_VCARD_H_
 #include <opie/ocontact.h>
@@ -44,24 +47,25 @@ class OContactAccessBackend_VCard : public OContactAccessBackend {
        bool add ( const OContact& newcontact );
        bool remove ( int uid );
        bool replace ( const OContact& contact );
        
        OContact find ( int uid ) const;
        QArray<int> allRecords() const;
        QArray<int> queryByExample ( const OContact &query, int settings );
        QArray<int> matchRegexp(  const QRegExp &r ) const;
        const uint querySettings();
        bool hasQuerySettings (uint querySettings) const;
+        QArray<int> sorted( bool ascending, int sortOrder, int sortFilter, int cat );
        bool wasChangedExternally();
        
 private:
        OContact parseVObject( VObject* obj );
        VObject* createVObject( const OContact& c );
        QDate convVCardDateToDate( const QString& datestr );
        VObject *safeAddPropValue( VObject *o, const char* prop, const QString& value );
        VObject *safeAddProp( VObject* o, const char* prop);
        
        bool m_dirty : 1;
        QString m_file;
        QMap<int, OContact> m_map;
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
@@ -8,24 +8,27 @@
         *modify it under the terms of the GNU Library General Public
 *      License as published by the Free Software Foundation; either
 *      version 2 of the License, or (at your option) any later version.
 * =====================================================================
 * ToDo: XML-Backend: Automatic reload if something was changed...
 *
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.6  2002/11/13 14:14:51  eilers
+ * Added sorted for Contacts..
+ *
 * Revision 1.5  2002/11/01 15:10:42  eilers
 * Added regExp-search in database for all fields in a contact.
 *
 * Revision 1.4  2002/10/16 10:52:40  eilers
 * Added some docu to the interface and now using the cache infrastucture by zecke.. :)
 *
 * Revision 1.3  2002/10/14 16:21:54  eilers
 * Some minor interface updates
 *
 * Revision 1.2  2002/10/07 17:34:24  eilers
 * added OBackendFactory for advanced backend access
 *
@@ -38,24 +41,25 @@
 *
 */
 #ifndef _OContactAccessBackend_XML_
 #define _OContactAccessBackend_XML_
 #include <qasciidict.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qarray.h>
+#include <qmap.h>
 #include <qpe/global.h>
 #include <opie/xmltree.h>
 #include "ocontactaccessbackend.h"
 #include "ocontactaccess.h"
 #include <stdlib.h>
 #include <errno.h>
 using namespace Opie;
@@ -292,24 +296,52 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
                        switch ( querySettings & ~OContactAccess::IgnoreCase ){
                        case OContactAccess::RegExp:
                                return ( true );
                        case OContactAccess::WildCards:
                                return ( true );
                        case OContactAccess::ExactMatch:
                                return ( true );
                        default:
                                return ( false );
                        }
                }
        
+        // Currently only asc implemented.. 
+        QArray<int> sorted( bool asc,  int , int ,  int ) 
+                {
+                        QMap<QString, int> nameToUid;
+                        QStringList names;
+                        QArray<int> m_currentQuery( m_contactList.count() );
+                        // First fill map and StringList with all Names ( better LastNames ? )
+                        // Afterwards sort namelist and use map to fill array to return..
+                        QValueListConstIterator<OContact> it;
+                        for( it = m_contactList.begin(); it != m_contactList.end(); ++it ){
+                                names.append( (*it).lastName() );
+                                nameToUid.insert( (*it).lastName(), (*it).uid() );
+                        }
+                        names.sort();
+                        int i = 0;
+                        if ( asc ){
+                                for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it )
+                                        m_currentQuery[i++] = nameToUid[ (*it) ];
+                        }else{
+                                for ( QStringList::Iterator it = names.end(); it != names.begin(); --it )
+                                        m_currentQuery[i++] = nameToUid[ (*it) ];
+                        }
+                        
+                        return m_currentQuery;
+                        
+                }
        bool add ( const OContact &newcontact )
                {
                        //qWarning("odefaultbackend: ACTION::ADD");
                        updateJournal (newcontact, OContact::ACTION_ADD);
                        addContact_p( newcontact );
                        
                        m_changed = true;
                        return true;
                }
        
        bool replace ( const OContact &contact )
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend.h b/libopie2/opiepim/backend/ocontactaccessbackend.h
index c898f61..821f5bf 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend.h
@@ -10,24 +10,27 @@
         *This program is free software; you can redistribute it and/or
         *modify it under the terms of the GNU Library General Public
 *      License as published by the Free Software Foundation;
 *      either version 2 of the License, or (at your option) any later
 *      version.
 * =====================================================================
 * ToDo: Define enum for query settings
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.4  2002/11/13 14:14:51  eilers
+ * Added sorted for Contacts..
+ *
 * Revision 1.3  2002/11/01 15:10:42  eilers
 * Added regExp-search in database for all fields in a contact.
 *
 * Revision 1.2  2002/10/07 17:34:24  eilers
 * added OBackendFactory for advanced backend access
 *
 * Revision 1.1  2002/09/27 17:11:44  eilers
 * Added API for accessing the Contact-Database ! It is compiling, but
 * please do not expect that anything is working !
 * I will debug that stuff in the next time ..
 * Please read README_COMPILE for compiling !
 *
@@ -67,15 +70,16 @@ class OContactAccessBackend: public OPimAccessBackend<OContact> {
        /** Return all possible settings.
         *  @return All settings provided by the current backend
         * (i.e.: query_WildCards & query_IgnoreCase)
         */
        virtual const uint querySettings() = 0;
        /** Check whether settings are correct.
         * @return <i>true</i> if the given settings are correct and possible.
         */
        virtual bool hasQuerySettings (uint querySettings) const = 0;
+        virtual QArray<int> sorted( bool ascending, int sortOrder, int sortFilter, int cat ) = 0;
 };
 #endif
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
index faa72b4..09ae37b 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
@@ -8,24 +8,27 @@
         *This program is free software; you can redistribute it and/or
         *modify it under the terms of the GNU Library General Public
 *      License as published by the Free Software Foundation; either
 *      version 2 of the License, or (at your option) any later version.
 * =====================================================================
 * ToDo:
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.4  2002/11/13 14:14:51  eilers
+ * Added sorted for Contacts..
+ *
 * Revision 1.3  2002/11/11 16:41:09  kergoth
 * no default arguments in implementation
 *
 * Revision 1.2  2002/11/10 15:41:53  eilers
 * Bugfixes..
 *
 * Revision 1.1  2002/11/09 14:34:52  eilers
 * Added VCard Backend.
 *
 */
 #include "ocontactaccessbackend_vcard.h"
 #include "../../library/backend/vobject_p.h"
@@ -169,24 +172,31 @@ const uint OContactAccessBackend_VCard::querySettings()
 }
 bool OContactAccessBackend_VCard::hasQuerySettings (uint ) const
 {
        return false; // No search possible, therefore all settings invalid ;)
 }
 bool OContactAccessBackend_VCard::wasChangedExternally()
 {
        return false; // Don't expect concurrent access
 }
+// Not implemented
+QArray<int> OContactAccessBackend_VCard::sorted( bool , int, int, int )
+{
+        QArray<int> ar(0);
+        return ar;
+}
 // *** Private stuff ***
 OContact OContactAccessBackend_VCard::parseVObject( VObject *obj )
 {
        OContact c;
        
        VObjectIterator it;
        initPropIterator( &it, obj );
        while( moreIteration( &it ) ) {
                VObject *o = nextVObject( &it );
                QCString name = vObjectName( o );
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h
index 177ec24..4437756 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h
@@ -8,24 +8,27 @@
         *This program is free software; you can redistribute it and/or
         *modify it under the terms of the GNU Library General Public
 *      License as published by the Free Software Foundation; either
 *      version 2 of the License, or (at your option) any later version.
 * =====================================================================
 * ToDo:
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.3  2002/11/13 14:14:51  eilers
+ * Added sorted for Contacts..
+ *
 * Revision 1.2  2002/11/10 15:41:53  eilers
 * Bugfixes..
 *
 * Revision 1.1  2002/11/09 14:34:52  eilers
 * Added VCard Backend.
 *
 */
 #ifndef __OCONTACTACCESSBACKEND_VCARD_H_
 #define __OCONTACTACCESSBACKEND_VCARD_H_
 #include <opie/ocontact.h>
@@ -44,24 +47,25 @@ class OContactAccessBackend_VCard : public OContactAccessBackend {
        bool add ( const OContact& newcontact );
        bool remove ( int uid );
        bool replace ( const OContact& contact );
        
        OContact find ( int uid ) const;
        QArray<int> allRecords() const;
        QArray<int> queryByExample ( const OContact &query, int settings );
        QArray<int> matchRegexp(  const QRegExp &r ) const;
        const uint querySettings();
        bool hasQuerySettings (uint querySettings) const;
+        QArray<int> sorted( bool ascending, int sortOrder, int sortFilter, int cat );
        bool wasChangedExternally();
        
 private:
        OContact parseVObject( VObject* obj );
        VObject* createVObject( const OContact& c );
        QDate convVCardDateToDate( const QString& datestr );
        VObject *safeAddPropValue( VObject *o, const char* prop, const QString& value );
        VObject *safeAddProp( VObject* o, const char* prop);
        
        bool m_dirty : 1;
        QString m_file;
        QMap<int, OContact> m_map;
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h
index f7e8207..8b95102 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h
@@ -8,24 +8,27 @@
         *modify it under the terms of the GNU Library General Public
 *      License as published by the Free Software Foundation; either
 *      version 2 of the License, or (at your option) any later version.
 * =====================================================================
 * ToDo: XML-Backend: Automatic reload if something was changed...
 *
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.6  2002/11/13 14:14:51  eilers
+ * Added sorted for Contacts..
+ *
 * Revision 1.5  2002/11/01 15:10:42  eilers
 * Added regExp-search in database for all fields in a contact.
 *
 * Revision 1.4  2002/10/16 10:52:40  eilers
 * Added some docu to the interface and now using the cache infrastucture by zecke.. :)
 *
 * Revision 1.3  2002/10/14 16:21:54  eilers
 * Some minor interface updates
 *
 * Revision 1.2  2002/10/07 17:34:24  eilers
 * added OBackendFactory for advanced backend access
 *
@@ -38,24 +41,25 @@
 *
 */
 #ifndef _OContactAccessBackend_XML_
 #define _OContactAccessBackend_XML_
 #include <qasciidict.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qarray.h>
+#include <qmap.h>
 #include <qpe/global.h>
 #include <opie/xmltree.h>
 #include "ocontactaccessbackend.h"
 #include "ocontactaccess.h"
 #include <stdlib.h>
 #include <errno.h>
 using namespace Opie;
@@ -292,24 +296,52 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
                        switch ( querySettings & ~OContactAccess::IgnoreCase ){
                        case OContactAccess::RegExp:
                                return ( true );
                        case OContactAccess::WildCards:
                                return ( true );
                        case OContactAccess::ExactMatch:
                                return ( true );
                        default:
                                return ( false );
                        }
                }
        
+        // Currently only asc implemented.. 
+        QArray<int> sorted( bool asc,  int , int ,  int ) 
+                {
+                        QMap<QString, int> nameToUid;
+                        QStringList names;
+                        QArray<int> m_currentQuery( m_contactList.count() );
+                        // First fill map and StringList with all Names ( better LastNames ? )
+                        // Afterwards sort namelist and use map to fill array to return..
+                        QValueListConstIterator<OContact> it;
+                        for( it = m_contactList.begin(); it != m_contactList.end(); ++it ){
+                                names.append( (*it).lastName() );
+                                nameToUid.insert( (*it).lastName(), (*it).uid() );
+                        }
+                        names.sort();
+                        int i = 0;
+                        if ( asc ){
+                                for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it )
+                                        m_currentQuery[i++] = nameToUid[ (*it) ];
+                        }else{
+                                for ( QStringList::Iterator it = names.end(); it != names.begin(); --it )
+                                        m_currentQuery[i++] = nameToUid[ (*it) ];
+                        }
+                        
+                        return m_currentQuery;
+                        
+                }
        bool add ( const OContact &newcontact )
                {
                        //qWarning("odefaultbackend: ACTION::ADD");
                        updateJournal (newcontact, OContact::ACTION_ADD);
                        addContact_p( newcontact );
                        
                        m_changed = true;
                        return true;
                }
        
        bool replace ( const OContact &contact )
diff --git a/libopie2/opiepim/core/ocontactaccess.cpp b/libopie2/opiepim/core/ocontactaccess.cpp
index f868b53..9c9338e 100644
--- a/libopie2/opiepim/core/ocontactaccess.cpp
+++ b/libopie2/opiepim/core/ocontactaccess.cpp
@@ -12,24 +12,27 @@
 * Info: This class could just work with a change in the header-file
 *       of the Contact class ! Therefore our libopie only compiles
 *       with our version of libqpe
 * =====================================================================
 * ToDo: XML-Backend: Automatic reload if something was changed...
 *
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.7  2002/11/13 14:14:51  eilers
+ * Added sorted for Contacts..
+ *
 * Revision 1.6  2002/11/01 15:10:42  eilers
 * Added regExp-search in database for all fields in a contact.
 *
 * Revision 1.5  2002/10/16 10:52:40  eilers
 * Added some docu to the interface and now using the cache infrastucture by zecke.. :)
 *
 * Revision 1.4  2002/10/14 16:21:54  eilers
 * Some minor interface updates
 *
 * Revision 1.3  2002/10/07 17:34:24  eilers
 * added OBackendFactory for advanced backend access
 *
@@ -128,24 +131,29 @@ ORecordList<OContact> OContactAccess::matchRegexp(  const QRegExp &r ) const{
        return ( ORecordList<OContact>(matchingContacts, this) );
 }
 const uint OContactAccess::querySettings()
 {
        return ( m_backEnd->querySettings() );
 }
 bool OContactAccess::hasQuerySettings ( int querySettings ) const
 {
        return ( m_backEnd->hasQuerySettings ( querySettings ) );
 }
+ORecordList<OContact> OContactAccess::sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const
+{
+        QArray<int> matchingContacts = m_backEnd -> sorted( ascending, sortOrder, sortFilter, cat );
+        return ( ORecordList<OContact>(matchingContacts, this) );
+}
 bool OContactAccess::wasChangedExternally()const
 {
        return ( m_backEnd->wasChangedExternally() );
 }
 void OContactAccess::copMessage( const QCString &msg, const QByteArray & )
 {
        if ( msg == "addressbookUpdated()" ){
                qWarning ("OContactAccess: Received addressbokUpdated()");
diff --git a/libopie2/opiepim/core/ocontactaccess.h b/libopie2/opiepim/core/ocontactaccess.h
index b4921d5..961968f 100644
--- a/libopie2/opiepim/core/ocontactaccess.h
+++ b/libopie2/opiepim/core/ocontactaccess.h
@@ -8,24 +8,27 @@
         *This program is free software; you can redistribute it and/or
         *modify it under the terms of the GNU Library General Public
 *      License as published by the Free Software Foundation;
 *      either version 2 of the License, or (at your option) any later
 *      version.
 * =====================================================================
 * ToDo: Define enum for query settings
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.5  2002/11/13 14:14:51  eilers
+ * Added sorted for Contacts..
+ *
 * Revision 1.4  2002/11/01 15:10:42  eilers
 * Added regExp-search in database for all fields in a contact.
 *
 * Revision 1.3  2002/10/16 10:52:40  eilers
 * Added some docu to the interface and now using the cache infrastucture by zecke.. :)
 *
 * Revision 1.2  2002/10/14 16:21:54  eilers
 * Some minor interface updates
 *
 * Revision 1.1  2002/09/27 17:11:44  eilers
 * Added API for accessing the Contact-Database ! It is compiling, but
 * please do not expect that anything is working !
@@ -82,24 +85,32 @@ class OContactAccess: public QObject, public OPimAccessTemplate<OContact>
         */
        enum QuerySettings {
                WildCards  = 0x0001,
                IgnoreCase = 0x0002,
                RegExp     = 0x0004,
                ExactMatch = 0x0008,
                MatchOne   = 0x0010  // Only one Entry must match
        };
        
        ORecordList<OContact> matchRegexp(  const QRegExp &r )const;
+        /** Return all Contacts in a sorted manner.
+         *  @param ascending true: Sorted in acending order.
+         *  @param sortOrder Currently not implemented. Just defined to stay compatible to otodoaccess
+         *  @param sortFilter Currently not implemented. Just defined to stay compatible to otodoaccess
+         *  @param cat Currently not implemented. Just defined to stay compatible to otodoaccess
+         */
+        List sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const;
        /** Return all possible settings.
         *  @return All settings provided by the current backend
         * (i.e.: query_WildCards & query_IgnoreCase)
         */
        const uint querySettings();
        /** Check whether settings are correct.
         * @return <i>true</i> if the given settings are correct and possible.
         */
        bool hasQuerySettings ( int querySettings ) const;
        /**