Major cleanup/change in the way things are included.

Needs a Linux compile check.
p4#: 21545

ApplicationCode/Application/RiaApplication.cpp

@@ -17,47 +17,57 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RiaStdInclude.h"
+#include "RiaApplication.h"
 
-#include "cafLog.h"
 #include "cafEffectCache.h"
 #include "cafUtils.h"
-
-#include "cvfPart.h"
-
-#include "cvfStructGridGeometryGenerator.h"
+#include "cafAppEnum.h"
 
 #include "RiaVersionInfo.h"
 #include "RiaBaseDefs.h"
-
-#include "RiaApplication.h"
+//
 #include "RiuMainWindow.h"
 #include "RiuViewer.h"
 #include "RiuProcessMonitor.h"
 #include "RiaPreferences.h"
-
+//
 #include "RimResultCase.h"
 #include "RimInputCase.h"
 #include "RimReservoirView.h"
 
-#include "RigCaseData.h"
-#include "RigCell.h"
-#include "RigReservoirBuilderMock.h"
-
-#include <QSettings>
-#include "cafPdmDocument.h"
-#include "RifReaderMockModel.h"
-
 #include "cafCeetronNavigation.h"
 #include "cafCadNavigation.h"
 #include "RiaSocketServer.h"
 #include "cafUiProcess.h"
-
+//
 #include "RimUiTreeModelPdm.h"
 #include "RiaImageCompareReporter.h"
 #include "RiaImageFileCompare.h"
 #include "cafProgressInfo.h"
 #include "RigGridManager.h"
 
+#include "RimProject.h"
+
+#include "RimResultSlot.h"
+
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimInputPropertyCollection.h"
+
+#include "RimDefines.h"
+#include "RimScriptCollection.h"
+#include "RimCaseCollection.h"
+
+////////////
+
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "RimCellEdgeResultSlot.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimWellCollection.h"
+
 namespace caf
 {
 template<>
@@ -1183,9 +1193,9 @@ void RiaApplication::saveSnapshotAs(const QString& fileName)
 //--------------------------------------------------------------------------------------------------
 void RiaApplication::copySnapshotToClipboard()
 {
-    QClipboard* clipboard = QApplication::clipboard();
-    if (clipboard)
-    {
+        QClipboard* clipboard = QApplication::clipboard();
+        if (clipboard)
+        {
         QImage image = grabFrameBufferImage();
         if (!image.isNull())
         {
@@ -1500,3 +1510,11 @@ QImage RiaApplication::grabFrameBufferImage()
 
     return image;
 }
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimProject* RiaApplication::project()
+{
+    return m_project;
+}

ApplicationCode/Application/RiaApplication.h

@@ -17,17 +17,15 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QProcess>
+#include "cafPdmObject.h"
+#include "cafPdmField.h"
 #include "cvfBase.h"
 #include "cvfObject.h"
-
-#include "cvfScalarMapperUniformLevels.h"
-#include "cvfOverlayScalarMapperLegend.h"
-#include "RimReservoirView.h"
+#include "cvfFont.h"
 
 #include <iostream>
-#include "RimProject.h"
 
 class RIProcess;
 class RigCaseData;
@@ -35,6 +33,8 @@ class RimCase;
 class Drawable;
 class RiaSocketServer;
 class RiaPreferences;
+class RimReservoirView;
+class RimProject;
 
 namespace caf
 {
@@ -68,7 +68,7 @@ public:
     RimReservoirView*       activeReservoirView();
     const RimReservoirView* activeReservoirView() const;
 
-    RimProject*         project() {return m_project;} 
+    RimProject*         project(); 
 
     void                createMockModel();
     void                createResultsMockModel();

ApplicationCode/Application/RiaPreferences.cpp

@@ -18,7 +18,9 @@
 
 #include "RiaStdInclude.h"
 #include "RiaPreferences.h"
+
 #include "cafPdmUiFilePathEditor.h"
+#include "cafPdmFieldCvfColor.h"
 
 CAF_PDM_SOURCE_INIT(RiaPreferences, "RiaPreferences");
 //--------------------------------------------------------------------------------------------------

ApplicationCode/Application/RiaPreferences.h

@@ -18,9 +18,13 @@
 
 #pragma once
 
-#include "cafPdmObject.h"
 #include "RiaApplication.h"
 
+#include "cafPdmObject.h"
+#include "cafPdmField.h"
+#include "cafAppEnum.h"
+
+
 class RiaPreferences : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;