mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-12 16:32:12 -05:00
Workaround for compiler errors in cotire build due to local classes having the same name
This commit is contained in:
1 parent
c0bce09a12
commit
44e2d7d403
2 files changed
+7
-7
No files matched your search
@@ -42,10 +42,10 @@
|
|||||||
//
|
//
|
||||||
//
|
//
|
||||||
//==================================================================================================
|
//==================================================================================================
|
||||||
class MyQwtPlot : public QwtPlot
|
class PvtQwtPlot : public QwtPlot
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
MyQwtPlot(QWidget* parent) : QwtPlot(parent) {}
|
PvtQwtPlot(QWidget* parent) : QwtPlot(parent) {}
|
||||||
virtual QSize sizeHint() const { return QSize(100, 100); }
|
virtual QSize sizeHint() const { return QSize(100, 100); }
|
||||||
virtual QSize minimumSizeHint() const { return QSize(0, 0); }
|
virtual QSize minimumSizeHint() const { return QSize(0, 0); }
|
||||||
};
|
};
|
||||||
@@ -77,8 +77,8 @@ RiuPvtPlotPanel::RiuPvtPlotPanel(QDockWidget* parent)
|
|||||||
comboLayout->addWidget(m_phaseComboBox);
|
comboLayout->addWidget(m_phaseComboBox);
|
||||||
comboLayout->addStretch(1);
|
comboLayout->addStretch(1);
|
||||||
|
|
||||||
m_fvfPlot = new MyQwtPlot(this);
|
m_fvfPlot = new PvtQwtPlot(this);
|
||||||
m_viscosityPlot = new MyQwtPlot(this);
|
m_viscosityPlot = new PvtQwtPlot(this);
|
||||||
setPlotDefaults(m_fvfPlot);
|
setPlotDefaults(m_fvfPlot);
|
||||||
setPlotDefaults(m_viscosityPlot);
|
setPlotDefaults(m_viscosityPlot);
|
||||||
|
|
||||||
|
|||||||
@@ -47,10 +47,10 @@
|
|||||||
//
|
//
|
||||||
//
|
//
|
||||||
//==================================================================================================
|
//==================================================================================================
|
||||||
class MyQwtPlot : public QwtPlot
|
class RelPermQwtPlot : public QwtPlot
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
MyQwtPlot(QWidget* parent) : QwtPlot(parent) {}
|
RelPermQwtPlot(QWidget* parent) : QwtPlot(parent) {}
|
||||||
virtual QSize sizeHint() const { return QSize(100, 100); }
|
virtual QSize sizeHint() const { return QSize(100, 100); }
|
||||||
virtual QSize minimumSizeHint() const { return QSize(0, 0); }
|
virtual QSize minimumSizeHint() const { return QSize(0, 0); }
|
||||||
};
|
};
|
||||||
@@ -73,7 +73,7 @@ public:
|
|||||||
RiuRelativePermeabilityPlotPanel::RiuRelativePermeabilityPlotPanel(QDockWidget* parent)
|
RiuRelativePermeabilityPlotPanel::RiuRelativePermeabilityPlotPanel(QDockWidget* parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
{
|
{
|
||||||
m_qwtPlot = new MyQwtPlot(this);
|
m_qwtPlot = new RelPermQwtPlot(this);
|
||||||
setPlotDefaults(m_qwtPlot);
|
setPlotDefaults(m_qwtPlot);
|
||||||
|
|
||||||
m_selectedCurvesButtonGroup = new QButtonGroup(this);
|
m_selectedCurvesButtonGroup = new QButtonGroup(this);
|
||||||
|
|||||||
Reference in new issue
Block a user