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

Workaround for compiler errors in cotire build due to local classes having the same name

Browse Source
This commit is contained in:
sigurdp
2017-10-27 13:50:32 +02:00
parent c0bce09a12
commit 44e2d7d403
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/UserInterface/RiuPvtPlotPanel.cpp
View File

@@ -42,10 +42,10 @@
//
//
//==================================================================================================
class MyQwtPlot : public QwtPlot
class PvtQwtPlot : public QwtPlot
{
public:
MyQwtPlot(QWidget* parent) : QwtPlot(parent) {}
PvtQwtPlot(QWidget* parent) : QwtPlot(parent) {}
virtual QSize sizeHint() const { return QSize(100, 100); }
virtual QSize minimumSizeHint() const { return QSize(0, 0); }
};
@@ -77,8 +77,8 @@ RiuPvtPlotPanel::RiuPvtPlotPanel(QDockWidget* parent)
comboLayout->addWidget(m_phaseComboBox);
comboLayout->addStretch(1);
m_fvfPlot = new MyQwtPlot(this);
m_viscosityPlot = new MyQwtPlot(this);
m_fvfPlot = new PvtQwtPlot(this);
m_viscosityPlot = new PvtQwtPlot(this);
setPlotDefaults(m_fvfPlot);
setPlotDefaults(m_viscosityPlot);

6
ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp
View File

@@ -47,10 +47,10 @@
//
//
//==================================================================================================
class MyQwtPlot : public QwtPlot
class RelPermQwtPlot : public QwtPlot
{
public:
MyQwtPlot(QWidget* parent) : QwtPlot(parent) {}
RelPermQwtPlot(QWidget* parent) : QwtPlot(parent) {}
virtual QSize sizeHint() const { return QSize(100, 100); }
virtual QSize minimumSizeHint() const { return QSize(0, 0); }
};
@@ -73,7 +73,7 @@ public:
RiuRelativePermeabilityPlotPanel::RiuRelativePermeabilityPlotPanel(QDockWidget* parent)
: QWidget(parent)
{
m_qwtPlot = new MyQwtPlot(this);
m_qwtPlot = new RelPermQwtPlot(this);
setPlotDefaults(m_qwtPlot);
m_selectedCurvesButtonGroup = new QButtonGroup(this);