[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:12:13 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=95aa565
The following commit has been merged in the master branch:
commit 95aa565ae5ae1e51c407f6f6179dd8879e346bcd
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Fri Feb 1 14:50:40 2013 +0000
More porting to new enum
---
contact-list-widget.cpp | 12 +++++------
contact-overlays.cpp | 4 ++--
context-menu.cpp | 55 ++++++++++++++++++++++++-------------------------
3 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 49a6782..2e2f259 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -217,8 +217,8 @@ void ContactListWidget::onContactListDoubleClicked(const QModelIndex& index)
}
if (index.data(ContactsModel::TypeRole).toInt() == ContactsModel::ContactRowType) {
- Tp::ContactPtr contact = index.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
- Tp::AccountPtr account = index.data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
+ Tp::ContactPtr contact = index.data(KTp::ContactRole).value<Tp::ContactPtr>();
+ Tp::AccountPtr account = index.data(KTp::AccountRole).value<Tp::AccountPtr>();
startTextChannel(account, contact);
}
}
@@ -583,8 +583,8 @@ void ContactListWidget::mouseMoveEvent(QMouseEvent *event)
QDataStream stream(&encodedData, QIODevice::WriteOnly);
if (index.isValid()) {
- Tp::ContactPtr contact = index.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
- Tp::AccountPtr account = index.data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
+ Tp::ContactPtr contact = index.data(KTp::ContactRole).value<Tp::ContactPtr>();
+ Tp::AccountPtr account = index.data(KTp::AccountRole).value<Tp::AccountPtr>();
//We put a contact ID and its account ID to the stream, so we can later recreate the contact using ContactsModel
stream << contact->id() << account->objectPath();
@@ -624,8 +624,8 @@ void ContactListWidget::dropEvent(QDropEvent *event)
if (event->mimeData()->hasUrls()) {
kDebug() << "Filed dropped";
- Tp::ContactPtr contact = index.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
- Tp::AccountPtr account = index.data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
+ Tp::ContactPtr contact = index.data(KTp::ContactRole).value<Tp::ContactPtr>();
+ Tp::AccountPtr account = index.data(KTp::AccountRole).value<Tp::AccountPtr>();
QStringList filenames;
Q_FOREACH (const QUrl &url, event->mimeData()->urls()) {
diff --git a/contact-overlays.cpp b/contact-overlays.cpp
index ba063b5..15bc465 100644
--- a/contact-overlays.cpp
+++ b/contact-overlays.cpp
@@ -113,8 +113,8 @@ void StartChannelContactOverlay::slotClicked(bool checked)
QModelIndex index = button()->index();
if (index.isValid()) {
- Tp::AccountPtr account = index.data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
- Tp::ContactPtr contact = index.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+ Tp::AccountPtr account = index.data(KTp::AccountRole).value<Tp::AccountPtr>();
+ Tp::ContactPtr contact = index.data(KTp::ContactRole).value<Tp::ContactPtr>();
if (account && contact) {
emit activated(account, contact);
}
diff --git a/context-menu.cpp b/context-menu.cpp
index bbc87f9..a339bfc 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -79,14 +79,14 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
m_currentIndex = index;
- Tp::ContactPtr contact = index.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+ Tp::ContactPtr contact = index.data(KTp::ContactRole).value<Tp::ContactPtr>();
if (contact.isNull()) {
kDebug() << "Contact is nulled";
return 0;
}
- Tp::AccountPtr account = index.data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
+ Tp::AccountPtr account = index.data(KTp::AccountRole).value<Tp::AccountPtr>();
if (account.isNull()) {
kDebug() << "Account is nulled";
@@ -311,7 +311,7 @@ void ContextMenu::onRemoveContactFromGroupTriggered()
}
const QString groupName = m_currentIndex.parent().data(Qt::DisplayRole).toString();
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
Tp::PendingOperation* operation = contact->removeFromGroup(groupName);
@@ -333,13 +333,12 @@ void ContextMenu::onShowInfoTriggered()
return;
}
- Tp::AccountPtr account = m_currentIndex.data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+ Tp::AccountPtr account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
if (account && contact) {
KTp::ContactInfoDialog* contactInfoDialog = new KTp::ContactInfoDialog(account, contact, m_mainWidget);
contactInfoDialog->setAttribute(Qt::WA_DeleteOnClose);
contactInfoDialog->show();
- }
}
void ContextMenu::onStartTextChatTriggered()
@@ -349,8 +348,8 @@ void ContextMenu::onStartTextChatTriggered()
return;
}
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
- Tp::AccountPtr account = m_currentIndex.data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+ Tp::AccountPtr account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
if (contact && account) {
m_mainWidget->startTextChannel(account, contact);
@@ -359,8 +358,8 @@ void ContextMenu::onStartTextChatTriggered()
void ContextMenu::onStartAudioChatTriggered()
{
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
- Tp::AccountPtr account = m_currentIndex.data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+ Tp::AccountPtr account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
if (contact && account) {
m_mainWidget->startAudioChannel(account, contact);
@@ -374,8 +373,8 @@ void ContextMenu::onStartVideoChatTriggered()
return;
}
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
- Tp::AccountPtr account = m_currentIndex.data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+ Tp::AccountPtr account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
if (contact && account) {
m_mainWidget->startVideoChannel(account, contact);
@@ -389,8 +388,8 @@ void ContextMenu::onStartFileTransferTriggered()
return;
}
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
- Tp::AccountPtr account = m_currentIndex.data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+ Tp::AccountPtr account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
if (contact && account) {
m_mainWidget->startFileTransferChannel(account, contact);
@@ -404,8 +403,8 @@ void ContextMenu::onStartDesktopSharingTriggered()
return;
}
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
- Tp::AccountPtr account = m_currentIndex.data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+ Tp::AccountPtr account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
if (contact && account) {
m_mainWidget->startDesktopSharing(account, contact);
@@ -419,8 +418,8 @@ void ContextMenu::onOpenLogViewerTriggered()
return;
}
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
- Tp::AccountPtr account = m_currentIndex.data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
+ Tp::AccountPtr account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
if (contact && account) {
m_mainWidget->startLogViewer(account, contact);
@@ -429,7 +428,7 @@ void ContextMenu::onOpenLogViewerTriggered()
void ContextMenu::onUnblockContactTriggered()
{
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
Tp::PendingOperation *operation = contact->unblock(); //FIXME
connect(operation, SIGNAL(finished(Tp::PendingOperation*)),
@@ -438,7 +437,7 @@ void ContextMenu::onUnblockContactTriggered()
void ContextMenu::onAddContactToGroupTriggered()
{
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
QAction *action = qobject_cast<QAction*>(sender());
if (!action) {
@@ -472,7 +471,7 @@ void ContextMenu::onCreateNewGroupTriggered()
&ok);
if (ok) {
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
Tp::PendingOperation *operation = contact->addToGroup(newGroupName);
connect(operation, SIGNAL(finished(Tp::PendingOperation*)),
@@ -499,7 +498,7 @@ void ContextMenu::onRenameGroupTriggered()
if (ok && groupName != newGroupName) {
//loop through all child indexes of m_currentIndex
for(int i = 0; i < model->rowCount(m_currentIndex); i++) {
- Tp::ContactPtr contact = model->index(i, 0 , m_currentIndex).data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+ Tp::ContactPtr contact = model->index(i, 0 , m_currentIndex).data(KTp::ContactRole).value<Tp::ContactPtr>();
Q_ASSERT(contact);
Tp::PendingOperation *operation = contact->addToGroup(newGroupName);
@@ -530,7 +529,7 @@ void ContextMenu::onDeleteGroupTriggered()
i18n("Remove Group")) == KMessageBox::Continue) {
for(int i = 0; i < model->rowCount(m_currentIndex); i++) {
- Tp::ContactPtr contact = model->index(i, 0 , m_currentIndex).data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+ Tp::ContactPtr contact = model->index(i, 0 , m_currentIndex).data(KTp::ContactRole).value<Tp::ContactPtr>();
Q_ASSERT(contact);
@@ -551,7 +550,7 @@ void ContextMenu::onDeleteGroupTriggered()
void ContextMenu::onBlockContactTriggered()
{
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
Tp::PendingOperation *operation = contact->block();
connect(operation, SIGNAL(finished(Tp::PendingOperation*)),
@@ -560,7 +559,7 @@ void ContextMenu::onBlockContactTriggered()
void ContextMenu::onDeleteContactTriggered()
{
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
QList<Tp::ContactPtr>contactList;
contactList.append(contact);
@@ -589,7 +588,7 @@ void ContextMenu::onDeleteContactTriggered()
void ContextMenu::onRerequestAuthorization()
{
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
Tp::PendingOperation *op = contact->manager()->requestPresenceSubscription(QList<Tp::ContactPtr>() << contact);
connect(op, SIGNAL(finished(Tp::PendingOperation*)),
m_mainWidget, SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
@@ -597,7 +596,7 @@ void ContextMenu::onRerequestAuthorization()
void ContextMenu::onResendAuthorization()
{
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
Tp::PendingOperation *op = contact->manager()->authorizePresencePublication(QList<Tp::ContactPtr>() << contact);
connect(op, SIGNAL(finished(Tp::PendingOperation*)),
m_mainWidget, SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
@@ -605,7 +604,7 @@ void ContextMenu::onResendAuthorization()
void ContextMenu::onNotificationConfigureTriggered()
{
- Tp::ContactPtr contact = m_currentIndex.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+ Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<Tp::ContactPtr>();
KTp::NotificationConfigDialog *notificationDialog = new KTp::NotificationConfigDialog(contact, m_mainWidget);
notificationDialog->show();
--
ktp-contact-list packaging
More information about the pkg-kde-commits
mailing list