[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:59 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=fc3a1f9
The following commit has been merged in the master branch:
commit fc3a1f9a196ce07db890a49c0ad35e193a142b96
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Tue Jan 31 14:08:39 2012 +0000
Fix warnings in conversation model
---
plasmoid/declarative-plugin/conversations-model.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/plasmoid/declarative-plugin/conversations-model.cpp b/plasmoid/declarative-plugin/conversations-model.cpp
index 332d76a..ad13f67 100644
--- a/plasmoid/declarative-plugin/conversations-model.cpp
+++ b/plasmoid/declarative-plugin/conversations-model.cpp
@@ -46,15 +46,17 @@ QVariant ConversationsModel::data(const QModelIndex& index, int role) const
{
QVariant result;
if (index.isValid()) {
- Q_ASSERT(role == ConversationRole);
- result = QVariant::fromValue<Conversation*>(d->conversations[index.row()]);
- kDebug() << "returning value " << result;
+ if (role == ConversationRole) {
+ result = QVariant::fromValue<Conversation*>(d->conversations[index.row()]);
+ kDebug() << "returning value " << result;
+ }
}
return result;
}
int ConversationsModel::rowCount(const QModelIndex& parent) const
{
+ Q_UNUSED(parent);
return d->conversations.count();
}
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list