From beea898dc6d46f6acedf6ccfd4fb2290e20778bf Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 6 Sep 2017 14:45:36 +0200 Subject: [PATCH] #1866 AppFwk : Move QTreeView state serializer to cafUserInterface --- ApplicationCode/ProjectDataModel/CMakeLists_files.cmake | 2 -- Fwk/AppFwk/cafUserInterface/CMakeLists.txt | 3 +++ .../AppFwk/cafUserInterface}/cafQTreeViewStateSerializer.cpp | 0 .../AppFwk/cafUserInterface}/cafQTreeViewStateSerializer.h | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename {ApplicationCode/ProjectDataModel => Fwk/AppFwk/cafUserInterface}/cafQTreeViewStateSerializer.cpp (100%) rename {ApplicationCode/ProjectDataModel => Fwk/AppFwk/cafUserInterface}/cafQTreeViewStateSerializer.h (100%) diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake index 6a62bc3d62..503483a496 100644 --- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake @@ -62,7 +62,6 @@ ${CEE_CURRENT_LIST_DIR}RimViewWindow.h ${CEE_CURRENT_LIST_DIR}RimView.h ${CEE_CURRENT_LIST_DIR}RimViewManipulator.h ${CEE_CURRENT_LIST_DIR}RimCase.h -${CEE_CURRENT_LIST_DIR}cafQTreeViewStateSerializer.h ${CEE_CURRENT_LIST_DIR}RimViewController.h ${CEE_CURRENT_LIST_DIR}RimMainPlotCollection.h ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCollection.h @@ -158,7 +157,6 @@ ${CEE_CURRENT_LIST_DIR}RimViewWindow.cpp ${CEE_CURRENT_LIST_DIR}RimView.cpp ${CEE_CURRENT_LIST_DIR}RimViewManipulator.cpp ${CEE_CURRENT_LIST_DIR}RimCase.cpp -${CEE_CURRENT_LIST_DIR}cafQTreeViewStateSerializer.cpp ${CEE_CURRENT_LIST_DIR}RimViewController.cpp ${CEE_CURRENT_LIST_DIR}RimMainPlotCollection.cpp ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCollection.cpp diff --git a/Fwk/AppFwk/cafUserInterface/CMakeLists.txt b/Fwk/AppFwk/cafUserInterface/CMakeLists.txt index 743ca54d6e..5c4456252f 100644 --- a/Fwk/AppFwk/cafUserInterface/CMakeLists.txt +++ b/Fwk/AppFwk/cafUserInterface/CMakeLists.txt @@ -87,6 +87,7 @@ set( PROJECT_FILES cafPdmUiToolButtonEditor.cpp cafPdmUiToolButtonEditor.h + # object editors cafPdmUiDefaultObjectEditor.cpp cafPdmUiDefaultObjectEditor.h @@ -128,6 +129,8 @@ set( PROJECT_FILES cafUiProcess.h QMinimizePanel.cpp QMinimizePanel.h + cafQTreeViewStateSerializer.h + cafQTreeViewStateSerializer.cpp ) add_library( ${PROJECT_NAME} diff --git a/ApplicationCode/ProjectDataModel/cafQTreeViewStateSerializer.cpp b/Fwk/AppFwk/cafUserInterface/cafQTreeViewStateSerializer.cpp similarity index 100% rename from ApplicationCode/ProjectDataModel/cafQTreeViewStateSerializer.cpp rename to Fwk/AppFwk/cafUserInterface/cafQTreeViewStateSerializer.cpp diff --git a/ApplicationCode/ProjectDataModel/cafQTreeViewStateSerializer.h b/Fwk/AppFwk/cafUserInterface/cafQTreeViewStateSerializer.h similarity index 100% rename from ApplicationCode/ProjectDataModel/cafQTreeViewStateSerializer.h rename to Fwk/AppFwk/cafUserInterface/cafQTreeViewStateSerializer.h