[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:06:20 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=cad8ff2
The following commit has been merged in the master branch:
commit cad8ff2e50b1cb340e30bcfa9d7edab3f94572b6
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date: Fri Feb 1 15:41:35 2013 +0100
Tp::ContactPtr -> KTp::ContactPtr
---
KTp/Declarative/contact-pin.cpp | 4 ++--
KTp/Declarative/contact-pin.h | 10 +++++-----
KTp/Declarative/conversation-target.cpp | 8 ++++----
KTp/Declarative/conversation-target.h | 10 +++++-----
KTp/Declarative/conversation.cpp | 2 +-
KTp/Declarative/pinned-contacts-model.cpp | 16 ++++++++--------
KTp/Declarative/pinned-contacts-model.h | 6 +++---
KTp/Declarative/qml-plugins.cpp | 6 +++---
KTp/Declarative/telepathy-text-observer.h | 3 +--
9 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/KTp/Declarative/contact-pin.cpp b/KTp/Declarative/contact-pin.cpp
index 150b4b2..9ad3bcd 100644
--- a/KTp/Declarative/contact-pin.cpp
+++ b/KTp/Declarative/contact-pin.cpp
@@ -32,7 +32,7 @@ Tp::AccountPtr ContactPin::account() const
return m_account;
}
-Tp::ContactPtr ContactPin::contact() const
+KTp::ContactPtr ContactPin::contact() const
{
return m_contact;
}
@@ -67,7 +67,7 @@ void ContactPin::setAccount(const Tp::AccountPtr &account)
Q_EMIT pinnedChanged();
}
-void ContactPin::setContact(const Tp::ContactPtr &contact)
+void ContactPin::setContact(const KTp::ContactPtr &contact)
{
m_contact = contact;
Q_EMIT pinnedChanged();
diff --git a/KTp/Declarative/contact-pin.h b/KTp/Declarative/contact-pin.h
index 8463931..ec740b6 100644
--- a/KTp/Declarative/contact-pin.h
+++ b/KTp/Declarative/contact-pin.h
@@ -20,14 +20,14 @@
#define CONTACTPIN_H
#include <QObject>
-#include "ktp-metatypes.h"
+#include "types.h"
class PinnedContactsModel;
class ContactPin : public QObject
{
Q_OBJECT
- Q_PROPERTY(Tp::ContactPtr contact READ contact WRITE setContact)
+ Q_PROPERTY(KTp::ContactPtr contact READ contact WRITE setContact)
Q_PROPERTY(Tp::AccountPtr account READ account WRITE setAccount)
Q_PROPERTY(PinnedContactsModel *model READ model WRITE setModel)
Q_PROPERTY(bool pinned READ isPinned NOTIFY pinnedChanged)
@@ -35,12 +35,12 @@ class ContactPin : public QObject
public:
explicit ContactPin(QObject *parent = 0);
- Tp::ContactPtr contact() const;
+ KTp::ContactPtr contact() const;
Tp::AccountPtr account() const;
PinnedContactsModel* model() const;
bool isPinned() const;
- void setContact(const Tp::ContactPtr &contact);
+ void setContact(const KTp::ContactPtr &contact);
void setAccount(const Tp::AccountPtr &account);
void setModel(PinnedContactsModel *model);
@@ -51,7 +51,7 @@ class ContactPin : public QObject
private:
PinnedContactsModel *m_model;
- Tp::ContactPtr m_contact;
+ KTp::ContactPtr m_contact;
Tp::AccountPtr m_account;
};
diff --git a/KTp/Declarative/conversation-target.cpp b/KTp/Declarative/conversation-target.cpp
index d726f0c..4e8af19 100644
--- a/KTp/Declarative/conversation-target.cpp
+++ b/KTp/Declarative/conversation-target.cpp
@@ -25,12 +25,12 @@
class ConversationTarget::ConversationTargetPrivate
{
public:
- Tp::ContactPtr contact;
+ KTp::ContactPtr contact;
KIcon avatar;
Tp::AccountPtr account;
};
-ConversationTarget::ConversationTarget(const Tp::AccountPtr &account, const Tp::ContactPtr &contact, QObject *parent) :
+ConversationTarget::ConversationTarget(const Tp::AccountPtr &account, const KTp::ContactPtr &contact, QObject *parent) :
QObject(parent),
d(new ConversationTargetPrivate)
{
@@ -45,7 +45,7 @@ ConversationTarget::ConversationTarget(const Tp::AccountPtr &account, const Tp::
updateAvatar();
}
-void ConversationTarget::setupContactSignals(Tp::ContactPtr contact)
+void ConversationTarget::setupContactSignals(KTp::ContactPtr contact)
{
connect(contact.constData(), SIGNAL(aliasChanged(QString)), SIGNAL(nickChanged(QString)));
connect(contact.constData(), SIGNAL(avatarDataChanged(Tp::AvatarData)), SLOT(onAvatarDataChanged()));
@@ -123,7 +123,7 @@ void ConversationTarget::updateAvatar()
d->avatar = KIcon(path);
}
-Tp::ContactPtr ConversationTarget::contact() const
+KTp::ContactPtr ConversationTarget::contact() const
{
return d->contact;
}
diff --git a/KTp/Declarative/conversation-target.h b/KTp/Declarative/conversation-target.h
index 2822c45..1e7f159 100644
--- a/KTp/Declarative/conversation-target.h
+++ b/KTp/Declarative/conversation-target.h
@@ -23,7 +23,7 @@
#include <QObject>
#include <QIcon>
-#include "ktp-metatypes.h"
+#include "types.h"
class ConversationTarget : public QObject
{
@@ -34,11 +34,11 @@ class ConversationTarget : public QObject
Q_PROPERTY(QIcon presenceIcon READ presenceIcon NOTIFY presenceIconChanged);
Q_PROPERTY(QString presenceIconName READ presenceIconName NOTIFY presenceIconNameChanged)
Q_PROPERTY(QString id READ id CONSTANT)
- Q_PROPERTY(Tp::ContactPtr contact READ contact CONSTANT)
+ Q_PROPERTY(KTp::ContactPtr contact READ contact CONSTANT)
Q_PROPERTY(Tp::AccountPtr account READ account CONSTANT)
public:
- explicit ConversationTarget(const Tp::AccountPtr &account, const Tp::ContactPtr &contact, QObject *parent = 0);
+ explicit ConversationTarget(const Tp::AccountPtr &account, const KTp::ContactPtr &contact, QObject *parent = 0);
virtual ~ConversationTarget();
QIcon avatar() const;
@@ -47,7 +47,7 @@ class ConversationTarget : public QObject
QIcon presenceIcon() const;
QString presenceIconName() const;
- Tp::ContactPtr contact() const;
+ KTp::ContactPtr contact() const;
Tp::AccountPtr account() const;
Q_SIGNALS:
@@ -61,7 +61,7 @@ class ConversationTarget : public QObject
void onPresenceChanged();
private:
- void setupContactSignals(Tp::ContactPtr contact);
+ void setupContactSignals(KTp::ContactPtr contact);
void updateAvatar();
class ConversationTargetPrivate;
diff --git a/KTp/Declarative/conversation.cpp b/KTp/Declarative/conversation.cpp
index 014972d..37df438 100644
--- a/KTp/Declarative/conversation.cpp
+++ b/KTp/Declarative/conversation.cpp
@@ -48,7 +48,7 @@ Conversation::Conversation(const Tp::TextChannelPtr &channel,
d->messages = new MessagesModel(account, this);
d->messages->setTextChannel(channel);
- d->target = new ConversationTarget(account, channel->targetContact(), this);
+ d->target = new ConversationTarget(account, KTp::ContactPtr::qObjectCast(channel->targetContact()), this);
d->valid = channel->isValid();
connect(channel.data(), SIGNAL(invalidated(Tp::DBusProxy*,QString,QString)),
diff --git a/KTp/Declarative/pinned-contacts-model.cpp b/KTp/Declarative/pinned-contacts-model.cpp
index 3c2c558..f80b20c 100644
--- a/KTp/Declarative/pinned-contacts-model.cpp
+++ b/KTp/Declarative/pinned-contacts-model.cpp
@@ -21,7 +21,6 @@
#include "conversation.h"
#include <TelepathyQt/Types>
-#include <TelepathyQt/Contact>
#include <TelepathyQt/AvatarData>
#include <TelepathyQt/Presence>
#include <TelepathyQt/Account>
@@ -38,6 +37,7 @@
#include <KDebug>
#include <KTp/presence.h>
+#include <KTp/contact.h>
struct Pin {
Tp::ContactPtr contact;
@@ -123,13 +123,13 @@ void PinnedContactsModel::pinPendingContacts(Tp::PendingOperation* j)
if (j->isValid()) {
Tp::PendingContacts *job = qobject_cast<Tp::PendingContacts*>(j);
Tp::AccountPtr account = job->property("account").value<Tp::AccountPtr>();
- Tp::ContactPtr contact = job->contacts().first();
+ KTp::ContactPtr contact = KTp::ContactPtr::qObjectCast(job->contacts().first());
setPinning(account, contact, true);
} else
kDebug() << "error:" << j->errorName() << j->errorMessage();
}
-QModelIndex PinnedContactsModel::indexForContact(Tp::AccountPtr account, Tp::ContactPtr contact) const
+QModelIndex PinnedContactsModel::indexForContact(Tp::AccountPtr account, KTp::ContactPtr contact) const
{
int i = 0;
Q_FOREACH(const Pin &p, d->m_pins) {
@@ -145,7 +145,7 @@ QModelIndex PinnedContactsModel::indexForContact(Tp::AccountPtr account, Tp::Con
}
}
-void PinnedContactsModel::setPinning(const Tp::AccountPtr &account, const Tp::ContactPtr &contact, bool newState)
+void PinnedContactsModel::setPinning(const Tp::AccountPtr &account, const KTp::ContactPtr &contact, bool newState)
{
QModelIndex idx = indexForContact(account, contact);
bool found = idx.isValid();
@@ -174,14 +174,14 @@ QVariant PinnedContactsModel::data(const QModelIndex &index, int role) const
&& p.contact->presence().type()!=Tp::ConnectionPresenceTypeUnset
&& p.contact->presence().type()!=Tp::ConnectionPresenceTypeUnknown;
case ContactRole:
- return QVariant::fromValue<Tp::ContactPtr>(p.contact);
+ return QVariant::fromValue<KTp::ContactPtr>(KTp::ContactPtr::qObjectCast(p.contact));
case AccountRole:
return QVariant::fromValue<Tp::AccountPtr>(p.account);
case AlreadyChattingRole: {
bool found = false;
for (int i = 0; !found && i < d->convesations->rowCount(); i++) {
QModelIndex idx = d->convesations->index(i, 0);
- Tp::ContactPtr contact = idx.data(ConversationsModel::ConversationRole).value<Conversation*>()->target()->contact();
+ KTp::ContactPtr contact = KTp::ContactPtr::qObjectCast(idx.data(ConversationsModel::ConversationRole).value<Conversation*>()->target()->contact());
found |= contact->id() == p.contact->id();
}
return found;
@@ -240,7 +240,7 @@ void PinnedContactsModel::appendContact(const Pin &p)
void PinnedContactsModel::contactDataChanged()
{
- Tp::Contact *c = qobject_cast<Tp::Contact*>(sender());
+ KTp::Contact *c = qobject_cast<KTp::Contact*>(sender());
int i = 0;
Q_FOREACH(const Pin &p, d->m_pins) {
if (p.contact == c) {
@@ -265,7 +265,7 @@ void PinnedContactsModel::conversationsStateChanged(const QModelIndex &parent, i
{
for (int i = start; i <= end; i++) {
QModelIndex idx = d->convesations->index(i, 0, parent);
- Tp::ContactPtr contact = idx.data(ConversationsModel::ConversationRole).value<Conversation*>()->target()->contact();
+ KTp::ContactPtr contact = KTp::ContactPtr::qObjectCast(idx.data(ConversationsModel::ConversationRole).value<Conversation*>()->target()->contact());
Q_FOREACH(const Pin &p, d->m_pins) {
if (p.contact->id() == contact->id())
QMetaObject::invokeMethod(this, "dataChanged", Qt::QueuedConnection, Q_ARG(QModelIndex, idx), Q_ARG(QModelIndex, idx));
diff --git a/KTp/Declarative/pinned-contacts-model.h b/KTp/Declarative/pinned-contacts-model.h
index 0b4db83..216c517 100644
--- a/KTp/Declarative/pinned-contacts-model.h
+++ b/KTp/Declarative/pinned-contacts-model.h
@@ -21,7 +21,7 @@
#include <QModelIndex>
#include <QVector>
-#include "ktp-metatypes.h"
+#include "types.h"
struct Pin;
class ConversationsModel;
@@ -50,8 +50,8 @@ class PinnedContactsModel : public QAbstractListModel
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
virtual bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
- Q_SLOT void setPinning(const Tp::AccountPtr &account, const Tp::ContactPtr &contact, bool newState);
- QModelIndex indexForContact(Tp::AccountPtr account, Tp::ContactPtr contact) const;
+ Q_SLOT void setPinning(const Tp::AccountPtr &account, const KTp::ContactPtr &contact, bool newState);
+ QModelIndex indexForContact(Tp::AccountPtr account, KTp::ContactPtr contact) const;
ConversationsModel* conversationsModel() const;
void setConversationsModel(ConversationsModel *model);
diff --git a/KTp/Declarative/qml-plugins.cpp b/KTp/Declarative/qml-plugins.cpp
index e9c258d..bd2a927 100644
--- a/KTp/Declarative/qml-plugins.cpp
+++ b/KTp/Declarative/qml-plugins.cpp
@@ -33,7 +33,7 @@
#include "pinned-contacts-model.h"
#include "contact-pin.h"
-#include "Models/accounts-filter-model.h"
+#include "Models/contacts-filter-model.h"
void QmlPlugins::registerTypes(const char *uri)
{
@@ -44,7 +44,7 @@ void QmlPlugins::registerTypes(const char *uri)
qmlRegisterType<PinnedContactsModel>(uri, 0, 1, "PinnedContactsModel");
qmlRegisterType<ContactPin>(uri, 0, 1, "ContactPin");
- qmlRegisterUncreatableType<AccountsFilterModel> (uri, 0, 1, "AccountsFilterModel",
+ qmlRegisterUncreatableType<KTp::ContactsFilterModel> (uri, 0, 1, "AccountsFilterModel",
QLatin1String("Filter cannot be created. Access through ContactList.filter"));
qmlRegisterUncreatableType<MessagesModel> (uri, 0, 1, "MessagesModel",
QLatin1String("It will be created once the conversation is created"));
@@ -52,7 +52,7 @@ void QmlPlugins::registerTypes(const char *uri)
qmlRegisterType<ConversationTarget>();
qmlRegisterType<ConversationsModel>();
qRegisterMetaType<Tp::AccountManagerPtr>();
- qRegisterMetaType<Tp::ContactPtr>();
+ qRegisterMetaType<KTp::ContactPtr>();
qRegisterMetaType<Tp::AccountPtr>();
}
diff --git a/KTp/Declarative/telepathy-text-observer.h b/KTp/Declarative/telepathy-text-observer.h
index 85c0a5e..d60b5a3 100644
--- a/KTp/Declarative/telepathy-text-observer.h
+++ b/KTp/Declarative/telepathy-text-observer.h
@@ -21,10 +21,9 @@
#define TELEPATHY_TEXT_OBSERVER_H
#include "conversations-model.h"
+#include "types.h"
#include <TelepathyQt/AbstractClientHandler>
-#include "ktp-metatypes.h"
-
class TelepathyTextObserver : public QObject
{
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list