--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.h Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.h Mon May 03 13:18:40 2010 +0300
@@ -43,12 +43,12 @@
#define QTRACKERRELATIONSHIPSAVEREQUEST_H_
#include <QObject>
-
+#include <qtrackercontactasyncrequest.h>
+#include <qtcontacts.h>
#include <QtTracker/QLive>
-#include <qtrackercontactasyncrequest.h>
-#include <qmobilityglobal.h>
-#include <qtcontacts.h>
+#include <QtTracker/ontologies/nco.h>
+
QTM_BEGIN_NAMESPACE
class QContactAbstractRequest;
@@ -71,7 +71,8 @@
void nodesDataReady();
private:
- SopranoLive::LiveNodes nodes;
+ void mergeContacts(const SopranoLive::Live<SopranoLive::Ontologies::nco::PersonContact>&, const SopranoLive::Live<SopranoLive::Ontologies::nco::PersonContact>&);
+ SopranoLive::LiveNodes m_nodes;
};
#endif /* QTRACKERCONTACTSAVEREQUEST_H_ */