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

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

    Remove more useless comments
---
 lib/conversation.h            |  7 ++-----
 plasmoid/contents/ui/main.qml | 22 +---------------------
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/lib/conversation.h b/lib/conversation.h
index 565b28a..a072a51 100644
--- a/lib/conversation.h
+++ b/lib/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;
 
diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml
index 2c12a66..e01adbd 100644
--- a/plasmoid/contents/ui/main.qml
+++ b/plasmoid/contents/ui/main.qml
@@ -3,7 +3,7 @@ import org.kde.telepathy.declarativeplugins 0.1
 import org.kde.plasma.core 0.1 as PlasmaCore
 import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
 import org.kde.plasma.components 0.1 as PlasmaComponents
-// import "createDialog.js" as MyScript
+
 
 Item {
     id: top
@@ -65,27 +65,7 @@ Item {
                     dialog.y = point.y;
                 }
             }
-
-//             function popupApplet() {
-//                 if(model.conversation.messages.visibleToUser == false) {
-//                     var point = dialog.popupPosition(conv, Qt.AlignBottom);
-//                     console.log("Showing dialog at (" + point.x + "," + point.y + ")");
-// 
-//                     dialog.x = point.x;
-//                     dialog.y = point.y;
-// 
-// //                     dialog.visible = true;
-//                     model.conversation.messages.visibleToUser = true;
-//                 } else {
-//                     console.log("height = " + dialog.height);
-//                     console.log("width = " + dialog.width);
-// //                     dialog.visible = false;
-//                     model.conversation.messages.visibleToUser = false;
-//                 }
-//             }
         }
     }
 
-//     height: parent.height
-//     width: 60
 }
\ No newline at end of file

-- 
ktp-text-ui packaging