[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=f1c3beb

The following commit has been merged in the master branch:
commit f1c3bebde7aefe0f64e0850e027622c487a15316
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Jan 16 00:38:23 2013 +0000

    Update to moved models
    
    Reviwed-by: Martin Klapetek
---
 mainwindow.cpp | 13 +++++++------
 mainwindow.h   |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 75b24ee..c968cf0 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -38,8 +38,9 @@
 #include <TelepathyQt/PendingReady>
 
 #include <KTp/actions.h>
-#include <KTp/Models/contacts-model.h>
-#include <KTp/Models/accounts-filter-model.h>
+#include <KTp/contact-factory.h>
+#include <KTp/Models/contacts-list-model.h>
+#include <KTp/Models/contacts-filter-model.h>
 #include <KTp/Widgets/contact-grid-widget.h>
 
 
@@ -87,7 +88,7 @@ MainWindow::MainWindow(const KUrl &url, QWidget *parent) :
                                                                                << Tp::Connection::FeatureRoster
                                                                                << Tp::Connection::FeatureSelfContact);
 
-    Tp::ContactFactoryPtr contactFactory = Tp::ContactFactory::create(Tp::Features()  << Tp::Contact::FeatureAlias
+    Tp::ContactFactoryPtr contactFactory = KTp::ContactFactory::create(Tp::Features()  << Tp::Contact::FeatureAlias
                                                                       << Tp::Contact::FeatureAvatarData
                                                                       << Tp::Contact::FeatureSimplePresence
                                                                       << Tp::Contact::FeatureCapabilities);
@@ -100,14 +101,14 @@ MainWindow::MainWindow(const KUrl &url, QWidget *parent) :
                                                   channelFactory,
                                                   contactFactory);
 
-    m_contactsModel = new ContactsModel(this);
+    m_contactsModel = new KTp::ContactsListModel(this);
     connect(m_accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)), SLOT(onAccountManagerReady()));
 
 
     m_contactGridWidget = new KTp::ContactGridWidget(m_contactsModel, this);
     m_contactGridWidget->contactFilterLineEdit()->setClickMessage(i18n("Search in Contacts..."));
-    m_contactGridWidget->filter()->setPresenceTypeFilterFlags(AccountsFilterModel::ShowOnlyConnected);
-    m_contactGridWidget->filter()->setCapabilityFilterFlags(AccountsFilterModel::FilterByFileTransferCapability);
+    m_contactGridWidget->filter()->setPresenceTypeFilterFlags(KTp::ContactsFilterModel::ShowOnlyConnected);
+    m_contactGridWidget->filter()->setCapabilityFilterFlags(KTp::ContactsFilterModel::FilterByFileTransferCapability);
     ui->recipientVLayout->addWidget(m_contactGridWidget);
 
     connect(m_contactGridWidget,
diff --git a/mainwindow.h b/mainwindow.h
index 1542e41..2c235b7 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -34,9 +34,9 @@ namespace Ui {
 
 namespace KTp {
 class ContactGridWidget;
+class ContactsListModel;
 }
 
-class ContactsModel;
 class KFileItem;
 class KPixmapSequenceOverlayPainter;
 
@@ -60,7 +60,7 @@ private:
     Ui::MainWindow *ui;
     KUrl m_url;
     Tp::AccountManagerPtr m_accountManager;
-    ContactsModel *m_contactsModel;
+    KTp::ContactsListModel *m_contactsModel;
     KTp::ContactGridWidget *m_contactGridWidget;
     KPixmapSequenceOverlayPainter *m_busyOverlay;
 };

-- 
ktp-send-file packaging