[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:04:50 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=7610750
The following commit has been merged in the master branch:
commit 76107508ba96b2446760b9ca1f06aabb8277fef0
Author: Lasath Fernando <kde at lasath.org>
Date: Thu Dec 1 11:14:59 2011 +1100
Fixed the copyright information at the top of files
---
KTp/Declarative/conversation-target.cpp | 3 +-
KTp/Declarative/conversation-target.h | 3 +-
KTp/Declarative/conversation.cpp | 1 -
KTp/Declarative/conversation.h | 1 -
KTp/Declarative/conversations-model.cpp | 3 +-
KTp/Declarative/conversations-model.h | 3 +-
KTp/Declarative/messages-model.cpp | 1 -
KTp/Declarative/messages-model.h | 74 +++++++++++++++++++++++++++++
KTp/Declarative/telepathy-text-observer.cpp | 4 +-
KTp/Declarative/telepathy-text-observer.h | 3 +-
10 files changed, 81 insertions(+), 15 deletions(-)
diff --git a/KTp/Declarative/conversation-target.cpp b/KTp/Declarative/conversation-target.cpp
index 49e52f3..c2bc701 100644
--- a/KTp/Declarative/conversation-target.cpp
+++ b/KTp/Declarative/conversation-target.cpp
@@ -1,6 +1,5 @@
/*
- <one line to give the library's name and an idea of what it does.>
- Copyright (C) 2011 <copyright holder> <email>
+ Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git a/KTp/Declarative/conversation-target.h b/KTp/Declarative/conversation-target.h
index 0251bb6..dbfdec2 100644
--- a/KTp/Declarative/conversation-target.h
+++ b/KTp/Declarative/conversation-target.h
@@ -1,6 +1,5 @@
/*
- <one line to give the library's name and an idea of what it does.>
- Copyright (C) 2011 <copyright holder> <email>
+ Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git a/KTp/Declarative/conversation.cpp b/KTp/Declarative/conversation.cpp
index ebd319f..45284da 100644
--- a/KTp/Declarative/conversation.cpp
+++ b/KTp/Declarative/conversation.cpp
@@ -1,5 +1,4 @@
/*
- <one line to give the library's name and an idea of what it does.>
Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
This library is free software; you can redistribute it and/or
diff --git a/KTp/Declarative/conversation.h b/KTp/Declarative/conversation.h
index 2e510f8..439150b 100644
--- a/KTp/Declarative/conversation.h
+++ b/KTp/Declarative/conversation.h
@@ -1,5 +1,4 @@
/*
- <one line to give the library's name and an idea of what it does.>
Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
This library is free software; you can redistribute it and/or
diff --git a/KTp/Declarative/conversations-model.cpp b/KTp/Declarative/conversations-model.cpp
index 3dbeba6..9166541 100644
--- a/KTp/Declarative/conversations-model.cpp
+++ b/KTp/Declarative/conversations-model.cpp
@@ -1,6 +1,5 @@
/*
- <one line to give the library's name and an idea of what it does.>
- Copyright (C) 2011 <copyright holder> <email>
+ Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git a/KTp/Declarative/conversations-model.h b/KTp/Declarative/conversations-model.h
index 26d9e2d..c56cee7 100644
--- a/KTp/Declarative/conversations-model.h
+++ b/KTp/Declarative/conversations-model.h
@@ -1,6 +1,5 @@
/*
- <one line to give the library's name and an idea of what it does.>
- Copyright (C) 2011 <copyright holder> <email>
+ Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index 114ce2f..d87f454 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -1,5 +1,4 @@
/*
- <one line to give the library's name and an idea of what it does.>
Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
This library is free software; you can redistribute it and/or
diff --git a/KTp/Declarative/messages-model.h b/KTp/Declarative/messages-model.h
index e69de29..720ee1f 100644
--- a/KTp/Declarative/messages-model.h
+++ b/KTp/Declarative/messages-model.h
@@ -0,0 +1,74 @@
+/*
+ Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+
+#ifndef MESSAGES_MODEL_H
+#define MESSAGES_MODEL_H
+
+#include "kdetelepathychat_export.h"
+
+#include <QAbstractItemModel>
+#include <TelepathyQt4/TextChannel>
+
+
+class KDE_TELEPATHY_CHAT_EXPORT MessagesModel : public QAbstractListModel
+{
+Q_OBJECT
+// Q_PROPERTY(Tp::TextChannelPtr textChannel
+// READ textChannel
+// WRITE setTextChannel
+// NOTIFY textChannelChanged
+// )
+
+public:
+ MessagesModel(QObject* parent = 0);
+ virtual ~MessagesModel();
+
+ 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);
+
+Q_SIGNALS:
+ void textChannelChanged(Tp::TextChannelPtr newChannel);
+
+public Q_SLOTS:
+ Tp::PendingSendMessage* sendNewMessage(QString message);
+
+private Q_SLOTS:
+ void onMessageReceived(Tp::ReceivedMessage);
+ void onMessageSent(Tp::Message,Tp::MessageSendingFlags,QString);
+ bool verifyPendingOperation(Tp::PendingOperation* op);
+
+private:
+ void setupChannelSignals(Tp::TextChannelPtr channel);
+ void removeChannelSignals(Tp::TextChannelPtr channel);
+
+ class ConversationModelPrivate;
+ ConversationModelPrivate *d;
+};
+
+#endif // CONVERSATION_MODEL_H
diff --git a/KTp/Declarative/telepathy-text-observer.cpp b/KTp/Declarative/telepathy-text-observer.cpp
index 5b772c0..028e273 100644
--- a/KTp/Declarative/telepathy-text-observer.cpp
+++ b/KTp/Declarative/telepathy-text-observer.cpp
@@ -1,6 +1,5 @@
/*
- <one line to give the library's name and an idea of what it does.>
- Copyright (C) 2011 <copyright holder> <email>
+ Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -110,6 +109,7 @@ TelepathyTextObserver
<< Tp::Contact::FeatureSimplePresence
);
+ //TODO: check these to make sure I'm only requesting features I actually use.
d->registrar = Tp::ClientRegistrar::create(accountFactory, connectionFactory,
channelFactory, contactFactory);
diff --git a/KTp/Declarative/telepathy-text-observer.h b/KTp/Declarative/telepathy-text-observer.h
index 703bf76..dcec492 100644
--- a/KTp/Declarative/telepathy-text-observer.h
+++ b/KTp/Declarative/telepathy-text-observer.h
@@ -1,6 +1,5 @@
/*
- <one line to give the library's name and an idea of what it does.>
- Copyright (C) 2011 <copyright holder> <email>
+ Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list