Commit 9ed3c641 authored by Richard Braakman's avatar Richard Braakman

Merge pull request #95 from amtep/master

[libcontacts] Prioritize requests that make app startup more responsive
parents 4f147312 4eac9722
This diff is collapsed.
......@@ -342,6 +342,7 @@ private slots:
void contactIdsAvailable();
void relationshipsAvailable();
void requestStateChanged(QContactAbstractRequest::State state);
void addressRequestStateChanged(QContactAbstractRequest::State state);
void updateContacts();
void contactsAdded(const QList<QContactId> &contactIds);
void contactsChanged(const QList<QContactId> &contactIds);
......@@ -373,7 +374,7 @@ private:
void fetchContacts();
void updateContacts(const QList<QContactId> &contactIds, QList<QContactId> *updateList);
void applyPendingContactUpdates();
void applyContactUpdates(const QList<QContact> &contacts, bool partialFetch, const QSet<QContactDetail::DetailType> &queryDetailTypes);
void applyContactUpdates(const QList<QContact> &contacts, const QSet<QContactDetail::DetailType> &queryDetailTypes);
void resolveUnknownAddresses(const QString &first, const QString &second, CacheItem *item);
bool updateContactIndexing(const QContact &oldContact, const QContact &contact, quint32 iid, const QSet<QContactDetail::DetailType> &queryDetailTypes, CacheItem *item);
......@@ -454,6 +455,7 @@ private:
QString m_groupProperty;
bool m_keepPopulated;
PopulateProgress m_populateProgress;
bool m_populating; // true if current m_fetchRequest makes progress
quint32 m_fetchTypes;
quint32 m_extraFetchTypes;
quint32 m_dataTypesFetched;
......@@ -471,10 +473,9 @@ private:
bool requireComplete;
ResolveListener *listener;
};
QList<ResolveData> m_resolveAddresses;
QHash<QContactFetchRequest *, ResolveData> m_resolveAddresses;
QList<ResolveData> m_unknownResolveAddresses;
QList<ResolveData> m_unknownAddresses;
const ResolveData *m_activeResolve;
QSet<QString> m_resolvedPhoneNumbers;
QElapsedTimer m_timer;
......
include(../package.pri)
TEMPLATE = subdirs
SUBDIRS = tst_synchronizelists tst_seasideimport
SUBDIRS = tst_synchronizelists tst_seasideimport tst_resolve
tests_xml.target = tests.xml
tests_xml.depends = $$PWD/tests.xml.in
......
......@@ -10,6 +10,9 @@
<case manual="false" name="seasideimport">
<step>/opt/tests/@PACKAGENAME@/tst_seasideimport</step>
</case>
<case manual="false" name="resolve">
<step>/opt/tests/@PACKAGENAME@/tst_resolve</step>
</case>
</set>
</suite>
</testdefinition>
This diff is collapsed.
include(../common.pri)
include(../../config.pri)
TARGET = tst_resolve
QT += contacts-private dbus
PKGCONFIG += mlocale5
# We need the moc output for ContactManagerEngine from sqlite-extensions
extensionsIncludePath = $$system(pkg-config --cflags-only-I qtcontacts-sqlite-qt5-extensions)
VPATH += $$replace(extensionsIncludePath, -I, )
HEADERS += contactmanagerengine.h
HEADERS += ../../src/seasidecache.h
SOURCES += ../../src/seasidecache.cpp
HEADERS += ../../src/cacheconfiguration.h
SOURCES += ../../src/cacheconfiguration.cpp
SOURCES += tst_resolve.cpp
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment