OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

(#495) Removed use of StdInclude

Browse Source
This commit is contained in:
Magne Sjaastad 2015-09-25 15:57:43 +02:00
parent 5b9bf3bcd2
commit 061288f1c3
36 changed files with 153 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
ApplicationCode/Application/RiaApplication.cpp
View File

@ -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 "RimEclipseCellColors.h"
#include "RimIdenticalGridCaseGroup.h"
#include "RimEclipseInputPropertyCollection.h"
#include "RimDefines.h"
#include "RimScriptCollection.h"
#include "Rim3dOverlayInfoConfig.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
{

1
ApplicationCode/Application/RiaPreferences.cpp
View File

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

5
ApplicationCode/Application/RiaProjectModifier.cpp
View File

@ -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>

7
ApplicationCode/Application/RiaProjectModifier.h
View File

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

1
ApplicationCode/CMakeLists.txt
View File

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

2
ApplicationCode/FileInterface/RifReaderMockModel.cpp
View File

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

1
ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
View File

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

20
ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.cpp
View File

@ -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 "RimCellRangeFilterCollection.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "Rim3dOverlayInfoConfig.h"
#include "cafPdmFieldCvfMat4d.h"
//--------------------------------------------------------------------------------------------------
///

9
ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.h
View File

@ -20,9 +20,14 @@
#include "RimEclipseWellCollection.h"
#include "cvfCollection.h"
namespace cvf
{
class Transform;
class ModelBasicList;
}
class RimEclipseView;
class RivWellPipesPartMgr;
class RivWellHeadPartMgr;
@ -36,7 +41,7 @@ public:
void clearGeometryCache();
void scheduleGeometryRegen();
void setScaleTransform(cvf::Transform * scaleTransform);
void setScaleTransform(cvf::Transform* scaleTransform);
void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, size_t frameIndex);
void updatePipeResultColor(size_t frameIndex);

2
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

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

2
ApplicationCode/ProjectDataModel/RimBinaryExportSettings.cpp
View File

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

3
ApplicationCode/ProjectDataModel/RimCalcScript.cpp
View File

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

7
ApplicationCode/ProjectDataModel/RimCellFilter.cpp
View File

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

2
ApplicationCode/ProjectDataModel/RimDefines.cpp
View File

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

2
ApplicationCode/ProjectDataModel/RimExportInputPropertySettings.cpp
View File

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

2
ApplicationCode/ProjectDataModel/RimMimeData.cpp
View File

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

2
ApplicationCode/ProjectDataModel/RimMockModelSettings.cpp
View File

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

1
ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/RigReservoir-Test.cpp
View File

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

1
ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/RigStatisticsMath-Test.cpp
View File

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

1
ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/main.cpp
View File

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

1
ApplicationCode/RiaMain.cpp
View File

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

20
ApplicationCode/RiaStdInclude.cpp
View File

@ -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"

36
ApplicationCode/RiaStdInclude.h
View File

@ -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

2
ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
View File

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

1
ApplicationCode/SocketInterface/RiaGeometryCommands.cpp
View File

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

1
ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp
View File

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

14
ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
View File

@ -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>
//--------------------------------------------------------------------------------------------------

5
ApplicationCode/SocketInterface/RiaSocketCommand.h
View File

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

1
ApplicationCode/SocketInterface/RiaSocketServer.cpp
View File

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

25
ApplicationCode/SocketInterface/RiaSocketTools.cpp
View File

@ -18,31 +18,28 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RiaStdInclude.h"
#include "RiaSocketTools.h"
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "RiaSocketTools.h"
#include "RiaSocketDataTransfer.h"
#include "RiaSocketServer.h"
#include "RimEclipseCase.h"
#include "RimCaseCollection.h"
#include "RimIdenticalGridCaseGroup.h"
#include "RimEclipseInputCase.h"
#include "RimEclipseView.h"
#include "RimEclipseCellColors.h"
#include "Rim3dOverlayInfoConfig.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 "RiaSocketDataTransfer.h"
#include <QErrorMessage>
#include <QTcpSocket>
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/SocketInterface/RiaSocketTools.h
View File

@ -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

18
ApplicationCode/SocketInterface/RiaWellDataCommands.cpp
View File

@ -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>

1
ApplicationCode/UserInterface/RiuCursors.cpp
View File

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

37
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -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 "RimWellPathImport.h"
#include "RimTreeViewStateSerializer.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 "RiuProjectPropertyView.h"
#include <QAction>
#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>
//==================================================================================================

11
ApplicationCode/UserInterface/RiuProcessMonitor.cpp
View File

@ -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>
//--------------------------------------------------------------------------------------------------
///

6
ApplicationCode/UserInterface/RiuResultInfoPanel.cpp
View File

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