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

The following commit has been merged in the master branch:
commit e1ba05d18dca782bac8ec11bdbe094c3df5936ba
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Oct 2 22:35:04 2012 +0100

    Update to moved models
    
    REVIEW: 106698
---
 mainwindow.cpp | 10 +++++-----
 mainwindow.h   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9152f94..e89742c 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -37,7 +37,7 @@
 #include <TelepathyQt/PendingChannelRequest>
 #include <TelepathyQt/PendingReady>
 
-#include <KTp/Models/accounts-model.h>
+#include <KTp/Models/contacts-model.h>
 #include <KTp/Models/accounts-filter-model.h>
 #include <KTp/Widgets/contact-grid-widget.h>
 
@@ -49,7 +49,7 @@ MainWindow::MainWindow(const KUrl &url, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::MainWindow),
     m_url(url),
-    m_accountsModel(0)
+    m_contactsModel(0)
 {
     Tp::registerTypes();
 
@@ -101,11 +101,11 @@ MainWindow::MainWindow(const KUrl &url, QWidget *parent) :
                                                   channelFactory,
                                                   contactFactory);
 
-    m_accountsModel = new AccountsModel(this);
+    m_contactsModel = new ContactsModel(this);
     connect(m_accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)), SLOT(onAccountManagerReady()));
 
 
-    m_contactGridWidget = new KTp::ContactGridWidget(m_accountsModel, this);
+    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);
@@ -127,7 +127,7 @@ MainWindow::~MainWindow()
 
 void MainWindow::onAccountManagerReady()
 {
-    m_accountsModel->setAccountManager(m_accountManager);
+    m_contactsModel->setAccountManager(m_accountManager);
 }
 
 void MainWindow::onDialogAccepted()
diff --git a/mainwindow.h b/mainwindow.h
index 358537c..1542e41 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -36,7 +36,7 @@ namespace KTp {
 class ContactGridWidget;
 }
 
-class AccountsModel;
+class ContactsModel;
 class KFileItem;
 class KPixmapSequenceOverlayPainter;
 
@@ -60,7 +60,7 @@ private:
     Ui::MainWindow *ui;
     KUrl m_url;
     Tp::AccountManagerPtr m_accountManager;
-    AccountsModel *m_accountsModel;
+    ContactsModel *m_contactsModel;
     KTp::ContactGridWidget *m_contactGridWidget;
     KPixmapSequenceOverlayPainter *m_busyOverlay;
 };

-- 
ktp-send-file packaging