From e3d9df5813682b65de6a050ff069b233e20c06a0 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Fri, 4 Aug 2017 23:15:58 +0200
Subject: [PATCH] small cleanups

---
 common-rust/src/implementation.rs | 7 +++++--
 common-rust/src/interface.rs      | 2 +-
 src/RMailObject.cpp               | 6 ------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/common-rust/src/implementation.rs b/common-rust/src/implementation.rs
index 2cc6d9e..f41ddab 100644
--- a/common-rust/src/implementation.rs
+++ b/common-rust/src/implementation.rs
@@ -46,6 +46,9 @@ impl DirEntry {
 
 impl Item for DirEntry {
     fn data<'a>(&self, role: c_int) -> Variant<'a> {
+        if role != 0 {
+            return Variant::None
+        }
         let str = self.name.to_string_lossy().to_string();
         return Variant::from(str);
     }
@@ -147,8 +150,8 @@ impl<T: Item> RItemModelTrait<T> for RGeneralItemModel<T> {
             entries: vec![none, root]
         }
     }
-    fn column_count(&mut self, parent: QModelIndex) -> c_int {
-        1
+    fn column_count(&mut self, _: QModelIndex) -> c_int {
+        2
     }
     fn row_count(&mut self, parent: QModelIndex) -> c_int {
         let i = self.get(&parent);
diff --git a/common-rust/src/interface.rs b/common-rust/src/interface.rs
index fbcfc79..f15ed6d 100644
--- a/common-rust/src/interface.rs
+++ b/common-rust/src/interface.rs
@@ -1,5 +1,5 @@
 use std::slice;
-use libc::{c_int, uint8_t, uint16_t, size_t, c_void};
+use libc::{c_int, uint16_t, size_t, c_void};
 use types::*;
 
 use implementation::*;
diff --git a/src/RMailObject.cpp b/src/RMailObject.cpp
index f56d6ad..263f918 100644
--- a/src/RMailObject.cpp
+++ b/src/RMailObject.cpp
@@ -144,12 +144,6 @@ void set_variant(void* v, qvariant_t* val) {
 
 QVariant RItemModel::data(const QModelIndex &index, int role) const
 {
-    if (!index.isValid()) {
-        return QVariant();
-    }
-    if (role != Qt::DisplayRole) {
-        return QVariant();
-    }
     const qmodelindex_t i = {
         .row = index.row(),
         .column =  index.column(),