(#495) Removed use of StdInclude

ApplicationCode/Application/RiaApplication.cpp

@@ -18,77 +18,77 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RiaApplication.h"
 
-#include "cafEffectCache.h"
-#include "cafUtils.h"
-#include "cafAppEnum.h"
-#include "cafPdmSettings.h"
-
-#include "RiaVersionInfo.h"
 #include "RiaBaseDefs.h"
-//
-#include "RiuMainWindow.h"
-#include "RiuViewer.h"
-#include "RiuProcessMonitor.h"
-#include "RiaPreferences.h"
-//
-#include "RimEclipseResultCase.h"
-#include "RimEclipseInputCase.h"
-#include "RimEclipseView.h"
-#include "RimWellPath.h"
-#include "RimWellPathCollection.h"
-#include "RimOilField.h"
-#include "RimEclipseCaseCollection.h"
-#include "RimFaultCollection.h"
-#include "RimEclipseFaultColors.h"
-
-#include "RiaSocketServer.h"
-#include "cafUiProcess.h"
-//
 #include "RiaImageCompareReporter.h"
 #include "RiaImageFileCompare.h"
+#include "RiaPreferences.h"
 #include "RiaProjectModifier.h"
-#include "cafProgressInfo.h"
+#include "RiaSocketServer.h"
+#include "RiaVersionInfo.h"
+
 #include "RigGridManager.h"
 
-#include "RimProject.h"
+#include "Rim3dOverlayInfoConfig.h"
-
-#include "RimEclipseCellColors.h"
-
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimEclipseInputPropertyCollection.h"
-
-#include "RimDefines.h"
-#include "RimScriptCollection.h"
 #include "RimCaseCollection.h"
-
-////////////
-
-#include "cafPdmFieldCvfColor.h"
-#include "cafPdmFieldCvfMat4d.h"
-#include "RimReservoirCellResultsStorage.h"
 #include "RimCellEdgeColors.h"
 #include "RimCellRangeFilterCollection.h"
-#include "RimEclipsePropertyFilterCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimEclipseWellCollection.h"
-#include "RimEclipseStatisticsCase.h"
-#include "cafCeetronPlusNavigation.h"
-
-#include "cvfProgramOptions.h"
-#include "cvfqtUtils.h"
 #include "RimCommandObject.h"
+#include "RimDefines.h"
+#include "RimEclipseCaseCollection.h"
+#include "RimEclipseCellColors.h"
+#include "RimEclipseFaultColors.h"
+#include "RimEclipseInputCase.h"
+#include "RimEclipseInputPropertyCollection.h"
+#include "RimEclipsePropertyFilterCollection.h"
+#include "RimEclipseResultCase.h"
+#include "RimEclipseStatisticsCase.h"
+#include "RimEclipseView.h"
+#include "RimEclipseWellCollection.h"
+#include "RimFaultCollection.h"
 #include "RimGeoMechCase.h"
+#include "RimGeoMechCellColors.h"
 #include "RimGeoMechModels.h"
 #include "RimGeoMechView.h"
-#include "RimGeoMechCellColors.h"
+#include "RimIdenticalGridCaseGroup.h"
 #include "RimMainPlotCollection.h"
-#include "RimWellLogPlotCollection.h"
+#include "RimOilField.h"
+#include "RimProject.h"
+#include "RimReservoirCellResultsStorage.h"
+#include "RimScriptCollection.h"
 #include "RimWellLogPlot.h"
+#include "RimWellLogPlotCollection.h"
+#include "RimWellPath.h"
+#include "RimWellPathCollection.h"
+
+#include "RiuMainWindow.h"
+#include "RiuProcessMonitor.h"
+#include "RiuViewer.h"
+
+#include "cafAppEnum.h"
+#include "cafCeetronPlusNavigation.h"
+#include "cafEffectCache.h"
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
+#include "cafPdmSettings.h"
 #include "cafPdmUiTreeView.h"
+#include "cafProgressInfo.h"
+#include "cafUiProcess.h"
+#include "cafUtils.h"
+#include "cvfFixedAtlasFont.h"
+#include "cvfProgramOptions.h"
+#include "cvfqtUtils.h"
+
+#include <QClipboard>
+#include <QDebug>
+#include <QDesktopServices>
+#include <QDir>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QTimer>
+#include <QUrl>
+
 
 namespace caf
 {

ApplicationCode/Application/RiaPreferences.cpp

@@ -18,7 +18,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
 #include "RiaPreferences.h"
 
 #include "RifReaderSettings.h"

ApplicationCode/Application/RiaProjectModifier.cpp

@@ -17,8 +17,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RiaProjectModifier.h"
 
 #include "RimProject.h"
@@ -40,6 +38,9 @@
 #include "RimEclipseWellCollection.h"
 #include "Rim3dOverlayInfoConfig.h"
 
+#include <QFileInfo>
+#include <QDir>
+
 
 
 

ApplicationCode/Application/RiaProjectModifier.h

@@ -18,6 +18,13 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+
+#include "cvfObject.h"
+
+#include <QString>
+
+#include <vector>
+
 class RimProject;
 
 

ApplicationCode/CMakeLists.txt

@@ -51,7 +51,6 @@ file( GLOB_RECURSE HEADER_FILES *.h )
 
 set( APPLICATION_FILES 
     RiaMain.cpp
-    RiaStdInclude.cpp
         
     Application/RiaApplication.cpp
     Application/RiaPreferences.cpp

ApplicationCode/FileInterface/RifReaderMockModel.cpp

@@ -18,8 +18,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RifReaderMockModel.h"
 #include "RigCaseCellResultsData.h"
 #include "RifReaderInterface.h"

ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp

@@ -18,7 +18,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
 #include "RivReservoirPartMgr.h"
 
 #include "cvfStructGrid.h"

ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.cpp

@@ -18,22 +18,22 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RivReservoirPipesPartMgr.h"
+
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimCellEdgeColors.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimEclipseCellColors.h"
+#include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseView.h"
 #include "RimEclipseWell.h"
 #include "RimEclipseWellCollection.h"
-#include "RivWellPipesPartMgr.h"
-#include "RivWellHeadPartMgr.h"
-#include "RimCellEdgeColors.h"
 
-#include "cafPdmFieldCvfMat4d.h"
+#include "RivWellHeadPartMgr.h"
+#include "RivWellPipesPartMgr.h"
+
 #include "cafPdmFieldCvfColor.h"
-#include "RimEclipseCellColors.h"
+#include "cafPdmFieldCvfMat4d.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimEclipsePropertyFilterCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 

ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.h

@@ -20,9 +20,14 @@
 
 #include "RimEclipseWellCollection.h"
 
-
 #include "cvfCollection.h"
 
+namespace cvf
+{
+    class Transform;
+    class ModelBasicList;
+}
+
 class RimEclipseView;
 class RivWellPipesPartMgr;
 class RivWellHeadPartMgr;

ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp

@@ -18,8 +18,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RivReservoirViewPartMgr.h"
 
 #include "RigCaseCellResultsData.h"

ApplicationCode/ProjectDataModel/RimBinaryExportSettings.cpp

@@ -16,8 +16,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimBinaryExportSettings.h"
 #include "cafPdmUiFilePathEditor.h"
 

ApplicationCode/ProjectDataModel/RimCalcScript.cpp

@@ -16,9 +16,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
-
 #include "cafPdmField.h"
 #include "RimCalcScript.h"
 #include "cafPdmUiFilePathEditor.h"

ApplicationCode/ProjectDataModel/RimCellFilter.cpp

@@ -16,12 +16,11 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
-
-#include "cafAppEnum.h"
 #include "RimCellFilter.h"
 
+#include "cafAppEnum.h"
+
+#include <QPainter>
 
 namespace caf
 {

ApplicationCode/ProjectDataModel/RimDefines.cpp

@@ -18,8 +18,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimDefines.h"
 #include "cafAppEnum.h"
 

ApplicationCode/ProjectDataModel/RimExportInputPropertySettings.cpp

@@ -16,8 +16,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimExportInputPropertySettings.h"
 #include "cafPdmUiFilePathEditor.h"
 

ApplicationCode/ProjectDataModel/RimMimeData.cpp

@@ -16,8 +16,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimMimeData.h"
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimMockModelSettings.cpp

@@ -17,8 +17,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 
 #include "RimMockModelSettings.h"
 

ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/RigReservoir-Test.cpp

@@ -18,7 +18,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
 #include "gtest/gtest.h"
 
 #include "RigCaseData.h"

ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/RigStatisticsMath-Test.cpp

@@ -18,7 +18,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
 #include "gtest/gtest.h"
 
 #include "RigStatisticsMath.h"

ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/main.cpp

@@ -16,7 +16,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
 
 #include "cvfBase.h"
 

ApplicationCode/RiaMain.cpp

@@ -16,7 +16,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
 #include "RiaApplication.h"
 #include "RiuMainWindow.h"
 

ApplicationCode/RiaStdInclude.cpp

@@ -1,20 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-//  Copyright (C) 2011-2012 Statoil ASA, Ceetron AS
-// 
-//  ResInsight is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-// 
-//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
-//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE.
-// 
-//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
-//  for more details.
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-#include "RiaStdInclude.h"
-

ApplicationCode/RiaStdInclude.h

@@ -1,36 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-//  Copyright (C) 2011-2012 Statoil ASA, Ceetron AS
-// 
-//  ResInsight is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-// 
-//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
-//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE.
-// 
-//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
-//  for more details.
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Compiler warnings in Qt 4.7.0
-#pragma warning (disable : 4311)
-#pragma warning (disable : 4312)
-
-#define USE_PRECOMPILED_HEADERS
-#ifdef USE_PRECOMPILED_HEADERS
-
-#include "cvfLibCore.h"
-#include "cvfLibViewing.h"
-#include "cvfLibRender.h"
-#include "cvfLibGeometry.h"
-
-#include <QtCore/QtCore>
-#include <QtGui/QtGui>
-
-#endif // USE_PRECOMPILED_HEADERS

ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp

@@ -18,8 +18,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RiaSocketCommand.h"
 #include "RiaSocketServer.h"
 #include "RiaSocketTools.h"

ApplicationCode/SocketInterface/RiaGeometryCommands.cpp

@@ -18,7 +18,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
 #include "RiaSocketCommand.h"
 #include "RiaSocketServer.h"
 #include "RiaSocketTools.h"

ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp

@@ -18,7 +18,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
 #include "RiaSocketCommand.h"
 #include "RiaSocketServer.h"
 #include "RiaSocketTools.h"

ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp

@@ -18,32 +18,30 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RiaSocketCommand.h"
 #include "RiaSocketDataTransfer.h"
 #include "RiaSocketServer.h"
 #include "RiaSocketTools.h"
 
-#include "RifReaderInterface.h"
-
-#include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigResultAccessor.h"
+#include "RigResultAccessorFactory.h"
 #include "RigResultModifier.h"
 #include "RigResultModifierFactory.h"
 
 #include "RimEclipseCase.h"
+#include "RimEclipseCase.h"
+#include "RimEclipseCellColors.h"
 #include "RimEclipseInputCase.h"
 #include "RimEclipseInputProperty.h"
 #include "RimEclipseInputPropertyCollection.h"
 #include "RimReservoirCellResultsStorage.h"
-#include "RimEclipseView.h"
-#include "RimEclipseCellColors.h"
 
 #include "RiuMainWindow.h"
 #include "RiuProcessMonitor.h"
-#include "RigResultAccessorFactory.h"
+
+#include <QErrorMessage>
 
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/SocketInterface/RiaSocketCommand.h

@@ -25,7 +25,12 @@
 //////////////////////////////////////////////////////////////////////////
 
 class RiaSocketServer;
+
 class QTcpSocket;
+class QDataStream;
+class QByteArray;
+
+#include <QList>
 
 class RiaSocketCommand
 {

ApplicationCode/SocketInterface/RiaSocketServer.cpp

@@ -18,7 +18,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
 #include "RiaSocketServer.h"
 #include "RiaSocketCommand.h"
 #include "RiaSocketTools.h"

ApplicationCode/SocketInterface/RiaSocketTools.cpp

@@ -18,31 +18,28 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
+#include "RiaSocketTools.h"
 
 #include "RiaApplication.h"
 #include "RiaPreferences.h"
-
+#include "RiaSocketDataTransfer.h"
-#include "RiaSocketTools.h"
 #include "RiaSocketServer.h"
-#include "RimEclipseCase.h"
-#include "RimCaseCollection.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimEclipseInputCase.h"
 
-#include "RimEclipseView.h"
+#include "Rim3dOverlayInfoConfig.h"
-#include "RimEclipseCellColors.h"
+#include "RimCaseCollection.h"
 #include "RimCellEdgeColors.h"
 #include "RimCellRangeFilterCollection.h"
+#include "RimEclipseCase.h"
+#include "RimEclipseCellColors.h"
+#include "RimEclipseInputCase.h"
+#include "RimEclipseInputPropertyCollection.h"
 #include "RimEclipsePropertyFilterCollection.h"
+#include "RimEclipseView.h"
 #include "RimEclipseWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
+#include "RimIdenticalGridCaseGroup.h"
 #include "RimReservoirCellResultsStorage.h"
 
-#include "RimEclipseInputPropertyCollection.h"
+#include <QErrorMessage>
-
-#include "RiaSocketDataTransfer.h"
-
 #include <QTcpSocket>
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/SocketInterface/RiaSocketTools.h

@@ -20,8 +20,12 @@
 
 class RimCase;
 class RiaSocketServer;
+class RimEclipseCase;
 class QTcpSocket;
 
+#include <QList>
+#include <QByteArray>
+
 #define PMonLog( MessageString ) RiuMainWindow::instance()->processMonitor()->addStringToLog( MessageString );
 
 class RiaSocketTools

ApplicationCode/SocketInterface/RiaWellDataCommands.cpp

@@ -18,28 +18,18 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
 #include "RiaSocketCommand.h"
 #include "RiaSocketServer.h"
 #include "RiaSocketTools.h"
 
-#include "RiuMainWindow.h"
-
 #include "RigCaseData.h"
-#include "RigCaseCellResultsData.h"
+#include "RigSingleWellResultsData.h"
 
-#include "RimReservoirCellResultsStorage.h"
 #include "RimEclipseCase.h"
-#include "RimEclipseInputCase.h"
-#include "RimEclipseInputPropertyCollection.h"
-#include "RimEclipseView.h"
-#include "RimEclipseCellColors.h"
-#include "RimCellEdgeColors.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimEclipsePropertyFilterCollection.h"
-#include "RimEclipseWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
 
+#include "cvfCollection.h"
+
+#include <QErrorMessage>
 #include <QTcpSocket>
 
 

ApplicationCode/UserInterface/RiuCursors.cpp

@@ -16,7 +16,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
 
 #include "RiuCursors.h"
 

ApplicationCode/UserInterface/RiuMainWindow.cpp

@@ -18,8 +18,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RiuMainWindow.h"
 
 #include "RiaApplication.h"
@@ -45,22 +43,25 @@
 #include "RimGeoMechModels.h"
 #include "RimGeoMechView.h"
 #include "RimGeoMechView.h"
+#include "RimMainPlotCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "RimReservoirCellResultsStorage.h"
 #include "RimTools.h"
-#include "RimWellPathCollection.h"
+#include "RimTreeViewStateSerializer.h"
-#include "RimWellPathImport.h"
 #include "RimWellLogPlot.h"
 #include "RimWellLogPlotCollection.h"
-#include "RimMainPlotCollection.h"
+#include "RimWellPathCollection.h"
+#include "RimWellPathImport.h"
 
+#include "RiuDragDrop.h"
 #include "RiuMultiCaseImportDialog.h"
 #include "RiuProcessMonitor.h"
+#include "RiuProjectPropertyView.h"
 #include "RiuResultInfoPanel.h"
+#include "RiuTreeViewEventFilter.h"
 #include "RiuViewer.h"
 #include "RiuWellImportWizard.h"
-#include "RiuDragDrop.h"
 #include "RiuWellLogPlot.h"
 
 #include "cafAboutDialog.h"
@@ -75,11 +76,27 @@
 #include "cafPdmUiPropertyViewDialog.h"
 #include "cafPdmUiTreeView.h"
 #include "cafSelectionManager.h"
-
 #include "cvfTimer.h"
-#include "RimTreeViewStateSerializer.h"
+
-#include "RiuTreeViewEventFilter.h"
+#include <QAction>
-#include "RiuProjectPropertyView.h"
+#include <QCloseEvent>
+#include <QDesktopServices>
+#include <QDockWidget>
+#include <QErrorMessage>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QLabel>
+#include <QLayout>
+#include <QMdiArea>
+#include <QMdiSubWindow>
+#include <QMenu>
+#include <QMenuBar>
+#include <QSpinBox>
+#include <QStyle>
+#include <QToolTip>
+#include <QTreeView>
+#include <QUndoStack>
+
 
 
 //==================================================================================================

ApplicationCode/UserInterface/RiuProcessMonitor.cpp

@@ -16,11 +16,18 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
+#include "RiaApplication.h"
 
 #include "RiuProcessMonitor.h"
+
 #include "cafUiProcess.h"
-#include "RiaApplication.h"
+
+#include <QWidget>
+#include <QLabel>
+#include <QDockWidget>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QPlainTextEdit>
 
 //--------------------------------------------------------------------------------------------------
 /// 

ApplicationCode/UserInterface/RiuResultInfoPanel.cpp

@@ -16,10 +16,12 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
 #include "RiuResultInfoPanel.h"
 
-
+#include <QDockWidget>
+#include <QTextEdit>
+#include <QVBoxLayout>
+#include <QWidget>
 
 //==================================================================================================
 ///