--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactasyncrequest.h	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactasyncrequest.h	Mon May 03 13:18:40 2010 +0300
@@ -42,20 +42,8 @@
 #ifndef QTRACKERCONTACTASYNCREQUEST_H_
 #define QTRACKERCONTACTASYNCREQUEST_H_
 
-#include <QObject>
-
-#include <QtTracker/Tracker>
-#include <QtTracker/QLive>
-
 #include <qmobilityglobal.h>
-#include <qcontact.h>
-#include <qcontactonlineaccount.h>
-#include <qcontactmanager.h>
-
-QTM_BEGIN_NAMESPACE
-class QContactAbstractRequest;
-class QContactManagerEngine;
-QTM_END_NAMESPACE
+#include <qcontactabstractrequest.h>
 
 QTM_USE_NAMESPACE
 
@@ -73,88 +61,4 @@
     QContactAbstractRequest* req;
 };
 
-namespace IMAccount {
-    enum IMResultColumn {
-        URI,
-        ContactIMId,
-        ContactPresence,
-        ContactMessage,
-        ContactNickname,
-        ContactDisplayname
-    };
-};
-
-namespace IMContact {
-    enum IMResultColumn {
-        URI,
-        ContactId,
-        ContactIMId,
-        ContactPresence,
-        ContactMessage,
-        ContactNickname,
-        AccountType,
-        Capabilities,
-        MetaContact,
-        ServiceProvider
-    };
-};
-
-/*!
- * Running QContactFetchRequest. Doing the async tracker query and when data is ready setting the
- * finished status of request. \sa QTrackerContactFetchRequest
- */
-class QTrackerContactFetchRequest : public QObject, public QTrackerContactAsyncRequest
-{
-    Q_OBJECT
-//    Q_ENUMS(IMResultColumn)
-public:
-    QTrackerContactFetchRequest(QContactAbstractRequest* req, QContactManagerEngine* parent);
-public slots:
-    void contactsReady();
-    void phoneNumbersReady();
-    void emailAddressesReady();
-    void iMAcountsReady();
-
-protected slots:
-    virtual void run();
-    virtual void emitFinished(QContactManager::Error error = QContactManager::NoError);
-
-protected:
-    QContactManager::Error applyFilterToContact(SopranoLive::RDFVariable &variable, const QContactFilter &filter);
-    QContactManager::Error applyDetailRangeFilterToContact(SopranoLive::RDFVariable &variable, const QContactFilter &filter);
-
-    // contacts query
-    SopranoLive::LiveNodes query;
-
-    QList<SopranoLive::LiveNodes> queryPhoneNumbersNodes; // 2 - one for affiliations and another one for PersonContact
-    int queryPhoneNumbersNodesPending;
-    QList<SopranoLive::LiveNodes> queryEmailAddressNodes; // 2 - one for affiliations and another one for PersonContact
-    int queryEmailAddressNodesPending;
-    SopranoLive::LiveNodes queryIMAccountNodes;
-    int queryIMAccountNodesPending;
-
-    // result of the request - multiple queries updating it
-    QList<QContact> result;
-
-private:
-    bool isMeContact(const QContactFilter &filter);
-    // fills received phone number from tracker to list of contacts to QContactPhoneMumber details
-    // all the following methods update \sa result
-    void processQueryPhoneNumbers(SopranoLive::LiveNodes queryPhoneNumbers, bool affiliationNumbers);
-    void processQueryEmailAddresses(SopranoLive::LiveNodes queryEmailAddresses, bool affiliationEmails);
-    void processQueryIMContacts(SopranoLive::LiveNodes queryIMContacts);
-    void validateRequest();
-    void readFromQueryRowToContact(QContact &contact, int queryRow);
-    QContact &linkContactsWithSameMetaContact(QContact &first, QContact &second);
-    void addContactToResultSet(QContact &contact, const QString &metacontact);
-    QContactOnlineAccount getOnlineAccountFromIMQuery(SopranoLive::LiveNodes imAccountQuery, int queryRow);
-    QContactOnlineAccount getIMAccountFromIMQuery(SopranoLive::LiveNodes imAccountQuery, int queryRow) ;
-    QContactOnlineAccount getIMContactFromIMQuery(SopranoLive::LiveNodes imAccountQuery, int queryRow);
-
-    // access existing contacts in result list, contactid to index in \sa result lookup
-    QHash<quint32, int> id2ContactLookup;
-    // metacontact to index in \sa result lookup - index of metacontact contact: only 1 contact returned when multiple have the same metacontact
-    QHash<QString, int> metacontactLookup;
-};
-
 #endif /* QTRACKERCONTACTASYNCREQUEST_H_ */