[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=9e2fc4f

The following commit has been merged in the master branch:
commit 9e2fc4f818656ad714123ec72769ec8729ead554
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Nov 13 12:34:10 2012 +0900

    Update AccountsModel to renamed ContactsModel
---
 KTp/Declarative/contact-list.cpp |  2 +-
 KTp/Declarative/contact-list.h   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/KTp/Declarative/contact-list.cpp b/KTp/Declarative/contact-list.cpp
index c81ebe9..92a6022 100644
--- a/KTp/Declarative/contact-list.cpp
+++ b/KTp/Declarative/contact-list.cpp
@@ -99,7 +99,7 @@ AccountsFilterModel * ContactList::filterModel() const
 
 void ContactList::startChat(ContactModelItem *contactItem)
 {
-    
+
     Tp::ContactPtr contact = contactItem->contact();
 
     kDebug() << "Requesting chat for contact" << contact->alias();
diff --git a/KTp/Declarative/contact-list.h b/KTp/Declarative/contact-list.h
index 40b4243..dee39ee 100644
--- a/KTp/Declarative/contact-list.h
+++ b/KTp/Declarative/contact-list.h
@@ -28,28 +28,28 @@
 
 /** Exposes general contact list stuff to QML*/
 class ContactList : public QObject
-{   
+{
     Q_OBJECT
 public:
     Q_PROPERTY(QObject* model READ flatModel)
     Q_PROPERTY(QObject* filter READ filterModel)
 
-    
+
     ContactList(QObject *parent=0);
     FlatModelProxy* flatModel() const;
     AccountsFilterModel* filterModel() const;
 
-    
+
 public slots:
     void startChat(ContactModelItem *contact);
 
 private slots:
     void onAccountManagerReady(Tp::PendingOperation *op);
-    
+
 private:
     ContactsModel* m_contactsModel;
     AccountsFilterModel* m_filterModel;
-    FlatModelProxy* m_flatModel; 
+    FlatModelProxy* m_flatModel;
     Tp::AccountManagerPtr m_accountManager;
 };
 

-- 
ktp-common-internals packaging