Removed obsolete includes to cafPdmUiTreeView

ApplicationCode/Commands/RicNewViewFeature.cpp

@@ -27,7 +27,6 @@
 
 #include "RiuMainWindow.h"
 
-#include "cafPdmUiTreeView.h"
 #include "cafSelectionManager.h"
 
 #include <QAction>
@@ -43,7 +42,7 @@ void RicNewViewFeature::addReservoirView()
 
     if (newView)
     {
-        RiuMainWindow::instance()->projectTreeView()->setExpanded(newView, true);
+        RiuMainWindow::instance()->setExpanded(newView, true);
     }
 }
 

ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.cpp

@@ -32,7 +32,6 @@
 #include "RiuMainWindow.h"
 
 #include "cafPdmUiPropertyViewDialog.h"
-#include "cafPdmUiTreeView.h"
 
 #include <QAction>
 #include <QTreeView>
@@ -171,7 +170,7 @@ void RicLinkVisibleViewsFeature::linkViews(std::vector<RimView*>& views)
     proj->viewLinkerCollection.uiCapability()->updateConnectedEditors();
     proj->updateConnectedEditors();
 
-    RiuMainWindow::instance()->projectTreeView()->setExpanded(proj->viewLinkerCollection(), true);
+    RiuMainWindow::instance()->setExpanded(proj->viewLinkerCollection(), true);
 
 }
 

ApplicationCode/Commands/ViewLink/RicSetMasterViewFeature.cpp

@@ -20,14 +20,14 @@
 #include "RicSetMasterViewFeature.h"
 
 #include "RiaApplication.h"
+
 #include "RimProject.h"
 #include "RimView.h"
 #include "RimViewController.h"
 #include "RimViewLinker.h"
 #include "RimViewLinkerCollection.h"
-#include "RiuMainWindow.h"
 
-#include "cafPdmUiTreeView.h"
+#include "RiuMainWindow.h"
 
 #include <QAction>
 #include <QTreeView>
@@ -81,9 +81,8 @@ void RicSetMasterViewFeature::onActionTriggered(bool isChecked)
     proj->updateConnectedEditors();
 
     // Set managed view collection to selected and expanded in project tree
-    caf::PdmUiTreeView* projTreeView = RiuMainWindow::instance()->projectTreeView();
-    projTreeView->selectAsCurrentItem(viewLinker);
-    projTreeView->setExpanded(viewLinker, true);
+    RiuMainWindow::instance()->selectAsCurrentItem(viewLinker);
+    RiuMainWindow::instance()->setExpanded(viewLinker, true);
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp

@@ -18,14 +18,13 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RimMainPlotCollection.h"
-#include "RimWellLogPlotCollection.h"
+
+#include "RimProject.h"
 #include "RimSummaryPlotCollection.h"
+#include "RimWellLogPlotCollection.h"
 
 #include "RiuMainWindow.h"
-
-#include "cafPdmUiTreeView.h"
 #include "RiuProjectPropertyView.h"
-#include "RimProject.h"
 
 CAF_PDM_SOURCE_INIT(RimMainPlotCollection, "MainPlotCollection");
 

ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp

@@ -23,11 +23,9 @@
 
 #include "RimWellLogTrack.h"
 
+#include "RiuMainPlotWindow.h"
 #include "RiuWellLogPlot.h"
 #include "RiuWellLogTrack.h"
-#include "RiuMainPlotWindow.h"
-
-#include "cafPdmUiTreeView.h"
 
 #include "cvfAssert.h"
 

ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp

@@ -19,18 +19,17 @@
 
 #include "RimWellLogPlotCollection.h"
 
-#include "RimWellLogPlot.h"
-
-#include "cafPdmUiTreeView.h"
 #include "RigCaseData.h"
-#include "RigGeoMechCaseData.h"
-#include "RimWellPath.h"
-#include "RimEclipseCase.h"
 #include "RigEclipseWellLogExtractor.h"
-#include "RimWellPathCollection.h"
-#include "RimGeoMechCase.h"
+#include "RigGeoMechCaseData.h"
 #include "RigGeoMechWellLogExtractor.h"
 
+#include "RimEclipseCase.h"
+#include "RimGeoMechCase.h"
+#include "RimWellLogPlot.h"
+#include "RimWellPath.h"
+#include "RimWellPathCollection.h"
+
 #include "cvfAssert.h"
 
 CAF_PDM_SOURCE_INIT(RimWellLogPlotCollection, "WellLogPlotCollection");

ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp

@@ -28,8 +28,6 @@
 #include "RiuWellLogPlot.h"
 #include "RiuMainWindow.h"
 
-#include "cafPdmUiTreeView.h"
-
 #include "cvfAssert.h"
 #include "cvfMath.h"
 

ApplicationCode/UserInterface/RiuMainPlotWindow.cpp

@@ -652,7 +652,6 @@ void RiuMainPlotWindow::setDefaultWindowSize()
 //--------------------------------------------------------------------------------------------------
 void RiuMainPlotWindow::setExpanded(const caf::PdmUiItem* uiItem, bool expanded)
 {
-   
     m_projectTreeView->setExpanded(uiItem, expanded);
 }
 

ApplicationCode/UserInterface/RiuMainWindow.cpp

@@ -2024,7 +2024,6 @@ void RiuMainWindow::slotOpenUsersGuideInBrowserAction()
 //--------------------------------------------------------------------------------------------------
 void RiuMainWindow::setExpanded(const caf::PdmUiItem* uiItem, bool expanded)
 {
-   
     m_projectTreeView->setExpanded(uiItem, expanded);
 }
 

ApplicationCode/UserInterface/RiuWellLogPlot.cpp

@@ -19,23 +19,22 @@
 
 #include "RiuWellLogPlot.h"
 
-#include "RiuWellLogTrack.h"
-#include "RiuMainWindow.h"
-
 #include "RimWellLogPlot.h"
 #include "RimWellLogTrack.h"
+#include "RiuMainWindow.h"
+#include "RiuWellLogTrack.h"
+
+#include "qwt_legend.h"
 
-#include "cafPdmUiTreeView.h"
 #include "cvfAssert.h"
 
-#include <QHBoxLayout>
-#include <QScrollBar>
 #include <QFocusEvent>
+#include <QHBoxLayout>
 #include <QMdiSubWindow>
+#include <QScrollBar>
 #include <QTimer>
 
 #include <math.h>
-#include "qwt_legend.h"
 
 //--------------------------------------------------------------------------------------------------
 ///