1 files changed, 20 insertions, 27 deletions

diff --git a/libopie2/opiepim/core/ocontactaccess.h b/libopie2/opiepim/core/ocontactaccess.h
index 4429b6f..691ece2 100644
--- a/libopie2/opiepim/core/ocontactaccess.h
+++ b/libopie2/opiepim/core/ocontactaccess.h
@@ -62,2 +62,22 @@ class OPimContactAccess: public QObject, public OPimAccessTemplate<OPimContact>
  public:
+    enum SortFilter {
+        DoNotShowNoneChildren      = FilterCustom<<1,
+        DoNotShowNoneAnniversary   = FilterCustom<<2,
+        DoNotShowNoneBirthday      = FilterCustom<<3,
+        DoNotShowNoHomeAddress     = FilterCustom<<4,
+        DoNotShowNoBusinessAddress = FilterCustom<<5
+    };
+
+    enum SortOrder {
+        SortTitle = SortCustom,
+        SortFirstName,
+        SortMiddleName,
+        SortSuffix,
+        SortEmail,
+        SortNickname,
+        SortAnniversary,
+        SortBirthday,
+        SortGender
+    };
+
         /**
@@ -80,27 +100,2 @@ class OPimContactAccess: public QObject, public OPimAccessTemplate<OPimContact>
 
-        /** Constants for query.
-         * Use this constants to set the query parameters.
-         * Note: <i>query_IgnoreCase</i> just make sense with one of the other attributes !
-         * @see queryByExample()
-         */
-        enum QuerySettings {
-                WildCards  = 0x0001,
-                IgnoreCase = 0x0002,
-                RegExp     = 0x0004,
-                ExactMatch = 0x0008,
-                MatchOne   = 0x0010, // Only one Entry must match
-                DateDiff   = 0x0020, // Find all entries from today until given date
-                DateYear   = 0x0040, // The year matches
-                DateMonth  = 0x0080, // The month matches
-                DateDay    = 0x0100, // The day matches
-        };
-
-
-        /** 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;
 
@@ -146,4 +141,2 @@ class OPimContactAccess: public QObject, public OPimAccessTemplate<OPimContact>
  private:
-        // class OPimContactAccessPrivate;
-        // OPimContactAccessPrivate* d;
         OPimContactAccessBackend *m_backEnd;