[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=a9d023a

The following commit has been merged in the master branch:
commit a9d023a3559a241ed17f15fd1935cae78c878159
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Mon Dec 26 15:56:46 2011 +0100

    Use KTp::Presence in custom presence dialog
    
    REVIEW: 103537
---
 dialogs/custom-presence-dialog.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dialogs/custom-presence-dialog.cpp b/dialogs/custom-presence-dialog.cpp
index 62a0413..ce3a6b0 100644
--- a/dialogs/custom-presence-dialog.cpp
+++ b/dialogs/custom-presence-dialog.cpp
@@ -54,7 +54,7 @@ FilteredModel::FilteredModel(QObject *parent)
 bool FilteredModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
 {
     QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
-    Tp::Presence presence = index.data(PresenceModel::PresenceRole).value<Tp::Presence>();
+    KTp::Presence presence = index.data(PresenceModel::PresenceRole).value<KTp::Presence>();
     return ! presence.statusMessage().isEmpty();
 }
 
@@ -132,7 +132,7 @@ void CustomPresenceDialog::setupDialog()
 void CustomPresenceDialog::addCustomPresence()
 {
     int presenceIndex = m_statusMessage->currentIndex();
-    Tp::Presence presence = m_statusMessage->itemData(presenceIndex).value<Tp::Presence>();
+    KTp::Presence presence = m_statusMessage->itemData(presenceIndex).value<KTp::Presence>();
     presence.setStatus(presence.type(), QString(), m_statusMessage->currentText());
 
     m_listView->setCurrentIndex(qobject_cast<FilteredModel*>(m_listView->model())->mapFromSource(m_model->addPresence(presence)));
@@ -147,7 +147,7 @@ void CustomPresenceDialog::removeCustomPresence()
         return;
     }
 
-    Tp::Presence presence = m_listView->currentIndex().data(PresenceModel::PresenceRole).value<Tp::Presence>();
+    KTp::Presence presence = m_listView->currentIndex().data(PresenceModel::PresenceRole).value<KTp::Presence>();
     m_model->removePresence(presence);
 
     if (m_listView->model()->rowCount(QModelIndex()) == 0) {

-- 
ktp-contact-list packaging