[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=b1269df

The following commit has been merged in the master branch:
commit b1269dfcecf71a2fbb51eb6ccfc75725b2001617
Author: Daniele Elmo Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Aug 16 15:58:19 2010 +0000

    use KTelepathy namespace
    
    svn path=/trunk/playground/network/telepathy-contactlist/; revision=1164358
---
 main-widget.cpp | 14 +++++++++++---
 main-widget.h   | 10 ++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index d8f9c70..6146b62 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -65,6 +65,14 @@
 const int SPACING = 4;
 const int AVATAR_SIZE = 32;
 
+using KTelepathy::ContactsListModel;
+using KTelepathy::GroupedContactsProxyModel;
+using KTelepathy::TelepathyBridge;
+using KTelepathy::AbstractTreeItem;
+using KTelepathy::ContactItem;
+using KTelepathy::MetaContactItem;
+using KTelepathy::RequestTextChatJob;
+
 ContactDelegate::ContactDelegate(QObject * parent)
   : QStyledItemDelegate(parent)
 {
@@ -780,12 +788,12 @@ void MainWidget::onStartChat(bool)
         kDebug() << "Request chat to contact";
         Nepomuk::PersonContact contact = contactItem->personContact();
         kDebug() << contact.resourceUri() << contact.genericLabel();
-        job = requestTextChat(contact, PREFERRED_TEXTCHAT_HANDLER, this);
+        job = KTelepathy::requestTextChat(contact, PREFERRED_TEXTCHAT_HANDLER, this);
     } else if (metacontactItem && metacontactItem->type() == MetaContactItem::RealMetaContact) {
         kDebug() << "Request chat to REAL metacontact";
         Nepomuk::Person metacontact = metacontactItem->pimoPerson();
         kDebug() << metacontact.resourceUri() << metacontact.genericLabel();
-        job = requestTextChat(metacontact, PREFERRED_TEXTCHAT_HANDLER, this);
+        job = KTelepathy::requestTextChat(metacontact, PREFERRED_TEXTCHAT_HANDLER, this);
     } else if (metacontactItem && metacontactItem->type() == MetaContactItem::FakeMetaContact) {
         kDebug() << "Request chat to FAKE metacontact";
         QList<AbstractTreeItem*> childList = metacontactItem->childItems();
@@ -798,7 +806,7 @@ void MainWidget::onStartChat(bool)
         } else {
             Nepomuk::PersonContact contact = contactItem->personContact();
             kDebug() << contact.resourceUri() << contact.genericLabel();
-            job = requestTextChat(contact, PREFERRED_TEXTCHAT_HANDLER, this);
+            job = KTelepathy::requestTextChat(contact, PREFERRED_TEXTCHAT_HANDLER, this);
         }
     } else {
         KMessageBox::error(0, i18n("An error occurred????"));
diff --git a/main-widget.h b/main-widget.h
index cd77c77..aed6f7c 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -29,10 +29,12 @@
 #include <QtGui/QWidget>
 #include <QtGui/QStyledItemDelegate>
 
-class ContactsListModel;
-class GroupedContactsProxyModel;
 class QSortFilterProxyModel;
 class QAbstractProxyModel;
+namespace KTelepathy {
+    class ContactsListModel;
+    class GroupedContactsProxyModel;
+}
 
 class ContactDelegate : public QStyledItemDelegate
 {
@@ -54,8 +56,8 @@ public:
     ~MainWidget();
 
 private:
-    ContactsListModel *m_model;
-    GroupedContactsProxyModel *m_groupedContactsProxyModel;
+    KTelepathy::ContactsListModel *m_model;
+    KTelepathy::GroupedContactsProxyModel *m_groupedContactsProxyModel;
     QSortFilterProxyModel *m_sortFilterProxyModel;
     QAbstractProxyModel *m_currentModel;
     Nepomuk::PersonContact m_mePersonContact;

-- 
ktp-contact-list packaging