~ci-train-bot/history-service/history-service-ubuntu-zesty-2629

Viewing changes to Ubuntu/History/historymodel.cpp

Committer: CI Train Bot
Author(s): Gustavo Pichorim Boiko
Date: 2015-10-20 20:21:54 UTC
mfrom: (209.3.29 history-service-move_private_to_shared_lib)
Revision ID: ci-train-bot@canonical.com-20151020202154-0va01imp30vawm5a

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

files removed:
historyprivate

historyprivate/CMakeLists.txt

tests/historyprivate

tests/historyprivate/CMakeLists.txt

files renamed:
historyprivate/channelobserver.cpp => src/channelobserver.cpp

historyprivate/channelobserver_p.h => src/channelobserver_p.h

historyprivate/contactmatcher.cpp => src/contactmatcher.cpp

historyprivate/contactmatcher_p.h => src/contactmatcher_p.h

historyprivate/telepathyhelper.cpp => src/telepathyhelper.cpp

historyprivate/telepathyhelper_p.h => src/telepathyhelper_p.h

historyprivate/utils.cpp => src/utils.cpp

historyprivate/utils_p.h => src/utils_p.h

tests/historyprivate/ContactMatcherTest.cpp => tests/libhistoryservice/ContactMatcherTest.cpp

files modified:
CMakeLists.txt

Ubuntu/History/CMakeLists.txt

Ubuntu/History/historyeventmodel.cpp

Ubuntu/History/historymodel.cpp

cmake/modules/GenerateTest.cmake

daemon/CMakeLists.txt

daemon/historydaemon.cpp

plugins/sqlite/CMakeLists.txt

plugins/sqlite/schema/CMakeLists.txt

plugins/sqlite/sqlitedatabase.cpp

plugins/sqlite/sqlitehistoryplugin.cpp

src/CMakeLists.txt

src/phoneutils.cpp

src/phoneutils_p.h

tests/CMakeLists.txt

tests/common/CMakeLists.txt

tests/common/telepathytest.cpp

tests/daemon/CMakeLists.txt

tests/daemon/DaemonTest.cpp

tests/libhistoryservice/CMakeLists.txt

tests/libhistoryservice/PhoneUtilsTest.cpp

Show diffs side-by-side

added added

removed removed

Ubuntu/History/historymodel.cpp

break;

case ParticipantsRole:

if (mMatchContacts) {

result = ContactMatcher::instance()->contactInfo(properties[History::FieldAccountId].toString(),

History::Participants::fromVariantList(properties[History::FieldParticipants].toList()).identifiers());

result = History::ContactMatcher::instance()->contactInfo(properties[History::FieldAccountId].toString(),

History::Participants::fromVariantList(properties[History::FieldParticipants].toList()).identifiers());

} else {

//FIXME: handle contact changes

result = properties[History::FieldParticipants];

174

Q_EMIT matchContactsChanged();

175

176

if (mMatchContacts) {

177

connect(ContactMatcher::instance(),

177

connect(History::ContactMatcher::instance(),

178

SIGNAL(contactInfoChanged(QString,QString,QVariantMap)),

179

SLOT(onContactInfoChanged(QString,QString,QVariantMap)));

180

} else {

181

ContactMatcher::instance()->disconnect(this);

181

History::ContactMatcher::instance()->disconnect(this);

182

}

183

184

// mark all indexes as changed

280

void HistoryModel::watchContactInfo(const QString &accountId, const QString &identifier, const QVariantMap &currentInfo)

281

{

282

if (mMatchContacts) {

283

ContactMatcher::instance()->watchIdentifier(accountId, identifier, currentInfo);

283

History::ContactMatcher::instance()->watchIdentifier(accountId, identifier, currentInfo);

284

}

285

}

286

Older »