[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:07:38 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=e44e65b
The following commit has been merged in the master branch:
commit e44e65bb1e10691df619be8fa252da4c304f86d2
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Sun Sep 22 15:14:57 2013 +0100
Fix compile
---
kpeople/CMakeLists.txt | 1 +
kpeople/nepomuk-feeder/CMakeLists.txt | 5 ++++-
kpeople/nepomuk-feeder/account.cpp | 24 ++++++++++++------------
kpeople/nepomuk-feeder/controller.cpp | 8 ++++----
kpeople/nepomuk-feeder/nepomuk-storage.cpp | 10 +++++-----
kpeople/nepomuk-feeder/nepomuk-storage.h | 2 +-
6 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/kpeople/CMakeLists.txt b/kpeople/CMakeLists.txt
index c5f1019..7cec3ac 100644
--- a/kpeople/CMakeLists.txt
+++ b/kpeople/CMakeLists.txt
@@ -1,3 +1,4 @@
add_subdirectory(actionsplugin)
add_subdirectory(datasourceplugin)
add_subdirectory(uiplugins)
+add_subdirectory(nepomuk-feeder)
diff --git a/kpeople/nepomuk-feeder/CMakeLists.txt b/kpeople/nepomuk-feeder/CMakeLists.txt
index a30292a..5ffb42b 100644
--- a/kpeople/nepomuk-feeder/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/CMakeLists.txt
@@ -6,6 +6,9 @@ set (CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
)
+remove_definitions(-DQT_NO_CAST_TO_ASCII)
+remove_definitions(-DQT_NO_CAST_FROM_ASCII)
+
set(KDE_MIN_VERSION "4.8.0")
find_package (KDE4 ${KDE_MIN_VERSION} REQUIRED)
find_package (Soprano REQUIRED)
@@ -57,7 +60,7 @@ set (nepomuktelepathyservice_static_SRCS
)
soprano_add_ontology (nepomuktelepathyservice_static_SRCS
- ${CMAKE_SOURCE_DIR}/telepathy.trig
+ ${CMAKE_SOURCE_DIR}/kpeople/nepomuk-feeder/telepathy.trig
"Telepathy"
"Nepomuk2::Vocabulary"
"trig"
diff --git a/kpeople/nepomuk-feeder/account.cpp b/kpeople/nepomuk-feeder/account.cpp
index de20f99..e5ee06f 100644
--- a/kpeople/nepomuk-feeder/account.cpp
+++ b/kpeople/nepomuk-feeder/account.cpp
@@ -58,7 +58,7 @@ void Account::init()
QString protocolName = m_account->serviceName().isEmpty() ? m_account->protocolName() : m_account->serviceName();
// Emit a signal to notify the storage that a new account has been constructed
// FIXME: Some IM Accounts don't have an ID as such, e.g. Link-Local-XMPP.
- emit created(m_account->objectPath(),
+ Q_EMIT created(m_account->objectPath(),
m_account->parameters().value(QLatin1String("account")).toString(),
protocolName);
@@ -79,7 +79,7 @@ void Account::shutdown()
kDebug();
// Emit a signal to say we were destroyed.
- emit accountDestroyed(m_account->objectPath());
+ Q_EMIT accountDestroyed(m_account->objectPath());
}
void Account::onConnectionChanged(const Tp::ConnectionPtr &connection)
@@ -114,10 +114,10 @@ void Account::onContactManagerStateChanged(Tp::ContactListState state)
if (state == Tp::ContactListStateSuccess) {
Tp::Contacts contacts = m_connection->contactManager()->allKnownContacts();
- emit initialContactsLoaded(m_account->objectPath(), contacts);
+ Q_EMIT initialContactsLoaded(m_account->objectPath(), contacts);
// Create wrapper objects for all the Contacts.
- foreach (const Tp::ContactPtr &contact, contacts) {
+ Q_FOREACH (const Tp::ContactPtr &contact, contacts) {
onNewContact(contact);
}
// kDebug() << "Loop over.";
@@ -126,13 +126,13 @@ void Account::onContactManagerStateChanged(Tp::ContactListState state)
void Account::onNicknameChanged(const QString &nickname)
{
- emit nicknameChanged(m_account->objectPath(), nickname);
+ Q_EMIT nicknameChanged(m_account->objectPath(), nickname);
}
void Account::onAllKnownContactsChanged(const Tp::Contacts &added, const Tp::Contacts &removed)
{
// For each added contact, let's check if we already have a Contact wrapper for it
- foreach (const Tp::ContactPtr &contact, added) {
+ Q_FOREACH (const Tp::ContactPtr &contact, added) {
if (!m_contacts.contains(contact)) {
// It's a brand new one
onNewContact(contact);
@@ -150,7 +150,7 @@ void Account::onAccountRemoved()
kDebug() << "Account being removed";
- emit accountRemoved(account->objectPath());
+ Q_EMIT accountRemoved(account->objectPath());
}
void Account::onNewContact(const Tp::ContactPtr &contact)
@@ -173,7 +173,7 @@ void Account::onNewContact(const Tp::ContactPtr &contact)
connect(contact.data(),
SIGNAL(avatarDataChanged(Tp::AvatarData)),
SLOT(onContactAvatarChanged(Tp::AvatarData)));
- emit contactCreated(m_account->objectPath(), contact);
+ Q_EMIT contactCreated(m_account->objectPath(), contact);
}
}
@@ -187,7 +187,7 @@ void Account::onContactAddedToGroup()
void Account::onContactAddedToGroup(const Tp::ContactPtr &contact)
{
- emit contactGroupsChanged(m_account->objectPath(), contact->id(), contact->groups());
+ Q_EMIT contactGroupsChanged(m_account->objectPath(), contact->id(), contact->groups());
}
void Account::onContactRemovedFromGroup(const QString &group)
@@ -196,7 +196,7 @@ void Account::onContactRemovedFromGroup(const QString &group)
const Tp::ContactPtr contact(qobject_cast<Tp::Contact*>(sender()));
Q_ASSERT(contact);
- emit contactGroupsChanged(m_account->objectPath(), contact->id(), contact->groups());
+ Q_EMIT contactGroupsChanged(m_account->objectPath(), contact->id(), contact->groups());
}
void Account::onContactAliasChanged()
@@ -209,7 +209,7 @@ void Account::onContactAliasChanged()
void Account::onContactAliasChanged(const Tp::ContactPtr &contact)
{
- emit contactAliasChanged(m_account->objectPath(), contact->id(), contact->alias());
+ Q_EMIT contactAliasChanged(m_account->objectPath(), contact->id(), contact->alias());
}
void Account::onContactAvatarChanged(const Tp::AvatarData &avatar)
@@ -217,7 +217,7 @@ void Account::onContactAvatarChanged(const Tp::AvatarData &avatar)
const Tp::ContactPtr contact(qobject_cast<Tp::Contact*>(sender()));
Q_ASSERT(contact);
- emit contactAvatarChanged(m_account->objectPath(), contact->id(), avatar);
+ Q_EMIT contactAvatarChanged(m_account->objectPath(), contact->id(), avatar);
}
#include "account.moc"
diff --git a/kpeople/nepomuk-feeder/controller.cpp b/kpeople/nepomuk-feeder/controller.cpp
index 9f7afc7..4270313 100644
--- a/kpeople/nepomuk-feeder/controller.cpp
+++ b/kpeople/nepomuk-feeder/controller.cpp
@@ -42,7 +42,7 @@ Controller::Controller(AbstractStorage *storage, QObject *parent)
void Controller::onStorageInitialised(bool success)
{
if (!success) {
- emit storageInitialisationFailed();
+ Q_EMIT storageInitialisationFailed();
return;
}
@@ -115,13 +115,13 @@ void Controller::onAccountManagerReady(Tp::PendingOperation *op)
// Signal the full list of accounts to the storage so it can check that the list in Nepomuk
// corresponds to the list on the AM.
QList<QString> accounts;
- foreach (const Tp::AccountPtr &account, m_accountManager->allAccounts()) {
+ Q_FOREACH (const Tp::AccountPtr &account, m_accountManager->allAccounts()) {
accounts.append(account->objectPath());
}
m_storage->cleanupAccounts(accounts);
// Take into account (ha ha) the accounts that already existed when the AM object became ready.
- foreach (const Tp::AccountPtr &account, m_accountManager->allAccounts()) {
+ Q_FOREACH (const Tp::AccountPtr &account, m_accountManager->allAccounts()) {
onNewAccount(account);
}
}
@@ -159,7 +159,7 @@ void Controller::onNewAccount(const Tp::AccountPtr &account)
void Controller::shutdown()
{
// Loop over all our children, and if they're Accounts, shut them down.
- foreach (QObject *child, children()) {
+ Q_FOREACH (QObject *child, children()) {
Account *account = qobject_cast<Account*>(child);
if (account) {
account->shutdown();
diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.cpp b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
index 2742cf5..47a7ea8 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.cpp
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
@@ -392,7 +392,7 @@ void NepomukStorage::onAccountsQueryFinishedListing()
}
}
- emit initialised(true);
+ Q_EMIT initialised(true);
}
@@ -425,7 +425,7 @@ void NepomukStorage::cleanupAccounts(const QList<QString> &paths)
// Go through all the accounts that we have received from the controller and create any
// new ones in neponmuk. Do this as a batch job to improve performance.
- /*foreach (const QString &path, paths) {
+ /*Q_FOREACH (const QString &path, paths) {
if (!m_accounts.keys().contains(path)) {
// TODO: Implement me to do this as a batch job???
// For now, we just let the constructed signal do this one at a time.
@@ -531,14 +531,14 @@ void NepomukStorage::cleanupAccountContacts(const QString &path, const Tp::Conta
// Go through all the contacts that we have received from the account and create any
// new ones in Nepomuk.
QSet<QString> nepomukIds;
- foreach (const ContactIdentifier &ci, m_contacts.keys()) {
+ Q_FOREACH (const ContactIdentifier &ci, m_contacts.keys()) {
nepomukIds.insert(ci.contactId());
}
QSet<QString> oldIds = contactHash.keys().toSet();
QSet<QString> newIds = oldIds.subtract(nepomukIds);
- foreach (const QString &id, newIds) {
+ Q_FOREACH (const QString &id, newIds) {
createContact(path, contactHash[id]);
}
}
@@ -724,7 +724,7 @@ void NepomukStorage::setContactGroups(const QString &path,
void NepomukStorage::updateContactGroups(Nepomuk2::SimpleResource &contactResource, const QStringList &groups)
{
QVariantList groupUris;
- foreach (const QString &groupName, groups) {
+ Q_FOREACH (const QString &groupName, groups) {
groupUris << findGroup(groupName);
}
contactResource.setProperty(NCO::belongsToGroup(), groupUris);
diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.h b/kpeople/nepomuk-feeder/nepomuk-storage.h
index e31f3c0..237b19d 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.h
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.h
@@ -131,7 +131,7 @@ public Q_SLOTS:
virtual void setContactGroups(const QString &path, const QString &id, const QStringList &groups);
virtual void setContactAvatar(const QString &path, const QString &id, const Tp::AvatarData &avatar);
-signals:
+Q_SIGNALS:
void graphSaved();
private Q_SLOTS:
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list