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
@@ -51,67 +51,62 @@ namespace Opie {
  * This is just a frontend for the real database handling which is
  * done by the backend.
  * This class is used to access the Contacts on a system. This class as any OPIE PIM
  * class is backend independent.
  * @author Stefan Eilers, Holger Freyther
  * @see OPimAccessTemplate
  */
 class OPimContactAccess: public QObject, public OPimAccessTemplate<OPimContact>
 {
     Q_OBJECT
 
  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
+    };
+
 	/**
          * Create Database with contacts (addressbook).
 	 * @param appname Name of application which wants access to the database
 	 * (i.e. "todolist")
 	 * @param filename The name of the database file. If not set, the default one
 	 * is used.
 	 * @param backend Pointer to an alternative Backend. If not set, we will use
 	 * the default backend.
 	 * @param handlesync If <b>true</b> the database stores the current state
 	 * automatically if it receives the signals <i>flush()</i> and <i>reload()</i>
 	 * which are used before and after synchronisation. If the application wants
 	 * to react itself, it should be disabled by setting it to <b>false</b>
 	 * @see OPimContactAccessBackend
 	 */
 	OPimContactAccess (const QString appname, const QString filename = 0l,
                     OPimContactAccessBackend* backend = 0l, bool handlesync = true);
 	~OPimContactAccess ();
 
-	/** 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;
 
 	/** 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;
 
@@ -135,26 +130,24 @@ class OPimContactAccess: public QObject, public OPimAccessTemplate<OPimContact>
 
  signals:
 	/* Signal is emitted if the database was changed. Therefore
 	 * we may need to reload to stay consistent.
 	 * @param which Pointer to the database who created this event. This pointer
 	 * is useful if an application has to handle multiple databases at the same time.
 	 * @see reload()
 	 */
 	void signalChanged ( const OPimContactAccess *which );
 
 
  private:
-	// class OPimContactAccessPrivate;
-	// OPimContactAccessPrivate* d;
         OPimContactAccessBackend *m_backEnd;
         bool m_loading:1;
 
  private slots:
 	void copMessage( const QCString &msg, const QByteArray &data );
 
  private:
         class Private;
 	Private *d;
 
 };