#3037 Rename using Q for table view model and tree view model

2025-02-25 18:55:39 -06:00 · 2018-06-11 11:16:35 +02:00
parent 1cb4201cbc
commit e370dee3b0
16 changed files with 82 additions and 82 deletions
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.h
@@ -110,7 +110,7 @@ private:
    bool                        containsObject(const PdmObjectHandle* object);
    void                        appendChild( PdmUiTreeOrdering* child);

-    friend class PdmUiTreeViewModel;
+    friend class PdmUiTreeViewQModel;
    PdmUiEditorHandle*          editor();
    void                        setEditor(PdmUiEditorHandle* editor);
    void                        insertChild( int position, PdmUiTreeOrdering* child);
--- a/Fwk/AppFwk/cafUserInterface/CMakeLists.txt
+++ b/Fwk/AppFwk/cafUserInterface/CMakeLists.txt
@@ -28,11 +28,11 @@ set( QOBJECT_HEADERS
    cafPdmUiTableView.h
    cafPdmUiTableViewDelegate.h
    cafPdmUiTableViewEditor.h
-    cafPdmUiTableViewModel.h
+    cafPdmUiTableViewQModel.h
    cafPdmUiTextEditor.h
    cafPdmUiToolButtonEditor.h
    cafPdmUiTreeView.h
-    cafPdmUiTreeViewModel.h
+    cafPdmUiTreeViewQModel.h
    cafPdmUiTreeViewEditor.h
    cafUiProcess.h
    QMinimizePanel.h
@@ -103,8 +103,8 @@ set( PROJECT_FILES
    cafPdmUiTableViewDelegate.h
    cafPdmUiTableViewEditor.cpp
    cafPdmUiTableViewEditor.h
-    cafPdmUiTableViewModel.cpp
-    cafPdmUiTableViewModel.h
+    cafPdmUiTableViewQModel.cpp
+    cafPdmUiTableViewQModel.h
    cafPdmUiTreeEditorHandle.cpp
    cafPdmUiTreeEditorHandle.h
    cafPdmUiTreeItemEditor.cpp
@@ -113,8 +113,8 @@ set( PROJECT_FILES
    cafPdmUiTreeView.h
    cafPdmUiTreeViewEditor.cpp
    cafPdmUiTreeViewEditor.h
-    cafPdmUiTreeViewModel.cpp
-    cafPdmUiTreeViewModel.h
+    cafPdmUiTreeViewQModel.cpp
+    cafPdmUiTreeViewQModel.h
    cafPdmUiPropertyView.cpp
    cafPdmUiPropertyView.h
    cafPdmUiPropertyViewDialog.cpp
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiDragDropInterface.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiDragDropInterface.h
@@ -54,7 +54,7 @@ public:

 protected:

-    friend class PdmUiTreeViewModel;
+    friend class PdmUiTreeViewQModel;
    friend class PdmUiTreeViewWidget;

    // Forwarding from Qt functions in QAbstractItemModel
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableItemEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableItemEditor.cpp
@@ -40,7 +40,7 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmUiEditorHandle.h"
-#include "cafPdmUiTableViewModel.h"
+#include "cafPdmUiTableViewQModel.h"


 namespace caf
@@ -50,7 +50,7 @@ namespace caf
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-PdmUiTableItemEditor::PdmUiTableItemEditor(PdmUiTableViewModel* model, caf::PdmObjectHandle* pdmObject, int row)
+PdmUiTableItemEditor::PdmUiTableItemEditor(PdmUiTableViewQModel* model, caf::PdmObjectHandle* pdmObject, int row)
 {
    m_model = model;
    m_row = row;
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableItemEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableItemEditor.h
@@ -40,7 +40,7 @@

 namespace caf
 {
-class PdmUiTableViewModel;
+class PdmUiTableViewQModel;
 class PdmObjectHandle;


@@ -50,14 +50,14 @@ class PdmObjectHandle;
 class PdmUiTableItemEditor : public PdmUiEditorHandle
 {
 public:
-    PdmUiTableItemEditor(PdmUiTableViewModel* model, caf::PdmObjectHandle* pdmObject, int row);
+    PdmUiTableItemEditor(PdmUiTableViewQModel* model, caf::PdmObjectHandle* pdmObject, int row);
    virtual ~PdmUiTableItemEditor();

 protected: // Interface to override:
    virtual void configureAndUpdateUi(const QString& uiConfigName);

 private:
-    PdmUiTableViewModel*    m_model;
+    PdmUiTableViewQModel*   m_model;
    int                     m_row;
 };

--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewDelegate.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewDelegate.cpp
@@ -37,7 +37,7 @@
 #include "cafPdmUiTableViewDelegate.h"

 #include "cafPdmUiFieldEditorHandle.h"
-#include "cafPdmUiTableViewModel.h"
+#include "cafPdmUiTableViewQModel.h"



@@ -47,7 +47,7 @@ namespace caf
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-PdmUiTableViewDelegate::PdmUiTableViewDelegate(QObject* parent, PdmUiTableViewModel* model)
+PdmUiTableViewDelegate::PdmUiTableViewDelegate(QObject* parent, PdmUiTableViewQModel* model)
    :   QStyledItemDelegate(parent),
        m_model(model)
 {
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewDelegate.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewDelegate.h
@@ -43,7 +43,7 @@
 namespace caf 
 {

-class PdmUiTableViewModel;
+class PdmUiTableViewQModel;


 //--------------------------------------------------------------------------------------------------
@@ -54,7 +54,7 @@ class PdmUiTableViewDelegate : public QStyledItemDelegate
    Q_OBJECT

 public:
-    PdmUiTableViewDelegate(QObject* parent, PdmUiTableViewModel* model);
+    PdmUiTableViewDelegate(QObject* parent, PdmUiTableViewQModel* model);
    ~PdmUiTableViewDelegate();

    QWidget*    createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const;
@@ -67,7 +67,7 @@ protected slots:
    void        slotEditorDestroyed(QObject* obj);

 private:
-    PdmUiTableViewModel* m_model;
+    PdmUiTableViewQModel* m_model;

    // Counter for active table cell editors 
    mutable int          m_activeEditorCount;
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp
@@ -44,7 +44,7 @@
 #include "cafPdmUiCommandSystemProxy.h"
 #include "cafPdmUiEditorHandle.h"
 #include "cafPdmUiTableViewDelegate.h"
-#include "cafPdmUiTableViewModel.h"
+#include "cafPdmUiTableViewQModel.h"

 #include <QApplication>
 #include <QEvent>
@@ -125,7 +125,7 @@ QWidget* PdmUiTableViewEditor::createWidget(QWidget* parent)
    m_layout->setContentsMargins(0, 0, 0, 0);
    m_mainWidget->setLayout(m_layout);

-    m_tableModelPdm = new PdmUiTableViewModel(m_mainWidget);
+    m_tableModelPdm = new PdmUiTableViewQModel(m_mainWidget);

    m_delegate = new PdmUiTableViewDelegate(this, m_tableModelPdm);

--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.h
@@ -58,7 +58,7 @@ class PdmUiCheckBoxDelegate;
 class PdmUiFieldEditorHandle;
 class PdmUiItem;
 class PdmUiTableViewDelegate;
-class PdmUiTableViewModel;
+class PdmUiTableViewQModel;


 //--------------------------------------------------------------------------------------------------
@@ -110,7 +110,7 @@ private:
    QLabel*                 m_tableHeadingIcon;

    QTableView*             m_tableView;
-    PdmUiTableViewModel*    m_tableModelPdm;
+    PdmUiTableViewQModel*   m_tableModelPdm;

    PdmChildArrayFieldHandle* m_pdmListField;
    PdmUiTableViewDelegate* m_delegate;
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.cpp
@@ -35,7 +35,7 @@
 //##################################################################################################


-#include "cafPdmUiTableViewModel.h"
+#include "cafPdmUiTableViewQModel.h"

 #include "cafPdmChildArrayField.h"
 #include "cafPdmField.h"
@@ -59,7 +59,7 @@ namespace caf
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-PdmUiTableViewModel::PdmUiTableViewModel(QWidget* parent)
+PdmUiTableViewQModel::PdmUiTableViewQModel(QWidget* parent)
    : QAbstractTableModel(parent)
 {
    m_pdmList = nullptr;
@@ -68,7 +68,7 @@ PdmUiTableViewModel::PdmUiTableViewModel(QWidget* parent)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-int PdmUiTableViewModel::rowCount(const QModelIndex &parent /*= QModelIndex( ) */) const
+int PdmUiTableViewQModel::rowCount(const QModelIndex &parent /*= QModelIndex( ) */) const
 {
    if (!m_pdmList) return 0;

@@ -79,7 +79,7 @@ int PdmUiTableViewModel::rowCount(const QModelIndex &parent /*= QModelIndex( ) *
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-int PdmUiTableViewModel::columnCount(const QModelIndex &parent /*= QModelIndex( ) */) const
+int PdmUiTableViewQModel::columnCount(const QModelIndex &parent /*= QModelIndex( ) */) const
 {
    return static_cast<int>(m_modelColumnIndexToFieldIndex.size());

@@ -112,7 +112,7 @@ int PdmUiTableViewModel::columnCount(const QModelIndex &parent /*= QModelIndex(
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QVariant PdmUiTableViewModel::headerData(int section, Qt::Orientation orientation, int role /*= Qt::DisplayRole */) const
+QVariant PdmUiTableViewQModel::headerData(int section, Qt::Orientation orientation, int role /*= Qt::DisplayRole */) const
 {
    if (role == Qt::DisplayRole)
    {
@@ -136,7 +136,7 @@ QVariant PdmUiTableViewModel::headerData(int section, Qt::Orientation orientatio
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-Qt::ItemFlags PdmUiTableViewModel::flags(const QModelIndex &index) const
+Qt::ItemFlags PdmUiTableViewQModel::flags(const QModelIndex &index) const
 {
    if (!index.isValid())
        return Qt::ItemIsEnabled;
@@ -166,7 +166,7 @@ Qt::ItemFlags PdmUiTableViewModel::flags(const QModelIndex &index) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool PdmUiTableViewModel::setData(const QModelIndex &index, const QVariant &value, int role /*= Qt::EditRole*/)
+bool PdmUiTableViewQModel::setData(const QModelIndex &index, const QVariant &value, int role /*= Qt::EditRole*/)
 {
    if (role == Qt::CheckStateRole)
    {
@@ -193,7 +193,7 @@ bool PdmUiTableViewModel::setData(const QModelIndex &index, const QVariant &valu
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QVariant PdmUiTableViewModel::data(const QModelIndex &index, int role /*= Qt::DisplayRole */) const
+QVariant PdmUiTableViewQModel::data(const QModelIndex &index, int role /*= Qt::DisplayRole */) const
 {
    if (role == Qt::TextColorRole)
    {
@@ -327,7 +327,7 @@ QVariant PdmUiTableViewModel::data(const QModelIndex &index, int role /*= Qt::Di
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void PdmUiTableViewModel::setPdmData(PdmChildArrayFieldHandle* listField, const QString& configName)
+void PdmUiTableViewQModel::setPdmData(PdmChildArrayFieldHandle* listField, const QString& configName)
 {
    beginResetModel();

@@ -429,7 +429,7 @@ void PdmUiTableViewModel::setPdmData(PdmChildArrayFieldHandle* listField, const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-PdmFieldHandle* PdmUiTableViewModel::getField(const QModelIndex &index) const
+PdmFieldHandle* PdmUiTableViewQModel::getField(const QModelIndex &index) const
 {
    if (m_pdmList && index.row() < static_cast<int>(m_pdmList->size()))
    {
@@ -457,7 +457,7 @@ PdmFieldHandle* PdmUiTableViewModel::getField(const QModelIndex &index) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-PdmUiFieldEditorHandle* PdmUiTableViewModel::getEditor(const QModelIndex &index)
+PdmUiFieldEditorHandle* PdmUiTableViewQModel::getEditor(const QModelIndex &index)
 {
    PdmFieldHandle* field = getField(index);
    if (!field)
@@ -488,7 +488,7 @@ PdmUiFieldEditorHandle* PdmUiTableViewModel::getEditor(const QModelIndex &index)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QWidget* PdmUiTableViewModel::getEditorWidgetAndTransferOwnership(QWidget* parent, const QModelIndex &index)
+QWidget* PdmUiTableViewQModel::getEditorWidgetAndTransferOwnership(QWidget* parent, const QModelIndex &index)
 {
    PdmUiFieldEditorHandle* editor = getEditor(index);
    if (editor)
@@ -509,7 +509,7 @@ QWidget* PdmUiTableViewModel::getEditorWidgetAndTransferOwnership(QWidget* paren
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void PdmUiTableViewModel::notifyDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
+void PdmUiTableViewQModel::notifyDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
    emit dataChanged(topLeft, bottomRight);
 }
@@ -517,7 +517,7 @@ void PdmUiTableViewModel::notifyDataChanged(const QModelIndex& topLeft, const QM
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void PdmUiTableViewModel::recreateTableItemEditors()
+void PdmUiTableViewQModel::recreateTableItemEditors()
 {
    for (auto tableItemEditor : m_tableItemEditors)
    {
@@ -538,7 +538,7 @@ void PdmUiTableViewModel::recreateTableItemEditors()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmUiFieldHandle* PdmUiTableViewModel::getUiFieldHandle(const QModelIndex& index) const
+caf::PdmUiFieldHandle* PdmUiTableViewQModel::getUiFieldHandle(const QModelIndex& index) const
 {
    auto fieldHandle = getField(index);
    if (fieldHandle)
@@ -552,7 +552,7 @@ caf::PdmUiFieldHandle* PdmUiTableViewModel::getUiFieldHandle(const QModelIndex&
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-PdmObjectHandle* PdmUiTableViewModel::pdmObjectForRow(int row) const
+PdmObjectHandle* PdmUiTableViewQModel::pdmObjectForRow(int row) const
 {
    if (m_pdmList && row < static_cast<int>(m_pdmList->size()))
    {
@@ -565,7 +565,7 @@ PdmObjectHandle* PdmUiTableViewModel::pdmObjectForRow(int row) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool PdmUiTableViewModel::isRepresentingBoolean(const QModelIndex &index) const
+bool PdmUiTableViewQModel::isRepresentingBoolean(const QModelIndex &index) const
 {
    PdmFieldHandle* fieldHandle = getField(index);
    if (fieldHandle)
@@ -588,7 +588,7 @@ bool PdmUiTableViewModel::isRepresentingBoolean(const QModelIndex &index) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void PdmUiTableViewModel::createPersistentPushButtonWidgets(QTableView* tableView)
+void PdmUiTableViewQModel::createPersistentPushButtonWidgets(QTableView* tableView)
 {
    if (rowCount() > 0)
    {
@@ -612,7 +612,7 @@ void PdmUiTableViewModel::createPersistentPushButtonWidgets(QTableView* tableVie
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QItemSelection PdmUiTableViewModel::modelIndexFromPdmObject(PdmObjectHandle* pdmObject)
+QItemSelection PdmUiTableViewQModel::modelIndexFromPdmObject(PdmObjectHandle* pdmObject)
 {
    QItemSelection itemSelection;

@@ -632,7 +632,7 @@ QItemSelection PdmUiTableViewModel::modelIndexFromPdmObject(PdmObjectHandle* pdm
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-int PdmUiTableViewModel::getFieldIndex(PdmFieldHandle* field) const
+int PdmUiTableViewQModel::getFieldIndex(PdmFieldHandle* field) const
 {
    if (m_pdmList && !m_pdmList->empty())
    {
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.h
@@ -77,12 +77,12 @@ private:
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-class PdmUiTableViewModel : public QAbstractTableModel
+class PdmUiTableViewQModel : public QAbstractTableModel
 {
    Q_OBJECT

 public:
-    explicit PdmUiTableViewModel(QWidget* parent);
+    explicit PdmUiTableViewQModel(QWidget* parent);

    QItemSelection          modelIndexFromPdmObject(PdmObjectHandle* pdmObject);
    PdmFieldHandle*         getField(const QModelIndex &index) const;
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp
@@ -38,7 +38,7 @@

 #include "cafPdmObject.h"
 #include "cafPdmUiCommandSystemProxy.h"
-#include "cafPdmUiTreeViewModel.h"
+#include "cafPdmUiTreeViewQModel.h"

 #include <QAbstractItemModel>
 #include <QLabel>
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp
@@ -43,7 +43,7 @@
 #include "cafPdmUiDragDropInterface.h"
 #include "cafPdmUiEditorHandle.h"
 #include "cafPdmUiTreeOrdering.h"
-#include "cafPdmUiTreeViewModel.h"
+#include "cafPdmUiTreeViewQModel.h"
 #include "cafSelectionManager.h"

 #include <QDragMoveEvent>
@@ -75,7 +75,7 @@ public:
 protected:
    virtual void dragMoveEvent(QDragMoveEvent* event)
    {
-        caf::PdmUiTreeViewModel* treeViewModel = dynamic_cast<caf::PdmUiTreeViewModel*>(model());
+        caf::PdmUiTreeViewQModel* treeViewModel = dynamic_cast<caf::PdmUiTreeViewQModel*>(model());
        if (treeViewModel && treeViewModel->dragDropInterface())
        {
            treeViewModel->dragDropInterface()->onProposedDropActionUpdated(event->proposedAction());
@@ -86,7 +86,7 @@ protected:

    virtual void dragLeaveEvent(QDragLeaveEvent* event)
    {
-        caf::PdmUiTreeViewModel* treeViewModel = dynamic_cast<caf::PdmUiTreeViewModel*>(model());
+        caf::PdmUiTreeViewQModel* treeViewModel = dynamic_cast<caf::PdmUiTreeViewQModel*>(model());
        if (treeViewModel && treeViewModel->dragDropInterface())
        {
            treeViewModel->dragDropInterface()->onDragCanceled();
@@ -128,7 +128,7 @@ QWidget* PdmUiTreeViewEditor::createWidget(QWidget* parent)
    m_layout->setContentsMargins(0, 0, 0, 0);
    m_mainWidget->setLayout(m_layout);

-    m_treeViewModel = new caf::PdmUiTreeViewModel(this);
+    m_treeViewModel = new caf::PdmUiTreeViewQModel(this);
    m_treeView = new PdmUiTreeViewWidget(m_mainWidget);
    m_treeView->setModel(m_treeViewModel);
    m_treeView->installEventFilter(this);
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.h
@@ -39,7 +39,7 @@

 #include "cafPdmUiTreeEditorHandle.h"
 #include "cafPdmUiFieldEditorHandle.h"
-#include "cafPdmUiTreeViewModel.h"
+#include "cafPdmUiTreeViewQModel.h"

 #include <QAbstractItemModel>
 #include <QPointer>
@@ -61,7 +61,7 @@ namespace caf
 class PdmChildArrayFieldHandle;
 class PdmUiDragDropInterface;
 class PdmUiItem;
-class PdmUiTreeViewModel;
+class PdmUiTreeViewQModel;
 class PdmUiTreeViewWidget;

 //--------------------------------------------------------------------------------------------------
@@ -138,7 +138,7 @@ private:
    QVBoxLayout*                    m_layout;

    PdmUiTreeViewWidget*            m_treeView;
-    PdmUiTreeViewModel*             m_treeViewModel;
+    PdmUiTreeViewQModel*             m_treeViewModel;

    bool                            m_useDefaultContextMenu;
    bool                            m_updateSelectionManager;
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewQModel.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewQModel.cpp
@@ -35,7 +35,7 @@
 //##################################################################################################


-#include "cafPdmUiTreeViewModel.h"
+#include "cafPdmUiTreeViewQModel.h"

 #include "cafPdmField.h"
 #include "cafPdmObject.h"
@@ -54,7 +54,7 @@ namespace caf
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-PdmUiTreeViewModel::PdmUiTreeViewModel(PdmUiTreeViewEditor* treeViewEditor)
+PdmUiTreeViewQModel::PdmUiTreeViewQModel(PdmUiTreeViewEditor* treeViewEditor)
 {
    m_treeOrderingRoot = nullptr;
    m_dragDropInterface = nullptr;
@@ -66,7 +66,7 @@ PdmUiTreeViewModel::PdmUiTreeViewModel(PdmUiTreeViewEditor* treeViewEditor)
 /// Will populate the tree with the contents of the Pdm data structure rooted at rootItem.
 /// Will not show the rootItem itself, only the children and downwards 
 //--------------------------------------------------------------------------------------------------
-void PdmUiTreeViewModel::setPdmItemRoot(PdmUiItem* rootItem)
+void PdmUiTreeViewQModel::setPdmItemRoot(PdmUiItem* rootItem)
 {
    // Check if we are already watching this root
    if (m_treeOrderingRoot && m_treeOrderingRoot->activeItem() == rootItem)
@@ -102,7 +102,7 @@ void PdmUiTreeViewModel::setPdmItemRoot(PdmUiItem* rootItem)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void PdmUiTreeViewModel::resetTree(PdmUiTreeOrdering* newRoot)
+void PdmUiTreeViewQModel::resetTree(PdmUiTreeOrdering* newRoot)
 {
    beginResetModel();
    
@@ -121,7 +121,7 @@ void PdmUiTreeViewModel::resetTree(PdmUiTreeOrdering* newRoot)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void PdmUiTreeViewModel::setColumnHeaders(const QStringList& columnHeaders)
+void PdmUiTreeViewQModel::setColumnHeaders(const QStringList& columnHeaders)
 {
    m_columnHeaders = columnHeaders;
 }
@@ -129,7 +129,7 @@ void PdmUiTreeViewModel::setColumnHeaders(const QStringList& columnHeaders)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void PdmUiTreeViewModel::emitDataChanged(const QModelIndex& index)
+void PdmUiTreeViewQModel::emitDataChanged(const QModelIndex& index)
 {
    emit dataChanged(index, index);
 }
@@ -137,7 +137,7 @@ void PdmUiTreeViewModel::emitDataChanged(const QModelIndex& index)
 //--------------------------------------------------------------------------------------------------
 /// Refreshes the UI-tree below the supplied root PdmUiItem
 //--------------------------------------------------------------------------------------------------
-void PdmUiTreeViewModel::updateSubTree(PdmUiItem* pdmRoot)
+void PdmUiTreeViewQModel::updateSubTree(PdmUiItem* pdmRoot)
 {
    // Build the new "Correct" Tree

@@ -214,7 +214,7 @@ public:
 /// calling begin..() end..() to make the UI update accordingly.
 /// This assumes that all the items have a pointer an unique PdmObject 
 //--------------------------------------------------------------------------------------------------
-void PdmUiTreeViewModel::updateSubTreeRecursive(const QModelIndex& existingSubTreeRootModIdx,
+void PdmUiTreeViewQModel::updateSubTreeRecursive(const QModelIndex& existingSubTreeRootModIdx,
                                                PdmUiTreeOrdering* existingSubTreeRoot, 
                                                PdmUiTreeOrdering* sourceSubTreeRoot)
 {
@@ -373,7 +373,7 @@ void PdmUiTreeViewModel::updateSubTreeRecursive(const QModelIndex& existingSubTr
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void PdmUiTreeViewModel::updateEditorsForSubTree(PdmUiTreeOrdering* root)
+void PdmUiTreeViewQModel::updateEditorsForSubTree(PdmUiTreeOrdering* root)
 {
    if (!root) return;

@@ -399,7 +399,7 @@ void PdmUiTreeViewModel::updateEditorsForSubTree(PdmUiTreeOrdering* root)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-PdmUiTreeOrdering* caf::PdmUiTreeViewModel::treeItemFromIndex(const QModelIndex& index) const 
+PdmUiTreeOrdering* caf::PdmUiTreeViewQModel::treeItemFromIndex(const QModelIndex& index) const 
 {
    if (!index.isValid())
    {
@@ -416,7 +416,7 @@ PdmUiTreeOrdering* caf::PdmUiTreeViewModel::treeItemFromIndex(const QModelIndex&
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QModelIndex caf::PdmUiTreeViewModel::findModelIndex( const PdmUiItem * object) const
+QModelIndex caf::PdmUiTreeViewQModel::findModelIndex( const PdmUiItem * object) const
 {
    QModelIndex foundIndex;
    int numRows = rowCount(QModelIndex());
@@ -432,7 +432,7 @@ QModelIndex caf::PdmUiTreeViewModel::findModelIndex( const PdmUiItem * object) c
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QModelIndex caf::PdmUiTreeViewModel::findModelIndexRecursive(const QModelIndex& currentIndex, const PdmUiItem * pdmItem) const
+QModelIndex caf::PdmUiTreeViewQModel::findModelIndexRecursive(const QModelIndex& currentIndex, const PdmUiItem * pdmItem) const
 {
    if (currentIndex.internalPointer())
    {
@@ -455,7 +455,7 @@ QModelIndex caf::PdmUiTreeViewModel::findModelIndexRecursive(const QModelIndex&
 /// An invalid parent index is implicitly meaning the root item, and not "above" root, since
 /// we are not showing the root item itself
 //--------------------------------------------------------------------------------------------------
-QModelIndex PdmUiTreeViewModel::index(int row, int column, const QModelIndex &parentIndex ) const
+QModelIndex PdmUiTreeViewQModel::index(int row, int column, const QModelIndex &parentIndex ) const
 {
    if (!m_treeOrderingRoot)
        return QModelIndex();
@@ -484,7 +484,7 @@ QModelIndex PdmUiTreeViewModel::index(int row, int column, const QModelIndex &pa
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QModelIndex PdmUiTreeViewModel::parent(const QModelIndex &childIndex) const
+QModelIndex PdmUiTreeViewQModel::parent(const QModelIndex &childIndex) const
 {
    if (!childIndex.isValid()) return QModelIndex();

@@ -502,7 +502,7 @@ QModelIndex PdmUiTreeViewModel::parent(const QModelIndex &childIndex) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-int PdmUiTreeViewModel::rowCount(const QModelIndex &parentIndex ) const
+int PdmUiTreeViewQModel::rowCount(const QModelIndex &parentIndex ) const
 {
    if (!m_treeOrderingRoot)
        return 0;
@@ -518,7 +518,7 @@ int PdmUiTreeViewModel::rowCount(const QModelIndex &parentIndex ) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-int PdmUiTreeViewModel::columnCount(const QModelIndex &parentIndex ) const
+int PdmUiTreeViewQModel::columnCount(const QModelIndex &parentIndex ) const
 {
    if (!m_treeOrderingRoot)
        return 0;
@@ -529,7 +529,7 @@ int PdmUiTreeViewModel::columnCount(const QModelIndex &parentIndex ) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QVariant PdmUiTreeViewModel::data(const QModelIndex &index, int role ) const
+QVariant PdmUiTreeViewQModel::data(const QModelIndex &index, int role ) const
 {
    if (!index.isValid())
    {
@@ -672,14 +672,14 @@ QVariant PdmUiTreeViewModel::data(const QModelIndex &index, int role ) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool PdmUiTreeViewModel::setData(const QModelIndex &index, const QVariant &value, int role /*= Qt::EditRole*/)
+bool PdmUiTreeViewQModel::setData(const QModelIndex &index, const QVariant &value, int role /*= Qt::EditRole*/)
 {
    if (!index.isValid())
    {
        return false;
    }

-    PdmUiTreeOrdering* treeItem = PdmUiTreeViewModel::treeItemFromIndex(index);
+    PdmUiTreeOrdering* treeItem = PdmUiTreeViewQModel::treeItemFromIndex(index);
    CAF_ASSERT(treeItem);

    if (!treeItem->isRepresentingObject()) return false;
@@ -720,7 +720,7 @@ bool PdmUiTreeViewModel::setData(const QModelIndex &index, const QVariant &value
 /// Enable edit of this item if we have a editable user description field for a pdmObject
 /// Disable edit for other items
 //--------------------------------------------------------------------------------------------------
-Qt::ItemFlags PdmUiTreeViewModel::flags(const QModelIndex &index) const
+Qt::ItemFlags PdmUiTreeViewQModel::flags(const QModelIndex &index) const
 {
    if (!index.isValid())
    {
@@ -770,7 +770,7 @@ Qt::ItemFlags PdmUiTreeViewModel::flags(const QModelIndex &index) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QVariant PdmUiTreeViewModel::headerData(int section, Qt::Orientation orientation, int role /*= Qt::DisplayRole */) const
+QVariant PdmUiTreeViewQModel::headerData(int section, Qt::Orientation orientation, int role /*= Qt::DisplayRole */) const
 {
    if (role != Qt::DisplayRole)
        return QVariant();
@@ -786,7 +786,7 @@ QVariant PdmUiTreeViewModel::headerData(int section, Qt::Orientation orientation
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-PdmUiItem* PdmUiTreeViewModel::uiItemFromModelIndex(const QModelIndex& index) const
+PdmUiItem* PdmUiTreeViewQModel::uiItemFromModelIndex(const QModelIndex& index) const
 {
    PdmUiTreeOrdering* treeItem = this->treeItemFromIndex(index);
    if (treeItem)
@@ -800,7 +800,7 @@ PdmUiItem* PdmUiTreeViewModel::uiItemFromModelIndex(const QModelIndex& index) co
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void PdmUiTreeViewModel::setDragDropInterface(PdmUiDragDropInterface* dragDropInterface)
+void PdmUiTreeViewQModel::setDragDropInterface(PdmUiDragDropInterface* dragDropInterface)
 {
    m_dragDropInterface = dragDropInterface;
 }
@@ -808,7 +808,7 @@ void PdmUiTreeViewModel::setDragDropInterface(PdmUiDragDropInterface* dragDropIn
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-PdmUiDragDropInterface* PdmUiTreeViewModel::dragDropInterface()
+PdmUiDragDropInterface* PdmUiTreeViewQModel::dragDropInterface()
 {
    return m_dragDropInterface;
 }
@@ -816,7 +816,7 @@ PdmUiDragDropInterface* PdmUiTreeViewModel::dragDropInterface()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QStringList PdmUiTreeViewModel::mimeTypes() const
+QStringList PdmUiTreeViewQModel::mimeTypes() const
 {
    if (m_dragDropInterface)
    {
@@ -831,7 +831,7 @@ QStringList PdmUiTreeViewModel::mimeTypes() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QMimeData * PdmUiTreeViewModel::mimeData(const QModelIndexList &indexes) const
+QMimeData * PdmUiTreeViewQModel::mimeData(const QModelIndexList &indexes) const
 {
    if (m_dragDropInterface)
    {
@@ -846,7 +846,7 @@ QMimeData * PdmUiTreeViewModel::mimeData(const QModelIndexList &indexes) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool PdmUiTreeViewModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
+bool PdmUiTreeViewQModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
 {
    if (m_dragDropInterface)
    {
@@ -861,7 +861,7 @@ bool PdmUiTreeViewModel::dropMimeData(const QMimeData *data, Qt::DropAction acti
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-Qt::DropActions PdmUiTreeViewModel::supportedDropActions() const
+Qt::DropActions PdmUiTreeViewQModel::supportedDropActions() const
 {
    if (m_dragDropInterface)
    {
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewQModel.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewQModel.h
@@ -55,12 +55,12 @@ class PdmUiDragDropInterface;
 // This class is intended to replace UiTreeModelPdm (cafUiTreeModelPdm)
 //
 //==================================================================================================
-class PdmUiTreeViewModel : public QAbstractItemModel
+class PdmUiTreeViewQModel : public QAbstractItemModel
 {
    Q_OBJECT

 public:
-    explicit PdmUiTreeViewModel(PdmUiTreeViewEditor* treeViewEditor);
+    explicit PdmUiTreeViewQModel(PdmUiTreeViewEditor* treeViewEditor);

    void                    setPdmItemRoot(PdmUiItem* rootItem);
    void                    updateSubTree(PdmUiItem* subTreeRoot);