From a4bcbf6115f78819cdf987e8f49afb62f3b21891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetronSolutions.com>
Date: Thu, 26 Sep 2013 11:48:41 +0200
Subject: [PATCH] Merge from origin

---
 .../cafPdmUiTreeViewEditor.cpp                | 20 +++++++++----------
 .../cafUserInterface/cafUiTreeModelPdm.cpp    |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp
index c1f2c32702..f2653ed19f 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp
@@ -54,19 +54,19 @@
 class MySortFilterProxyModel : public QSortFilterProxyModel
 {
 public:
-    MySortFilterProxyModel(QObject *parent = 0)
-        : QSortFilterProxyModel(parent)
-    {
-
-    }
-
-    void notifyModelChanged()
-    {
+    MySortFilterProxyModel(QObject *parent = 0)
+        : QSortFilterProxyModel(parent)
+    {
+
+    }
+
+    void notifyModelChanged()
+    {
         QModelIndex startModelIdx = index(0,0);
         QModelIndex endModelIdx = index(rowCount(startModelIdx), 0);
 
         emit dataChanged(startModelIdx, endModelIdx);
-    }
+    }
 };
 
 
@@ -112,7 +112,7 @@ QWidget* PdmUiTreeViewEditor::createWidget(QWidget* parent)
     m_proxyTreeModelPdm->setSourceModel(m_treeModelPdm);
     m_treeView->setModel(m_proxyTreeModelPdm);
 
-    m_treeView->setSortingEnabled(true);
+    m_treeView->setSortingEnabled(true);
     m_treeView->sortByColumn(1, Qt::AscendingOrder);
 
     
diff --git a/Fwk/AppFwk/cafUserInterface/cafUiTreeModelPdm.cpp b/Fwk/AppFwk/cafUserInterface/cafUiTreeModelPdm.cpp
index 03005d6698..5c5718e878 100644
--- a/Fwk/AppFwk/cafUserInterface/cafUiTreeModelPdm.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafUiTreeModelPdm.cpp
@@ -503,7 +503,7 @@ void UiTreeModelPdm::notifyModelChanged()
 //--------------------------------------------------------------------------------------------------
 QVariant UiTreeModelPdm::headerData(int section, Qt::Orientation orientation, int role /*= Qt::DisplayRole */) const
 {
-    if (role != Qt::DisplayRole)
+    if (role != Qt::DisplayRole)
         return QVariant();
 
     if (section < m_columnHeaders.size())