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

The following commit has been merged in the master branch:
commit fc1702b3ef1b86e5488b57b6681b6a6df85cbe98
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Mar 24 02:51:48 2011 +0000

    Renamed to ChannelContactModel to reflect changes better
---
 lib/CMakeLists.txt                                     |  2 +-
 ...nnel-contact-list.cpp => channel-contact-model.cpp} | 18 +++++++++---------
 ...{channel-contact-list.h => channel-contact-model.h} |  4 ++--
 lib/chat-widget.cpp                                    |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 5dc3f74..1639cfd 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -7,7 +7,7 @@ set(telepathy_chat_handler_lib_SRCS
         adium-theme-message-info.cpp
         adium-theme-content-info.cpp
         adium-theme-status-info.cpp
-        channel-contact-list.cpp
+        channel-contact-model.cpp
         chat-style-plist-file-reader.cpp
         chat-text-edit.cpp
 )
diff --git a/lib/channel-contact-list.cpp b/lib/channel-contact-model.cpp
similarity index 89%
rename from lib/channel-contact-list.cpp
rename to lib/channel-contact-model.cpp
index 8d496f8..e2886a5 100644
--- a/lib/channel-contact-list.cpp
+++ b/lib/channel-contact-model.cpp
@@ -17,12 +17,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "channel-contact-list.h"
+#include "channel-contact-model.h"
 
 #include <KDebug>
 #include <KIcon>
 
-ChannelContactList::ChannelContactList(const Tp::TextChannelPtr & channel, QObject *parent)
+ChannelContactModel::ChannelContactModel(const Tp::TextChannelPtr & channel, QObject *parent)
     : QAbstractListModel(parent)
 {
     //add existing contacts
@@ -37,7 +37,7 @@ ChannelContactList::ChannelContactList(const Tp::TextChannelPtr & channel, QObje
 }
 
 
-int ChannelContactList::rowCount(const QModelIndex &parent) const
+int ChannelContactModel::rowCount(const QModelIndex &parent) const
 {
     if (! parent.isValid()) {
         return m_contacts.size();
@@ -45,7 +45,7 @@ int ChannelContactList::rowCount(const QModelIndex &parent) const
     return 0;
 }
 
-QVariant ChannelContactList::data(const QModelIndex &index, int role) const
+QVariant ChannelContactModel::data(const QModelIndex &index, int role) const
 {
     if(!index.isValid()) {
         return QVariant();
@@ -80,7 +80,7 @@ QVariant ChannelContactList::data(const QModelIndex &index, int role) const
     }
 }
 
-void ChannelContactList::onGroupMembersChanged(const Tp::Contacts & groupMembersAdded,
+void ChannelContactModel::onGroupMembersChanged(const Tp::Contacts & groupMembersAdded,
                                              const Tp::Contacts & groupLocalPendingMembersAdded,
                                              const Tp::Contacts & groupRemotePendingMembersAdded,
                                              const Tp::Contacts & groupMembersRemoved,
@@ -96,7 +96,7 @@ void ChannelContactList::onGroupMembersChanged(const Tp::Contacts & groupMembers
     removeContacts(groupMembersRemoved);
 }
 
-void ChannelContactList::onContactPresenceChanged(const Tp::Presence &presence)
+void ChannelContactModel::onContactPresenceChanged(const Tp::Presence &presence)
 {
     Tp::ContactPtr contact(qobject_cast<Tp::Contact*>(sender()));
 
@@ -105,7 +105,7 @@ void ChannelContactList::onContactPresenceChanged(const Tp::Presence &presence)
 
     emit contactPresenceChanged(contact, presence);}
 
-void ChannelContactList::onContactAliasChanged(const QString &alias)
+void ChannelContactModel::onContactAliasChanged(const QString &alias)
 {
     Tp::ContactPtr contact(qobject_cast<Tp::Contact*>(sender()));
 
@@ -115,7 +115,7 @@ void ChannelContactList::onContactAliasChanged(const QString &alias)
     emit contactAliasChanged(contact, alias);
 }
 
-void ChannelContactList::addContacts(const Tp::Contacts &contacts)
+void ChannelContactModel::addContacts(const Tp::Contacts &contacts)
 {
     QList<Tp::ContactPtr> newContacts = contacts.toList();
 
@@ -129,7 +129,7 @@ void ChannelContactList::addContacts(const Tp::Contacts &contacts)
     endInsertRows();
 }
 
-void ChannelContactList::removeContacts(const Tp::Contacts &contacts)
+void ChannelContactModel::removeContacts(const Tp::Contacts &contacts)
 {
     foreach(Tp::ContactPtr contact, contacts) {
 
diff --git a/lib/channel-contact-list.h b/lib/channel-contact-model.h
similarity index 95%
rename from lib/channel-contact-list.h
rename to lib/channel-contact-model.h
index 97d19c9..537c3eb 100644
--- a/lib/channel-contact-list.h
+++ b/lib/channel-contact-model.h
@@ -34,11 +34,11 @@
   change for notification messages
   */
 
-class ChannelContactList : public QAbstractListModel
+class ChannelContactModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
-    explicit ChannelContactList(const Tp::TextChannelPtr &channel, QObject *parent = 0);
+    explicit ChannelContactModel(const Tp::TextChannelPtr &channel, QObject *parent = 0);
 
 signals:
     void contactPresenceChanged(const Tp::ContactPtr &contact, const Tp::Presence &presence);
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 9ca8815..5ddf3dd 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -24,7 +24,7 @@
 #include "adium-theme-content-info.h"
 #include "adium-theme-message-info.h"
 #include "adium-theme-status-info.h"
-#include "channel-contact-list.h"
+#include "channel-contact-model.h"
 
 #include <QtGui/QKeyEvent>
 #include <QtGui/QAction>
@@ -147,7 +147,7 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, QWidget *parent)
     d->ui.insertEmoticon->setIcon(KIcon("face-smile"));
 
     //channel is now valid, start keeping track of contacts.
-    ChannelContactList* contactList = new ChannelContactList(d->channel, this);
+    ChannelContactModel* contactList = new ChannelContactModel(d->channel, this);
     connect(contactList, SIGNAL(contactPresenceChanged(Tp::ContactPtr,Tp::Presence)),
             SLOT(onContactPresenceChange(Tp::ContactPtr,Tp::Presence)));
     connect(contactList, SIGNAL(contactAliasChanged(Tp::ContactPtr,QString)),

-- 
ktp-text-ui packaging