Skip to content

Commit

Permalink
Merge branch 'overrides_mer' into 'master'
Browse files Browse the repository at this point in the history 
[qtcontacts-sqlite] Add `override` to virtual methods

See merge request mer-core/qtcontacts-sqlite!23
  • Loading branch information
@pvuorela
pvuorela committed May 9, 2019
2 parents b742eb0 + 2277af4 commit 5aee761
Showing 1 changed file with 34 additions and 34 deletions.
68 changes: 34 additions & 34 deletions src/engine/contactsengine.cpp
View file
Expand Up @@ -127,7 +127,7 @@ class TemplateJob : public Job
return m_request;
}

void clear()
void clear() override
{
m_request = 0;
}
Expand All @@ -137,7 +137,7 @@ class TemplateJob : public Job
return m_error;
}

void setError(QContactManager::Error error)
void setError(QContactManager::Error error) override
{
m_error = error;
}
Expand All @@ -157,18 +157,18 @@ class ContactSaveJob : public TemplateJob<QContactSaveRequest>
{
}

void execute(ContactReader *, WriterProxy &writer)
void execute(ContactReader *, WriterProxy &writer) override
{
m_error = writer->save(&m_contacts, m_definitionMask, 0, &m_errorMap, false, false, false);
}

void updateState(QContactAbstractRequest::State state)
void updateState(QContactAbstractRequest::State state) override
{
QContactManagerEngine::updateContactSaveRequest(
m_request, m_contacts, m_error, m_errorMap, state);
}

QString description() const
QString description() const override
{
QString s(QLatin1String("Save"));
foreach (const QContact &c, m_contacts) {
Expand All @@ -192,13 +192,13 @@ class ContactRemoveJob : public TemplateJob<QContactRemoveRequest>
{
}

void execute(ContactReader *, WriterProxy &writer)
void execute(ContactReader *, WriterProxy &writer) override
{
m_errorMap.clear();
m_error = writer->remove(m_contactIds, &m_errorMap, false);
}

void updateState(QContactAbstractRequest::State state)
void updateState(QContactAbstractRequest::State state) override
{
QContactManagerEngine::updateContactRemoveRequest(
m_request,
Expand All @@ -207,7 +207,7 @@ class ContactRemoveJob : public TemplateJob<QContactRemoveRequest>
state);
}

QString description() const
QString description() const override
{
QString s(QLatin1String("Remove"));
foreach (const QContactId &id, m_contactIds) {
Expand All @@ -232,7 +232,7 @@ class ContactFetchJob : public TemplateJob<QContactFetchRequest>
{
}

void execute(ContactReader *reader, WriterProxy &)
void execute(ContactReader *reader, WriterProxy &) override
{
QList<QContact> contacts;
m_error = reader->readContacts(
Expand All @@ -243,7 +243,7 @@ class ContactFetchJob : public TemplateJob<QContactFetchRequest>
m_fetchHint);
}

void update(QMutex *mutex)
void update(QMutex *mutex) override
{
QList<QContact> contacts; {
QMutexLocker locker(mutex);
Expand All @@ -256,17 +256,17 @@ class ContactFetchJob : public TemplateJob<QContactFetchRequest>
QContactAbstractRequest::ActiveState);
}

void updateState(QContactAbstractRequest::State state)
void updateState(QContactAbstractRequest::State state) override
{
QContactManagerEngine::updateContactFetchRequest(m_request, m_contacts, m_error, state);
}

void contactsAvailable(const QList<QContact> &contacts)
void contactsAvailable(const QList<QContact> &contacts) override
{
m_contacts = contacts;
}

QString description() const
QString description() const override
{
QString s(QLatin1String("Fetch"));
return s;
Expand All @@ -289,13 +289,13 @@ class IdFetchJob : public TemplateJob<QContactIdFetchRequest>
{
}

void execute(ContactReader *reader, WriterProxy &)
void execute(ContactReader *reader, WriterProxy &) override
{
QList<QContactId> contactIds;
m_error = reader->readContactIds(&contactIds, m_filter, m_sorting);
}

void update(QMutex *mutex)
void update(QMutex *mutex) override
{
QList<QContactId> contactIds;
{
Expand All @@ -309,18 +309,18 @@ class IdFetchJob : public TemplateJob<QContactIdFetchRequest>
QContactAbstractRequest::ActiveState);
}

void updateState(QContactAbstractRequest::State state)
void updateState(QContactAbstractRequest::State state) override
{
QContactManagerEngine::updateContactIdFetchRequest(
m_request, m_contactIds, m_error, state);
}

void contactIdsAvailable(const QList<QContactId> &contactIds)
void contactIdsAvailable(const QList<QContactId> &contactIds) override
{
m_contactIds = contactIds;
}

QString description() const
QString description() const override
{
QString s(QLatin1String("Fetch IDs"));
return s;
Expand All @@ -342,7 +342,7 @@ class ContactFetchByIdJob : public TemplateJob<QContactFetchByIdRequest>
{
}

void execute(ContactReader *reader, WriterProxy &)
void execute(ContactReader *reader, WriterProxy &) override
{
QList<QContact> contacts;
m_error = reader->readContacts(
Expand All @@ -352,7 +352,7 @@ class ContactFetchByIdJob : public TemplateJob<QContactFetchByIdRequest>
m_fetchHint);
}

void update(QMutex *mutex)
void update(QMutex *mutex) override
{
QList<QContact> contacts;
{
Expand All @@ -367,7 +367,7 @@ class ContactFetchByIdJob : public TemplateJob<QContactFetchByIdRequest>
QContactAbstractRequest::ActiveState);
}

void updateState(QContactAbstractRequest::State state)
void updateState(QContactAbstractRequest::State state) override
{
QContactManagerEngine::updateContactFetchByIdRequest(
m_request,
Expand All @@ -377,12 +377,12 @@ class ContactFetchByIdJob : public TemplateJob<QContactFetchByIdRequest>
state);
}

void contactsAvailable(const QList<QContact> &contacts)
void contactsAvailable(const QList<QContact> &contacts) override
{
m_contacts = contacts;
}

QString description() const
QString description() const override
{
QString s(QLatin1String("FetchByID"));
foreach (const QContactId &id, m_contactIds) {
Expand All @@ -407,18 +407,18 @@ class RelationshipSaveJob : public TemplateJob<QContactRelationshipSaveRequest>
{
}

void execute(ContactReader *, WriterProxy &writer)
void execute(ContactReader *, WriterProxy &writer) override
{
m_error = writer->save(m_relationships, &m_errorMap, false, false);
}

void updateState(QContactAbstractRequest::State state)
void updateState(QContactAbstractRequest::State state) override
{
QContactManagerEngine::updateRelationshipSaveRequest(
m_request, m_relationships, m_error, m_errorMap, state);
}

QString description() const
QString description() const override
{
QString s(QLatin1String("Relationship Save"));
return s;
Expand All @@ -438,18 +438,18 @@ class RelationshipRemoveJob : public TemplateJob<QContactRelationshipRemoveReque
{
}

void execute(ContactReader *, WriterProxy &writer)
void execute(ContactReader *, WriterProxy &writer) override
{
m_error = writer->remove(m_relationships, &m_errorMap, false);
}

void updateState(QContactAbstractRequest::State state)
void updateState(QContactAbstractRequest::State state) override
{
QContactManagerEngine::updateRelationshipRemoveRequest(
m_request, m_error, m_errorMap, state);
}

QString description() const
QString description() const override
{
QString s(QLatin1String("Relationship Remove"));
return s;
Expand All @@ -471,7 +471,7 @@ class RelationshipFetchJob : public TemplateJob<QContactRelationshipFetchRequest
{
}

void execute(ContactReader *reader, WriterProxy &)
void execute(ContactReader *reader, WriterProxy &) override
{
m_error = reader->readRelationships(
&m_relationships,
Expand All @@ -480,13 +480,13 @@ class RelationshipFetchJob : public TemplateJob<QContactRelationshipFetchRequest
m_second);
}

void updateState(QContactAbstractRequest::State state)
void updateState(QContactAbstractRequest::State state) override
{
QContactManagerEngine::updateRelationshipFetchRequest(
m_request, m_relationships, m_error, state);
}

QString description() const
QString description() const override
{
QString s(QLatin1String("Relationship Fetch"));
return s;
Expand Down Expand Up @@ -757,12 +757,12 @@ class JobContactReader : public ContactReader
{
}

void contactsAvailable(const QList<QContact> &contacts)
void contactsAvailable(const QList<QContact> &contacts) override
{
m_thread->contactsAvailable(contacts);
}

void contactIdsAvailable(const QList<QContactId> &contactIds)
void contactIdsAvailable(const QList<QContactId> &contactIds) override
{
m_thread->contactIdsAvailable(contactIds);
}
Expand Down

0 comments on commit 5aee761

Please sign in to comment.