[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=659dc83

The following commit has been merged in the master branch:
commit 659dc83868ad75e632140804b96d3e34bd310747
Author: Lasath Fernando <kde at lasath.org>
Date:   Sun Jan 15 00:11:27 2012 +1100

    Remove more useless comments
---
 KTp/Declarative/conversation.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/KTp/Declarative/conversation.h b/KTp/Declarative/conversation.h
index 565b28a..a072a51 100644
--- a/KTp/Declarative/conversation.h
+++ b/KTp/Declarative/conversation.h
@@ -25,10 +25,10 @@
 #include <QObject>
 #include <TelepathyQt/Account>
 #include <TelepathyQt/TextChannel>
-// #include "conversation-model.h"
+
 #include <KIcon>
 #include "conversation-que-manager.h"
-// #include "conversation-target.h"
+
 
 class ConversationTarget;
 class MessagesModel;
@@ -36,9 +36,7 @@ class KDE_TELEPATHY_CHAT_EXPORT Conversation : public QObject
 {
 Q_OBJECT
 
-// Q_PROPERTY(ConversationTarget *target READ target CONSTANT);
 Q_PROPERTY(ConversationTarget* target READ target CONSTANT);
-//TODO: rename this to messages
 Q_PROPERTY(MessagesModel* messages READ messages CONSTANT);
 
 public:
@@ -46,7 +44,6 @@ public:
     Conversation(QObject *parent = 0);
     virtual ~Conversation();
 
-    //FIXME: rename model to messages
     MessagesModel* messages() const;
     ConversationTarget* target() const;
 

-- 
ktp-common-internals packaging