[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=ebea724

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

    Port to new model names
    
    REVIEW: 106699
---
 app/invite-contact-dialog.cpp | 8 ++++----
 app/invite-contact-dialog.h   | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/invite-contact-dialog.cpp b/app/invite-contact-dialog.cpp
index 49e1d35..21f6b3d 100644
--- a/app/invite-contact-dialog.cpp
+++ b/app/invite-contact-dialog.cpp
@@ -31,7 +31,7 @@
 #include <TelepathyQt/TextChannel>
 
 #include <KTp/debug.h>
-#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>
 #include <telepathy-qt4/TelepathyQt/PendingChannelRequest>
@@ -43,11 +43,11 @@ InviteContactDialog::InviteContactDialog(const Tp::AccountPtr &account, const Tp
 {
     resize(500,450);
 
-    m_accountsModel = new AccountsModel(this);
-    m_accountsModel->onNewAccount(account);
+    m_contactsModel = new ContactsModel(this);
+    m_contactsModel->onNewAccount(account);
 
 
-    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);
     setMainWidget(m_contactGridWidget);
diff --git a/app/invite-contact-dialog.h b/app/invite-contact-dialog.h
index f77a77c..6dbef53 100644
--- a/app/invite-contact-dialog.h
+++ b/app/invite-contact-dialog.h
@@ -36,8 +36,7 @@ namespace KTp {
 class ContactGridWidget;
 }
 
-class AccountsModel;
-class QTcpSocket;
+class ContactsModel;
 
 class InviteContactDialog : public KDialog
 {
@@ -56,7 +55,7 @@ private Q_SLOTS:
 private:
     Tp::AccountPtr m_account;
     Tp::TextChannelPtr m_channel;
-    AccountsModel *m_accountsModel;
+    ContactsModel *m_contactsModel;
     KTp::ContactGridWidget *m_contactGridWidget;
 };
 

-- 
ktp-text-ui packaging