Skip to content

Commit

Permalink
[qtcontacts-sqlite] Remove QContactIdType typedef
Browse files Browse the repository at this point in the history 
This typedef was only used to mitigate differences between qtpim and
QtMobility Contacts interfaces.
  • Loading branch information
@matthewvogt
matthewvogt committed Jan 28, 2014
1 parent 9dfdb77 commit 8de9273
Show file tree
Hide file tree
Showing 18 changed files with 211 additions and 216 deletions.
2 changes: 1 addition & 1 deletion src/engine/contactid.cpp
View file
Expand Up @@ -154,7 +154,7 @@ bool ContactId::isValid(quint32 dbId)
return (dbId != 0);
}

QString ContactId::toString(const QContactIdType &apiId)
QString ContactId::toString(const QContactId &apiId)
{
return dbIdToString(databaseId(apiId));
}
Expand Down
6 changes: 2 additions & 4 deletions src/engine/contactid_p.h
View file
Expand Up @@ -38,8 +38,6 @@

#include <QContactEngineId>

#define QContactIdType QContactId

QTCONTACTS_USE_NAMESPACE

class ContactId : public QContactEngineId
Expand All @@ -57,10 +55,10 @@ class ContactId : public QContactEngineId
static bool isValid(const QContactId &apiId);
static bool isValid(quint32 dbId);

static QString toString(const QContactIdType &apiId);
static QString toString(const QContactId &apiId);
static QString toString(const QContact &c);

static QContactIdType fromString(const QString &id);
static QContactId fromString(const QString &id);

ContactId(quint32 databaseId);
ContactId(const QString &s);
Expand Down
18 changes: 9 additions & 9 deletions src/engine/contactnotifier.cpp
View file
Expand Up @@ -52,17 +52,17 @@ void initialize()
qDBusRegisterMetaType<QVector<quint32> >();
}

QVector<quint32> idVector(const QList<QContactIdType> &contactIds)
QVector<quint32> idVector(const QList<QContactId> &contactIds)
{
QVector<quint32> ids;
ids.reserve(contactIds.size());
foreach (const QContactIdType &id, contactIds) {
foreach (const QContactId &id, contactIds) {
ids.append(ContactId::databaseId(id));
}
return ids;
}

void contactsAdded(const QList<QContactIdType> &contactIds)
void contactsAdded(const QList<QContactId> &contactIds)
{
if (!contactIds.isEmpty()) {
QDBusMessage message = QDBusMessage::createSignal(
Expand All @@ -74,7 +74,7 @@ void contactsAdded(const QList<QContactIdType> &contactIds)
}
}

void contactsChanged(const QList<QContactIdType> &contactIds)
void contactsChanged(const QList<QContactId> &contactIds)
{
if (!contactIds.isEmpty()) {
QDBusMessage message = QDBusMessage::createSignal(
Expand All @@ -86,7 +86,7 @@ void contactsChanged(const QList<QContactIdType> &contactIds)
}
}

void contactsPresenceChanged(const QList<QContactIdType> &contactIds)
void contactsPresenceChanged(const QList<QContactId> &contactIds)
{
if (!contactIds.isEmpty()) {
QDBusMessage message = QDBusMessage::createSignal(
Expand All @@ -98,7 +98,7 @@ void contactsPresenceChanged(const QList<QContactIdType> &contactIds)
}
}

void contactsRemoved(const QList<QContactIdType> &contactIds)
void contactsRemoved(const QList<QContactId> &contactIds)
{
if (!contactIds.isEmpty()) {
QDBusMessage message = QDBusMessage::createSignal(
Expand All @@ -110,7 +110,7 @@ void contactsRemoved(const QList<QContactIdType> &contactIds)
}
}

void selfContactIdChanged(QContactIdType oldId, QContactIdType newId)
void selfContactIdChanged(QContactId oldId, QContactId newId)
{
if (oldId != newId) {
QDBusMessage message = QDBusMessage::createSignal(
Expand All @@ -122,7 +122,7 @@ void selfContactIdChanged(QContactIdType oldId, QContactIdType newId)
}
}

void relationshipsAdded(const QSet<QContactIdType> &contactIds)
void relationshipsAdded(const QSet<QContactId> &contactIds)
{
if (!contactIds.isEmpty()) {
QDBusMessage message = QDBusMessage::createSignal(
Expand All @@ -134,7 +134,7 @@ void relationshipsAdded(const QSet<QContactIdType> &contactIds)
}
}

void relationshipsRemoved(const QSet<QContactIdType> &contactIds)
void relationshipsRemoved(const QSet<QContactId> &contactIds)
{
if (!contactIds.isEmpty()) {
QDBusMessage message = QDBusMessage::createSignal(
Expand Down
14 changes: 7 additions & 7 deletions src/engine/contactnotifier.h
View file
Expand Up @@ -43,13 +43,13 @@ QTCONTACTS_USE_NAMESPACE
namespace ContactNotifier
{
void initialize();
void contactsAdded(const QList<QContactIdType> &contactIds);
void contactsChanged(const QList<QContactIdType> &contactIds);
void contactsPresenceChanged(const QList<QContactIdType> &contactIds);
void contactsRemoved(const QList<QContactIdType> &contactIds);
void selfContactIdChanged(QContactIdType oldId, QContactIdType newId);
void relationshipsAdded(const QList<QContactIdType> &contactIds);
void relationshipsRemoved(const QList<QContactIdType> &contactIds);
void contactsAdded(const QList<QContactId> &contactIds);
void contactsChanged(const QList<QContactId> &contactIds);
void contactsPresenceChanged(const QList<QContactId> &contactIds);
void contactsRemoved(const QList<QContactId> &contactIds);
void selfContactIdChanged(QContactId oldId, QContactId newId);
void relationshipsAdded(const QList<QContactId> &contactIds);
void relationshipsRemoved(const QList<QContactId> &contactIds);

bool connect(const char *name, const char *signature, QObject *receiver, const char *slot);
}
Expand Down
18 changes: 9 additions & 9 deletions src/engine/contactreader.cpp
View file
Expand Up @@ -1005,7 +1005,7 @@ static QString buildWhere(const QContactDetailRangeFilter &filter, QVariantList

static QString buildWhere(const QContactIdFilter &filter, QSqlDatabase &db, const QString &table, QVariantList *bindings, bool *failed)
{
const QList<QContactIdType> &filterIds(filter.ids());
const QList<QContactId> &filterIds(filter.ids());
if (filterIds.isEmpty()) {
*failed = true;
QTCONTACTS_SQLITE_WARNING(QString::fromLatin1("Cannot buildWhere with empty contact ID list"));
Expand All @@ -1016,7 +1016,7 @@ static QString buildWhere(const QContactIdFilter &filter, QSqlDatabase &db, cons
dbIds.reserve(filterIds.count());
bindings->reserve(filterIds.count());

foreach (const QContactIdType &id, filterIds) {
foreach (const QContactId &id, filterIds) {
dbIds.append(ContactId::databaseId(id));
}

Expand All @@ -1025,7 +1025,7 @@ static QString buildWhere(const QContactIdFilter &filter, QSqlDatabase &db, cons
const int maxInlineIdsCount = 800;
if (filterIds.count() > maxInlineIdsCount) {
QVariantList varIds;
foreach (const QContactIdType &id, filterIds) {
foreach (const QContactId &id, filterIds) {
varIds.append(QVariant(ContactId::databaseId(id)));
}

Expand Down Expand Up @@ -1350,7 +1350,7 @@ bool includesSelfId(const QContactUnionFilter &filter)
}
bool includesSelfId(const QContactIdFilter &filter)
{
foreach (const QContactIdType &id, filter.ids()) {
foreach (const QContactId &id, filter.ids()) {
if (ContactId::databaseId(id) == selfId)
return true;
}
Expand Down Expand Up @@ -1498,7 +1498,7 @@ QContactManager::Error ContactReader::readContacts(
QContactManager::Error ContactReader::readContacts(
const QString &table,
QList<QContact> *contacts,
const QList<QContactIdType> &contactIds,
const QList<QContactId> &contactIds,
const QContactFetchHint &fetchHint)
{
QMutexLocker locker(ContactsDatabase::accessMutex());
Expand Down Expand Up @@ -1783,7 +1783,7 @@ QContactManager::Error ContactReader::queryContacts(
}

QContactManager::Error ContactReader::readContactIds(
QList<QContactIdType> *contactIds,
QList<QContactId> *contactIds,
const QContactFilter &filter,
const QList<QContactSortOrder> &order)
{
Expand Down Expand Up @@ -1847,7 +1847,7 @@ QContactManager::Error ContactReader::readContactIds(
}

QContactManager::Error ContactReader::getIdentity(
ContactsDatabase::Identity identity, QContactIdType *contactId)
ContactsDatabase::Identity identity, QContactId *contactId)
{
QMutexLocker locker(ContactsDatabase::accessMutex());

Expand All @@ -1866,7 +1866,7 @@ QContactManager::Error ContactReader::getIdentity(
if (query.exec() && query.next()) {
*contactId = ContactId::apiId(query.value(0).toUInt());
} else {
*contactId = QContactIdType();
*contactId = QContactId();
return QContactManager::UnspecifiedError;
}
}
Expand Down Expand Up @@ -1943,6 +1943,6 @@ void ContactReader::contactsAvailable(const QList<QContact> &)
{
}

void ContactReader::contactIdsAvailable(const QList<QContactIdType> &)
void ContactReader::contactIdsAvailable(const QList<QContactId> &)
{
}
8 changes: 4 additions & 4 deletions src/engine/contactreader.h
View file
Expand Up @@ -59,16 +59,16 @@ class ContactReader
QContactManager::Error readContacts(
const QString &table,
QList<QContact> *contacts,
const QList<QContactIdType> &contactIds,
const QList<QContactId> &contactIds,
const QContactFetchHint &fetchHint);

QContactManager::Error readContactIds(
QList<QContactIdType> *contactIds,
QList<QContactId> *contactIds,
const QContactFilter &filter,
const QList<QContactSortOrder> &order);

QContactManager::Error getIdentity(
ContactsDatabase::Identity identity, QContactIdType *contactId);
ContactsDatabase::Identity identity, QContactId *contactId);

QContactManager::Error readRelationships(
QList<QContactRelationship> *relationships,
Expand All @@ -81,7 +81,7 @@ class ContactReader
const QString &table, QList<QContact> *contacts, const QContactFetchHint &fetchHint);

virtual void contactsAvailable(const QList<QContact> &contacts);
virtual void contactIdsAvailable(const QList<QContactIdType> &contactIds);
virtual void contactIdsAvailable(const QList<QContactId> &contactIds);

private:
QSqlDatabase m_database;
Expand Down

0 comments on commit 8de9273

Please sign in to comment.