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

Fixed several compiler warning on Linux

Browse Source 
p4#: 22370
This commit is contained in:
Magne Sjaastad 2013-09-10 08:47:28 +02:00
parent 7ddef25ce0
commit 5dbc15998f
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -258,8 +258,8 @@ void RimProject::initAfterRead()
if (casesObsolete().size() > 0 || caseGroupsObsolete.size() > 0) if (casesObsolete().size() > 0 || caseGroupsObsolete.size() > 0)
{ {
printf("RimProject::initAfterRead: Was not able to move all cases (%i left) or caseGroups (%i left) from Project to analysisModels", //printf("RimProject::initAfterRead: Was not able to move all cases (%i left) or caseGroups (%i left) from Project to analysisModels",
casesObsolete().size(), caseGroupsObsolete.size()); // casesObsolete().size(), caseGroupsObsolete.size());
} }
// Set project pointer to each well path // Set project pointer to each well path

4
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@ -50,7 +50,7 @@ void RigMainGrid::addLocalGrid(RigLocalGrid* localGrid)
localGrid->setGridIndex(m_localGrids.size()); // Maingrid itself has grid index 0 localGrid->setGridIndex(m_localGrids.size()); // Maingrid itself has grid index 0
if (m_gridIdToIndexMapping.size() <= localGrid->gridId()) if (m_gridIdToIndexMapping.size() <= static_cast<size_t>(localGrid->gridId()))
{ {
m_gridIdToIndexMapping.resize(localGrid->gridId() + 1, cvf::UNDEFINED_SIZE_T); m_gridIdToIndexMapping.resize(localGrid->gridId() + 1, cvf::UNDEFINED_SIZE_T);
} }
@ -175,7 +175,7 @@ void RigMainGrid::setFlipAxis(bool flipXAxis, bool flipYAxis)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigGridBase* RigMainGrid::gridById(int localGridId) RigGridBase* RigMainGrid::gridById(int localGridId)
{ {
CVF_ASSERT (localGridId >= 0 && localGridId < m_gridIdToIndexMapping.size()); CVF_ASSERT (localGridId >= 0 && static_cast<size_t>(localGridId) < m_gridIdToIndexMapping.size());
return this->gridByIndex(m_gridIdToIndexMapping[localGridId]); return this->gridByIndex(m_gridIdToIndexMapping[localGridId]);
} }

2
ApplicationCode/UserInterface/RiuMultiCaseImportDialog.ui
View File

@ -80,7 +80,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="layoutWidget1">
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0"> <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0">
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QListView" name="m_eclipseCasesList"> <widget class="QListView" name="m_eclipseCasesList">

6
cafUserInterface/cafPdmUiListViewEditor.cpp
View File

@ -94,7 +94,7 @@ void UiTableModelPdm::computeColumnCount()
std::vector<PdmFieldHandle*> fields; std::vector<PdmFieldHandle*> fields;
m_pdmObjectGroup->objects[i]->fields(fields); m_pdmObjectGroup->objects[i]->fields(fields);
if (m_columnCount < fields.size()) if (m_columnCount < static_cast<int>(fields.size()))
{ {
m_columnCount = static_cast<int>(fields.size()); m_columnCount = static_cast<int>(fields.size());
} }
@ -117,7 +117,7 @@ QVariant caf::UiTableModelPdm::data(const QModelIndex &index, int role /*= Qt::D
{ {
if (m_pdmObjectGroup && (role == Qt::DisplayRole || role == Qt::EditRole)) if (m_pdmObjectGroup && (role == Qt::DisplayRole || role == Qt::EditRole))
{ {
if (index.row() < m_pdmObjectGroup->objects.size()) if (index.row() < static_cast<int>(m_pdmObjectGroup->objects.size()))
{ {
PdmObject* pdmObject = m_pdmObjectGroup->objects[index.row()]; PdmObject* pdmObject = m_pdmObjectGroup->objects[index.row()];
if (pdmObject) if (pdmObject)
@ -125,7 +125,7 @@ QVariant caf::UiTableModelPdm::data(const QModelIndex &index, int role /*= Qt::D
std::vector<PdmFieldHandle*> fields; std::vector<PdmFieldHandle*> fields;
pdmObject->fields(fields); pdmObject->fields(fields);
if (index.column() < fields.size()) if (index.column() < static_cast<int>(fields.size()))
{ {
size_t fieldIndex = 0; size_t fieldIndex = 0;