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

The following commit has been merged in the master branch:
commit bbc037fc7031c1c16a89f2503e987d02f21a0df3
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Jan 10 12:47:20 2012 +1100

    Fixed some formatting and whitespace issues.
---
 KTp/Declarative/conversation-target.cpp |  2 +-
 KTp/Declarative/messages-model.h        | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/KTp/Declarative/conversation-target.cpp b/KTp/Declarative/conversation-target.cpp
index c8be71b..38db4f0 100644
--- a/KTp/Declarative/conversation-target.cpp
+++ b/KTp/Declarative/conversation-target.cpp
@@ -52,7 +52,7 @@ QIcon ConversationTarget::avatar() const
 {
     QString path = d->contact->avatarData().fileName;
 
-    if(path.isEmpty()) {
+    if (path.isEmpty()) {
         return KIcon(QLatin1String("im-user"));
     } else {
         return QIcon(path);
diff --git a/KTp/Declarative/messages-model.h b/KTp/Declarative/messages-model.h
index ef74400..b9a64c7 100644
--- a/KTp/Declarative/messages-model.h
+++ b/KTp/Declarative/messages-model.h
@@ -29,26 +29,26 @@
 
 class KDE_TELEPATHY_CHAT_EXPORT MessagesModel : public QAbstractListModel, public Queable
 {
-Q_OBJECT
-Q_PROPERTY(bool visibleToUser READ isVisibleToUser WRITE setVisibleToUser NOTIFY visibleToUserChanged);
-Q_PROPERTY(int unreadCount READ unreadCount NOTIFY unreadCountChanged);
+    Q_OBJECT
+    Q_PROPERTY(bool visibleToUser READ isVisibleToUser WRITE setVisibleToUser NOTIFY visibleToUserChanged);
+    Q_PROPERTY(int unreadCount READ unreadCount NOTIFY unreadCountChanged);
 
 public:
     MessagesModel(QObject* parent = 0);
     virtual ~MessagesModel();
 
-	enum Roles {
-		UserRole = Qt::UserRole,
-		TextRole,
-		TypeRole,
-		TimeRole
-	};
+    enum Roles {
+        UserRole = Qt::UserRole,
+        TextRole,
+        TypeRole,
+        TimeRole
+    };
 
     virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
     virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
 
-	Tp::TextChannelPtr textChannel();
-	void setTextChannel(Tp::TextChannelPtr channel);
+    Tp::TextChannelPtr textChannel();
+    void setTextChannel(Tp::TextChannelPtr channel);
 
     bool isVisibleToUser() const;
     void setVisibleToUser(bool visible);
@@ -61,7 +61,7 @@ public:
 Q_SIGNALS:
     void textChannelChanged(Tp::TextChannelPtr newChannel);
     void visibleToUserChanged(bool visible);
-    //TODO: figure out how to check if unread messages have been acknowledged by something else 
+    //TODO: figure out how to check if unread messages have been acknowledged by something else
     void unreadCountChanged(int unreadMesssagesCount);
     void popoutRequested();
 
@@ -74,12 +74,12 @@ private Q_SLOTS:
     bool verifyPendingOperation(Tp::PendingOperation* op);
 
 private:
-	void setupChannelSignals(Tp::TextChannelPtr channel);
-	void removeChannelSignals(Tp::TextChannelPtr channel);
+    void setupChannelSignals(Tp::TextChannelPtr channel);
+    void removeChannelSignals(Tp::TextChannelPtr channel);
     virtual void selfDequed();
 
-	class ConversationModelPrivate;
-	ConversationModelPrivate *d;
+    class ConversationModelPrivate;
+    ConversationModelPrivate *d;
 };
 
 #endif // CONVERSATION_MODEL_H

-- 
ktp-common-internals packaging