[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:52 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=0913635
The following commit has been merged in the master branch:
commit 091363551aede9ee4461fa694bccf66f1eb7e4bd
Author: Lasath Fernando <kde at lasath.org>
Date: Tue Jan 10 14:10:22 2012 +1100
Fixed some more formatting.
---
lib/conversations-model.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/conversations-model.cpp b/lib/conversations-model.cpp
index 3089287..55d21b2 100644
--- a/lib/conversations-model.cpp
+++ b/lib/conversations-model.cpp
@@ -31,10 +31,10 @@ public:
QList<Conversation*> conversations;
};
-QVariant ConversationsModel::data ( const QModelIndex& index, int role ) const
+QVariant ConversationsModel::data(const QModelIndex& index, int role) const
{
QVariant result;
- if(index.row() >= 0 && index.row() < d->conversations.count()) {
+ if (index.row() >= 0 && index.row() < d->conversations.count()) {
Q_ASSERT(role == ConversationRole);
result = QVariant::fromValue<Conversation*>(d->conversations[index.row()]);
kDebug() << "returning value " << result;
@@ -42,13 +42,13 @@ QVariant ConversationsModel::data ( const QModelIndex& index, int role ) const
return result;
}
-int ConversationsModel::rowCount ( const QModelIndex& parent ) const
+int ConversationsModel::rowCount(const QModelIndex& parent) const
{
return d->conversations.count();
}
ConversationsModel::ConversationsModel() :
- d(new ConversationsModelPrivate)
+ d(new ConversationsModelPrivate)
{
QHash<int, QByteArray> roles;
roles[ConversationRole] = "conversation";
@@ -57,7 +57,7 @@ ConversationsModel::ConversationsModel() :
QObject::connect(&d->watcher, SIGNAL(newConversation(Conversation*)), SLOT(onInconmingConversation(Conversation*)));
}
-void ConversationsModel::onInconmingConversation ( Conversation* newConvo )
+void ConversationsModel::onInconmingConversation(Conversation* newConvo)
{
//check if conversation's channel is already being handled, if so replace it
bool handled = false;
@@ -67,7 +67,7 @@ void ConversationsModel::onInconmingConversation ( Conversation* newConvo )
//loop through all conversations checking for matches
Q_FOREACH(Conversation *convo, d->conversations) {
if (convo->target()->id() == newChannel->targetId() &&
- convo->model()->textChannel()->targetHandleType() == newChannel->targetHandleType()) {
+ convo->model()->textChannel()->targetHandleType() == newChannel->targetHandleType()) {
convo->model()->setTextChannel(newChannel);
newConvo->deleteLater();
@@ -77,7 +77,7 @@ void ConversationsModel::onInconmingConversation ( Conversation* newConvo )
}
}
- if(!handled) {
+ if (!handled) {
beginInsertRows(QModelIndex(), rowCount(), rowCount());
d->conversations.append(newConvo);
endInsertRows();
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list