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

System : Reorder initialization order to match declaration order

Browse Source
This commit is contained in:
Magne Sjaastad
2018-02-24 09:17:02 +01:00
parent 905ebb49de
commit 1706a6c0c4
8 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/UserInterface/RiuFlowCharacteristicsPlot.cpp
View File

@@ -48,8 +48,9 @@
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuFlowCharacteristicsPlot::RiuFlowCharacteristicsPlot(RimFlowCharacteristicsPlot* plotDefinition, QWidget* parent) RiuFlowCharacteristicsPlot::RiuFlowCharacteristicsPlot(RimFlowCharacteristicsPlot* plotDefinition, QWidget* parent)
: m_plotDefinition(plotDefinition), : QFrame(parent)
QFrame(parent) , m_plotDefinition(plotDefinition)
{ {
Q_ASSERT(m_plotDefinition); Q_ASSERT(m_plotDefinition);

4
ApplicationCode/UserInterface/RiuMultiCaseImportDialog.cpp
View File

@@ -32,7 +32,9 @@
class FileListModel: public QStringListModel class FileListModel: public QStringListModel
{ {
public: public:
explicit FileListModel(QObject *parent = nullptr) : m_isItemsEditable(false), QStringListModel(parent) explicit FileListModel(QObject* parent = nullptr)
: QStringListModel(parent)
, m_isItemsEditable(false)
{ {
} }

53
ApplicationCode/UserInterface/RiuSelectionManager.cpp
View File

@@ -177,42 +177,41 @@ RiuEclipseSelectionItem::RiuEclipseSelectionItem(RimEclipseView* view,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuGeoMechSelectionItem::RiuGeoMechSelectionItem(RimGeoMechView* view, RiuGeoMechSelectionItem::RiuGeoMechSelectionItem(RimGeoMechView* view,
size_t gridIndex, size_t gridIndex,
size_t cellIndex, size_t cellIndex,
cvf::Color3f color, cvf::Color3f color,
int elementFace, int elementFace,
const cvf::Vec3d& localIntersectionPoint) const cvf::Vec3d& localIntersectionPoint)
: m_view(view), : m_view(view)
m_gridIndex(gridIndex), , m_gridIndex(gridIndex)
m_cellIndex(cellIndex), , m_cellIndex(cellIndex)
m_color(color), , m_color(color)
m_elementFace(elementFace), , m_elementFace(elementFace)
m_localIntersectionPoint(localIntersectionPoint), , m_hasIntersectionTriangle(false)
m_hasIntersectionTriangle(false) , m_localIntersectionPoint(localIntersectionPoint)
{ {
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuGeoMechSelectionItem::RiuGeoMechSelectionItem(RimGeoMechView* view, RiuGeoMechSelectionItem::RiuGeoMechSelectionItem(RimGeoMechView* view,
size_t gridIndex, size_t gridIndex,
size_t cellIndex, size_t cellIndex,
cvf::Color3f color, cvf::Color3f color,
int elementFace, int elementFace,
const cvf::Vec3d& localIntersectionPoint, const cvf::Vec3d& localIntersectionPoint,
const std::array<cvf::Vec3f, 3>& intersectionTriangle) const std::array<cvf::Vec3f, 3>& intersectionTriangle)
: m_view(view), : m_view(view)
m_gridIndex(gridIndex), , m_gridIndex(gridIndex)
m_cellIndex(cellIndex), , m_cellIndex(cellIndex)
m_color(color), , m_color(color)
m_elementFace(elementFace), , m_elementFace(elementFace)
m_localIntersectionPoint(localIntersectionPoint), , m_hasIntersectionTriangle(true)
m_hasIntersectionTriangle(true), , m_intersectionTriangle(intersectionTriangle)
m_intersectionTriangle(intersectionTriangle) , m_localIntersectionPoint(localIntersectionPoint)
{ {
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

11
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@@ -106,11 +106,12 @@
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuViewerCommands::RiuViewerCommands(RiuViewer* ownerViewer) RiuViewerCommands::RiuViewerCommands(RiuViewer* ownerViewer)
: QObject(ownerViewer), : QObject(ownerViewer)
m_viewer(ownerViewer), , m_currentGridIdx(-1)
m_currentGridIdx(-1), , m_currentCellIndex(-1)
m_currentCellIndex(-1), , m_currentFaceIndex(cvf::StructGridInterface::NO_FACE)
m_currentPickPositionInDomainCoords(cvf::Vec3d::UNDEFINED) , m_currentPickPositionInDomainCoords(cvf::Vec3d::UNDEFINED)
, m_viewer(ownerViewer)
{ {
{ {
m_viewerEventHandlers.push_back(dynamic_cast<RicViewerEventInterface*>(RicIntersectionViewerEventHandler::instance())); m_viewerEventHandlers.push_back(dynamic_cast<RicViewerEventInterface*>(RicIntersectionViewerEventHandler::instance()));

18
ApplicationCode/UserInterface/RiuViewerCommands.h
View File

@@ -68,16 +68,12 @@ private:
bool handleOverlayItemPicking(int winPosX, int winPosY); bool handleOverlayItemPicking(int winPosX, int winPosY);
size_t m_currentGridIdx; private:
size_t m_currentCellIndex; size_t m_currentGridIdx;
cvf::StructGridInterface::FaceType m_currentFaceIndex; size_t m_currentCellIndex;
cvf::Vec3d m_currentPickPositionInDomainCoords; cvf::StructGridInterface::FaceType m_currentFaceIndex;
cvf::Vec3d m_currentPickPositionInDomainCoords;
caf::PdmPointer<Rim3dView> m_reservoirView; caf::PdmPointer<Rim3dView> m_reservoirView;
QPointer<RiuViewer> m_viewer;
QPointer<RiuViewer> m_viewer;
std::vector<RicViewerEventInterface*> m_viewerEventHandlers; std::vector<RicViewerEventInterface*> m_viewerEventHandlers;
}; };

4
ApplicationCode/UserInterface/RiuWellAllocationPlot.cpp
View File

@@ -44,8 +44,8 @@
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuWellAllocationPlot::RiuWellAllocationPlot(RimWellAllocationPlot* plotDefinition, QWidget* parent) RiuWellAllocationPlot::RiuWellAllocationPlot(RimWellAllocationPlot* plotDefinition, QWidget* parent)
: m_plotDefinition(plotDefinition), : QFrame(parent)
QFrame(parent) , m_plotDefinition(plotDefinition)
{ {
Q_ASSERT(m_plotDefinition); Q_ASSERT(m_plotDefinition);

5
ApplicationCode/UserInterface/RiuWellPltPlot.cpp
View File

@@ -44,8 +44,9 @@
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuWellPltPlot::RiuWellPltPlot(RimWellPltPlot* plotDefinition, QWidget* parent) RiuWellPltPlot::RiuWellPltPlot(RimWellPltPlot* plotDefinition, QWidget* parent)
: m_plotDefinition(plotDefinition), : QFrame(parent)
QFrame(parent) , m_plotDefinition(plotDefinition)
{ {
Q_ASSERT(m_plotDefinition); Q_ASSERT(m_plotDefinition);

5
ApplicationCode/UserInterface/RiuWellRftPlot.cpp
View File

@@ -44,8 +44,9 @@
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuWellRftPlot::RiuWellRftPlot(RimWellRftPlot* plotDefinition, QWidget* parent) RiuWellRftPlot::RiuWellRftPlot(RimWellRftPlot* plotDefinition, QWidget* parent)
: m_plotDefinition(plotDefinition), : QFrame(parent)
QFrame(parent) , m_plotDefinition(plotDefinition)
{ {
Q_ASSERT(m_plotDefinition); Q_ASSERT(m_plotDefinition);