← Back to branch summary

~ci-train-bot/history-service/history-service-ubuntu-yakkety-landing-1774

« back to all changes in this revision

Viewing changes to plugins/sqlite/sqlitehistoryplugin.cpp

Move the classes from historyprivate static library to libhistoryservice itself and just keep their header files private.
Approved by: Tiago Salem Herrmann, PS Jenkins bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/sqlite/sqlitehistoryplugin.cpp
236
236
        QString participantId = query.value(1).toString();
237
237
        // we don't care about the results, as long as the contact data is present in the cache for
238
238
        // future usage.
239
 
        ContactMatcher::instance()->contactInfo(accountId, participantId, true);
 
239
        History::ContactMatcher::instance()->contactInfo(accountId, participantId, true);
240
240
    }
241
241
 
242
242
    updateGroupedThreadsCache();
283
283
    QString firstParticipant = participants.first();
284
284
    if (phoneCompare) {
285
285
        queryString = queryString.arg("compareNormalizedPhoneNumbers(normalizedId, :participantId)");
286
 
        firstParticipant = PhoneUtils::normalizePhoneNumber(firstParticipant);
 
286
        firstParticipant = History::PhoneUtils::normalizePhoneNumber(firstParticipant);
287
287
    } else {
288
288
        queryString = queryString.arg("participantId=:participantId");
289
289
    }
305
305
    QStringList normalizedParticipants;
306
306
    if (phoneCompare) {
307
307
        Q_FOREACH(const QString &participant, participants) {
308
 
            normalizedParticipants << PhoneUtils::normalizePhoneNumber(participant);
 
308
            normalizedParticipants << History::PhoneUtils::normalizePhoneNumber(participant);
309
309
        }
310
310
    } else {
311
311
        normalizedParticipants = participants;
478
478
    thread[History::FieldAccountId] = accountId;
479
479
    thread[History::FieldThreadId] = threadId;
480
480
    thread[History::FieldType] = (int) type;
481
 
    thread[History::FieldParticipants] = ContactMatcher::instance()->contactInfo(accountId, participants, true);
 
481
    thread[History::FieldParticipants] = History::ContactMatcher::instance()->contactInfo(accountId, participants, true);
482
482
    thread[History::FieldCount] = 0;
483
483
    thread[History::FieldUnreadCount] = 0;
484
484
 
787
787
        thread[History::FieldCount] = query.value(3);
788
788
        thread[History::FieldUnreadCount] = query.value(4);
789
789
        QStringList participants = query.value(5).toString().split("|,|");
790
 
        thread[History::FieldParticipants] = ContactMatcher::instance()->contactInfo(accountId, participants, true);
 
790
        thread[History::FieldParticipants] = History::ContactMatcher::instance()->contactInfo(accountId, participants, true);
791
791
 
792
792
        // the generic event fields
793
793
        thread[History::FieldSenderId] = query.value(6);
831
831
        case History::EventTypeVoice:
832
832
            thread[History::FieldMissed] = query.value(10);
833
833
            thread[History::FieldDuration] = query.value(9);
834
 
            thread[History::FieldRemoteParticipant] = ContactMatcher::instance()->contactInfo(accountId, query.value(11).toString(), true);
 
834
            thread[History::FieldRemoteParticipant] = History::ContactMatcher::instance()->contactInfo(accountId, query.value(11).toString(), true);
835
835
            break;
836
836
        }
837
837
        threads << thread;
890
890
        event[History::FieldTimestamp] = toLocalTimeString(query.value(4).toDateTime());
891
891
        event[History::FieldNewEvent] = query.value(5);
892
892
        QStringList participants = query.value(6).toString().split("|,|");
893
 
        event[History::FieldParticipants] = ContactMatcher::instance()->contactInfo(accountId, participants, true);
 
893
        event[History::FieldParticipants] = History::ContactMatcher::instance()->contactInfo(accountId, participants, true);
894
894
 
895
895
        switch (type) {
896
896
        case History::EventTypeText: