1 files changed, 42 insertions, 43 deletions
diff --git a/Swift/QtUI/QtFormResultItemModel.cpp b/Swift/QtUI/QtFormResultItemModel.cpp
index b0b0749..b35bb4f 100644
--- a/Swift/QtUI/QtFormResultItemModel.cpp
+++ b/Swift/QtUI/QtFormResultItemModel.cpp
@@ -5,17 +5,16 @@
  */
 
 /*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#include "QtFormResultItemModel.h"
+#include <Swift/QtUI/QtFormResultItemModel.h>
 
 #include <boost/algorithm/string/join.hpp>
 
 #include <Swift/QtUI/QtSwiftUtil.h>
-#include <Swiften/Base/foreach.h>
 
 namespace Swift {
 
@@ -28,67 +27,67 @@ QtFormResultItemModel::QtFormResultItemModel(QObject* parent, Form::ref formResu
 }
 
 void QtFormResultItemModel::setForm(Form::ref formResult) {
-	emit layoutAboutToBeChanged();
-	formResult_ = formResult;
-	emit layoutChanged();
+    emit layoutAboutToBeChanged();
+    formResult_ = formResult;
+    emit layoutChanged();
 }
 
 const Form::ref QtFormResultItemModel::getForm() const {
-	return formResult_;
+    return formResult_;
 }
 
 QVariant QtFormResultItemModel::headerData(int section, Qt::Orientation /*orientation*/, int role) const {
-	if (!formResult_) return QVariant();
-	if (role != Qt::DisplayRole) return QVariant();
-	if (static_cast<size_t>(section) >= formResult_->getReportedFields().size()) return QVariant();
-	return QVariant(P2QSTRING(formResult_->getReportedFields().at(section)->getLabel()));
+    if (!formResult_) return QVariant();
+    if (role != Qt::DisplayRole) return QVariant();
+    if (static_cast<size_t>(section) >= formResult_->getReportedFields().size()) return QVariant();
+    return QVariant(P2QSTRING(formResult_->getReportedFields().at(section)->getLabel()));
 }
 
 int QtFormResultItemModel::rowCount(const QModelIndex &/*parent*/) const {
-	if (!formResult_) return 0;
-	return formResult_->getItems().size();
+    if (!formResult_) return 0;
+    return formResult_->getItems().size();
 }
 
 int QtFormResultItemModel::columnCount(const QModelIndex &/*parent*/) const {
-	if (!formResult_) return 0;
-	return formResult_->getReportedFields().size();
+    if (!formResult_) return 0;
+    return formResult_->getReportedFields().size();
 }
 
 QVariant QtFormResultItemModel::data(const QModelIndex &index, int role) const {
-	if (!formResult_) return QVariant();
-	if (role != Qt::DisplayRole || !index.isValid()) {
-		return QVariant();
-	}
+    if (!formResult_) return QVariant();
+    if (role != Qt::DisplayRole || !index.isValid()) {
+        return QVariant();
+    }
 
-	if (static_cast<size_t>(index.row()) >= formResult_->getItems().size()) return QVariant();
-	if (static_cast<size_t>(index.column()) >= formResult_->getReportedFields().size()) return QVariant();
+    if (static_cast<size_t>(index.row()) >= formResult_->getItems().size()) return QVariant();
+    if (static_cast<size_t>(index.column()) >= formResult_->getReportedFields().size()) return QVariant();
 
-	Form::FormItem item = formResult_->getItems().at(index.row());
+    Form::FormItem item = formResult_->getItems().at(index.row());
 
-	return QVariant(P2QSTRING(getFieldValue(item, index.column())));
+    return QVariant(P2QSTRING(getFieldValue(item, index.column())));
 }
 
 const std::string QtFormResultItemModel::getFieldValue(const Form::FormItem& item, const int column) const {
-	// determine field name
-	std::string name = formResult_->getReportedFields().at(column)->getName();
-
-	foreach(FormField::ref field, item) {
-		if (field->getName() == name) {
-			std::string delimiter = "";
-			if (field->getType() == FormField::TextMultiType) {
-				delimiter = "\n";
-			}
-			else if (field->getType() == FormField::JIDMultiType) {
-				delimiter = ", ";
-			} 
-			else if (field->getType() == FormField::ListMultiType) {
-				delimiter = ", ";
-			}
-			return boost::algorithm::join(field->getValues(), delimiter);
-		}
-	}
-
-	return "";
+    // determine field name
+    std::string name = formResult_->getReportedFields().at(column)->getName();
+
+    for (auto&& field : item) {
+        if (field->getName() == name) {
+            std::string delimiter = "";
+            if (field->getType() == FormField::TextMultiType) {
+                delimiter = "\n";
+            }
+            else if (field->getType() == FormField::JIDMultiType) {
+                delimiter = ", ";
+            }
+            else if (field->getType() == FormField::ListMultiType) {
+                delimiter = ", ";
+            }
+            return boost::algorithm::join(field->getValues(), delimiter);
+        }
+    }
+
+    return "";
 }
 
 }