[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:20:53 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=163bfd2
The following commit has been merged in the master branch:
commit 163bfd2b7c38a2cb0dce7bad6194db58a8fcc11d
Author: Lasath Fernando <kde at lasath.org>
Date: Tue Jan 10 14:23:16 2012 +1100
Fixed some further minor issues.
---
lib/conversation-que-manager.cpp | 2 +-
lib/conversation-que-manager.h | 2 +-
lib/messages-model.cpp | 7 ++++---
lib/messages-model.h | 4 ++--
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/lib/conversation-que-manager.cpp b/lib/conversation-que-manager.cpp
index dfec82f..dbdb426 100644
--- a/lib/conversation-que-manager.cpp
+++ b/lib/conversation-que-manager.cpp
@@ -31,7 +31,7 @@ void Queable::enqueSelf()
m_queManager->enque(this);
}
-void Queable::removeSelfFromQue()
+void Queable::removeSelfFromQueue()
{
m_queManager->remove(this);
}
diff --git a/lib/conversation-que-manager.h b/lib/conversation-que-manager.h
index 25fdb77..98d3a37 100644
--- a/lib/conversation-que-manager.h
+++ b/lib/conversation-que-manager.h
@@ -33,7 +33,7 @@ protected:
virtual ~Queable();
void enqueSelf();
- void removeSelfFromQue();
+ void removeSelfFromQueue();
virtual void selfDequed() = 0;
private:
diff --git a/lib/messages-model.cpp b/lib/messages-model.cpp
index 47da2c4..bbc4da9 100644
--- a/lib/messages-model.cpp
+++ b/lib/messages-model.cpp
@@ -45,7 +45,7 @@ public:
}
};
-class MessagesModel::ConversationModelPrivate
+class MessagesModel::MessagesModelPrivate
{
public:
Tp::TextChannelPtr textChannel;
@@ -55,7 +55,7 @@ public:
MessagesModel::MessagesModel(QObject* parent):
QAbstractListModel(parent),
- d(new ConversationModelPrivate)
+ d(new MessagesModelPrivate)
{
kDebug();
@@ -116,6 +116,7 @@ void MessagesModel::setTextChannel(Tp::TextChannelPtr channel)
//Tp::Message has an == operator. maybe I can use that?
if (current.id == message.messageToken()) {
messageAlreadyInModel = true;
+ break;
}
}
if (!messageAlreadyInModel) {
@@ -247,7 +248,7 @@ void MessagesModel::acknowledgeAllMessages()
kDebug() << "Conversation Visible, Acknowledging " << queue.size() << " messages.";
d->textChannel->acknowledge(queue);
- removeSelfFromQue();
+ removeSelfFromQueue();
Q_EMIT unreadCountChanged(queue.size());
}
diff --git a/lib/messages-model.h b/lib/messages-model.h
index 3d31e90..bcae07a 100644
--- a/lib/messages-model.h
+++ b/lib/messages-model.h
@@ -78,8 +78,8 @@ private:
void removeChannelSignals(Tp::TextChannelPtr channel);
virtual void selfDequed();
- class ConversationModelPrivate;
- ConversationModelPrivate *d;
+ class MessagesModelPrivate;
+ MessagesModelPrivate *d;
};
#endif // CONVERSATION_MODEL_H
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list