# HG changeset patch
# User Andre Heinecke <andre.heinecke@intevation.de>
# Date 1429030555 -7200
# Node ID 73efe717b9441b2d724749a6d752fccce4f477fb
# Parent  6d5dd3ae2ad362c7f242f3600d02601549946482
Fix bug in csv model to allow changing headerdata

diff -r 6d5dd3ae2ad3 -r 73efe717b944 src/filterwidget.cpp
--- a/src/filterwidget.cpp	Tue Apr 14 17:25:44 2015 +0200
+++ b/src/filterwidget.cpp	Tue Apr 14 18:55:55 2015 +0200
@@ -36,9 +36,9 @@
             mCombo->addItem(entry);
             mColFilterMap.insert(addedItems++, i);
         } else {
-            QString shortended = entry.remove(0,1);
-            // TODO this does not work as expected
-            newSource->setHeaderData(i, Qt::Horizontal, shortended);
+            if (!newSource->setHeaderData(i, Qt::Horizontal, entry.remove(0,1), Qt::DisplayRole)) {
+                qDebug() << "Setting header data failed.";
+            }
         }
     }
 }
diff -r 6d5dd3ae2ad3 -r 73efe717b944 src/libqxt/qxtcsvmodel.cpp
--- a/src/libqxt/qxtcsvmodel.cpp	Tue Apr 14 17:25:44 2015 +0200
+++ b/src/libqxt/qxtcsvmodel.cpp	Tue Apr 14 18:55:55 2015 +0200
@@ -265,7 +265,7 @@
 bool QxtCsvModel::setHeaderData(int section, Qt::Orientation orientation, const QVariant& value, int role)
 {
     if(orientation != Qt::Horizontal) return false;                   // We don't support the vertical header
-    if(role != Qt::DisplayRole || role != Qt::EditRole) return false; // We don't support any other roles
+    if(role != Qt::DisplayRole && role != Qt::EditRole) return false; // We don't support any other roles
     if(section < 0) return false;                                     // Bogus input
     while(section > qxt_d().header.size()) {
         qxt_d().header << QString();
diff -r 6d5dd3ae2ad3 -r 73efe717b944 src/metadataview.cpp
--- a/src/metadataview.cpp	Tue Apr 14 17:25:44 2015 +0200
+++ b/src/metadataview.cpp	Tue Apr 14 18:55:55 2015 +0200
@@ -8,7 +8,6 @@
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QDebug>
-#include <QHeaderView>
 #include <QModelIndex>
 #include <QItemSelectionModel>