Skip to content

Commit 7c63ccc

Browse files
author
Jacob Støren
committed
ResInsight: Linux compile fixes
p4#: 18783
1 parent e679ba0 commit 7c63ccc

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

ApplicationCode/UserInterface/RiuSimpleHistogramWidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class RiuSimpleHistogramWidget : public QWidget
2121
int xPosFromColIdx(size_t colIdx) { return (int)(m_x + 1 + (m_width - 2 ) * colIdx/m_histogramData.size());}
2222
int yPosFromCount(size_t colHeight) { return (int)(m_y + m_height - 1 - (m_height - 3 ) * colHeight/m_maxHistogramCount);}
2323

24-
int xPosFromDomainValue(double value) { double range = m_max - m_min; return (range == 0.0) ? (m_x + 1) : (int)(m_x + 1 + (m_width - 2 ) * (value - m_min)/(m_max - m_min));}
24+
int xPosFromDomainValue(double value) { double range = m_max - m_min; return (range == 0.0) ? (int)(m_x + 1) : (int)(m_x + 1 + (m_width - 2 ) * (value - m_min)/(m_max - m_min));}
2525

2626
std::vector<size_t> m_histogramData;
2727
double m_max;

cafProjectDataModel/cafPdmField.inl

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ QVariant caf::PdmField<DataType>::uiValue() const
187187
PdmOptionItemInfo::findValues(m_optionEntryCache, convertedFieldValue, indexes);
188188
if (convertedFieldValue.type() == QVariant::List)
189189
{
190-
if (indexes.size() == convertedFieldValue.toList().size())
190+
if (indexes.size() == static_cast<size_t>(convertedFieldValue.toList().size()))
191191
{
192192
QList<QVariant> returnList;
193193
for(size_t i = 0; i < indexes.size(); ++i)

cafUserInterface/cafPdmUiListEditor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636

3737

3838
#include <assert.h>
39-
#include "..\src\corelib\kernel\qcoreevent.h"
40-
#include "..\src\gui\kernel\qevent.h"
39+
#include <QEvent>
40+
#include <QKeyEvent>
4141

4242
//==================================================================================================
4343
/// Helper class used to override flags to disable editable items

0 commit comments

Comments
 (0)