[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=f8e8c01

The following commit has been merged in the master branch:
commit f8e8c015fc2a5565371f7a16a3f84003773a3dd9
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Mar 5 20:25:04 2013 +0000

    Fix compiler warning
    
    REVIEW: 109296
---
 contact-list-widget.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index f931913..7ea99a0 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -329,7 +329,8 @@ void ContactListWidget::toggleSortByPresence(bool sort)
 {
     Q_D(ContactListWidget);
 
-    d->model->setSortRole(sort ? KTp::ContactPresenceTypeRole : Qt::DisplayRole);
+    //typecast to int before passing to setSortRole to avoid false cpp warning about mixing enum types
+    d->model->setSortRole(sort ? (int)KTp::ContactPresenceTypeRole : (int)Qt::DisplayRole);
 }
 
 void ContactListWidget::startTextChannel(const Tp::AccountPtr &account, const Tp::ContactPtr &contact)

-- 
ktp-contact-list packaging