[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:21:10 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=f8e5249
The following commit has been merged in the master branch:
commit f8e5249f12f83471b8060810d5f1b307088699ae
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Wed Feb 8 22:57:26 2012 +0000
Add missing consts
---
plasmoid/declarative-plugin/messages-model.cpp | 35 +++++++++++++++-----------
plasmoid/declarative-plugin/messages-model.h | 11 ++++----
2 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/plasmoid/declarative-plugin/messages-model.cpp b/plasmoid/declarative-plugin/messages-model.cpp
index 54d6949..5b8b4f3 100644
--- a/plasmoid/declarative-plugin/messages-model.cpp
+++ b/plasmoid/declarative-plugin/messages-model.cpp
@@ -88,14 +88,17 @@ bool MessagesModel::verifyPendingOperation(Tp::PendingOperation *op)
return operationSucceeded;
}
-void MessagesModel::setupChannelSignals(Tp::TextChannelPtr channel)
+void MessagesModel::setupChannelSignals(const Tp::TextChannelPtr &channel)
{
- QObject::connect(channel.data(),
- SIGNAL(messageReceived(Tp::ReceivedMessage)),
- SLOT(onMessageReceived(Tp::ReceivedMessage)));
- QObject::connect(channel.data(),
- SIGNAL(messageSent(Tp::Message,Tp::MessageSendingFlags,QString)),
- SLOT(onMessageSent(Tp::Message,Tp::MessageSendingFlags,QString)));
+ connect(channel.data(),
+ SIGNAL(messageReceived(Tp::ReceivedMessage)),
+ SLOT(onMessageReceived(Tp::ReceivedMessage)));
+ connect(channel.data(),
+ SIGNAL(messageSent(Tp::Message,Tp::MessageSendingFlags,QString)),
+ SLOT(onMessageSent(Tp::Message,Tp::MessageSendingFlags,QString)));
+ connect(channel.data(),
+ SIGNAL(pendingMessageRemoved(Tp::ReceivedMessage)),
+ SLOT(onPendingMessageRemoved()));
}
void MessagesModel::setTextChannel(Tp::TextChannelPtr channel)
@@ -127,7 +130,7 @@ void MessagesModel::setTextChannel(Tp::TextChannelPtr channel)
}
}
-void MessagesModel::onMessageReceived(Tp::ReceivedMessage message)
+void MessagesModel::onMessageReceived(const Tp::ReceivedMessage &message)
{
int unreadCount = d->textChannel->messageQueue().size();
kDebug() << "unreadMessagesCount =" << unreadCount;
@@ -158,10 +161,10 @@ void MessagesModel::onMessageReceived(Tp::ReceivedMessage message)
}
-void MessagesModel::onMessageSent(Tp::Message message, Tp::MessageSendingFlags flags, QString token)
+void MessagesModel::onMessageSent(const Tp::Message &message, Tp::MessageSendingFlags flags, const QString &messageToken)
{
Q_UNUSED(flags);
- Q_UNUSED(token);
+ Q_UNUSED(messageToken);
int length = rowCount();
beginInsertRows(QModelIndex(), length, length);
@@ -178,6 +181,11 @@ void MessagesModel::onMessageSent(Tp::Message message, Tp::MessageSendingFlags f
endInsertRows();
}
+void MessagesModel::onPendingMessageRemoved()
+{
+ Q_EMIT unreadCountChanged(unreadCount());
+}
+
QVariant MessagesModel::data(const QModelIndex& index, int role) const
{
QVariant result;
@@ -223,7 +231,7 @@ void MessagesModel::sendNewMessage(const QString &message)
}
}
-void MessagesModel::removeChannelSignals(Tp::TextChannelPtr channel)
+void MessagesModel::removeChannelSignals(const Tp::TextChannelPtr &channel)
{
QObject::disconnect(channel.data(),
SIGNAL(messageReceived(Tp::ReceivedMessage)),
@@ -298,9 +306,8 @@ void MessagesModel::printallmessages()
Q_FOREACH(MessageItem msg, d->messages) {
kDebug() << msg.text;
}
- beginResetModel();
-// d->messages.clear();
- endResetModel();
}
+
+
#include "moc_messages-model.cpp"
diff --git a/plasmoid/declarative-plugin/messages-model.h b/plasmoid/declarative-plugin/messages-model.h
index 4ae99d3..ec677fe 100644
--- a/plasmoid/declarative-plugin/messages-model.h
+++ b/plasmoid/declarative-plugin/messages-model.h
@@ -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
+
void unreadCountChanged(int unreadMesssagesCount);
void popoutRequested();
@@ -69,13 +69,14 @@ public Q_SLOTS:
void sendNewMessage(const QString& message);
private Q_SLOTS:
- void onMessageReceived(Tp::ReceivedMessage);
- void onMessageSent(Tp::Message,Tp::MessageSendingFlags,QString);
+ void onMessageReceived(const Tp::ReceivedMessage &message);
+ void onMessageSent(const Tp::Message &message, Tp::MessageSendingFlags flags, const QString &messageToken);
+ void onPendingMessageRemoved();
bool verifyPendingOperation(Tp::PendingOperation *op);
private:
- void setupChannelSignals(Tp::TextChannelPtr channel);
- void removeChannelSignals(Tp::TextChannelPtr channel);
+ void setupChannelSignals(const Tp::TextChannelPtr &channel);
+ void removeChannelSignals(const Tp::TextChannelPtr &channel);
virtual void selfDequed();
class MessagesModelPrivate;
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list