diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index c69ab041f3..4af24be49d 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -258,8 +258,8 @@ void RimProject::initAfterRead() 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", - casesObsolete().size(), caseGroupsObsolete.size()); + //printf("RimProject::initAfterRead: Was not able to move all cases (%i left) or caseGroups (%i left) from Project to analysisModels", + // casesObsolete().size(), caseGroupsObsolete.size()); } // Set project pointer to each well path diff --git a/ApplicationCode/ProjectDataModel/RimWellPathCollection.h b/ApplicationCode/ProjectDataModel/RimWellPathCollection.h index 63e1d30556..5aa5c5e773 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathCollection.h +++ b/ApplicationCode/ProjectDataModel/RimWellPathCollection.h @@ -95,4 +95,4 @@ private: void readAllWellData(QString filePath); std::map > m_fileNameToWellDataGroupMap; -}; \ No newline at end of file +}; diff --git a/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp b/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp index 285c286790..2287584071 100644 --- a/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp +++ b/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp @@ -50,7 +50,7 @@ void RigMainGrid::addLocalGrid(RigLocalGrid* localGrid) localGrid->setGridIndex(m_localGrids.size()); // Maingrid itself has grid index 0 - if (m_gridIdToIndexMapping.size() <= localGrid->gridId()) + if (m_gridIdToIndexMapping.size() <= static_cast(localGrid->gridId())) { 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) { - CVF_ASSERT (localGridId >= 0 && localGridId < m_gridIdToIndexMapping.size()); + CVF_ASSERT (localGridId >= 0 && static_cast(localGridId) < m_gridIdToIndexMapping.size()); return this->gridByIndex(m_gridIdToIndexMapping[localGridId]); } diff --git a/ApplicationCode/UserInterface/RiuMultiCaseImportDialog.ui b/ApplicationCode/UserInterface/RiuMultiCaseImportDialog.ui index ca27248841..545f007222 100644 --- a/ApplicationCode/UserInterface/RiuMultiCaseImportDialog.ui +++ b/ApplicationCode/UserInterface/RiuMultiCaseImportDialog.ui @@ -80,7 +80,7 @@ - + diff --git a/cafUserInterface/cafPdmUiListViewEditor.cpp b/cafUserInterface/cafPdmUiListViewEditor.cpp index 52a168305e..e138d60ff5 100644 --- a/cafUserInterface/cafPdmUiListViewEditor.cpp +++ b/cafUserInterface/cafPdmUiListViewEditor.cpp @@ -94,7 +94,7 @@ void UiTableModelPdm::computeColumnCount() std::vector fields; m_pdmObjectGroup->objects[i]->fields(fields); - if (m_columnCount < fields.size()) + if (m_columnCount < static_cast(fields.size())) { m_columnCount = static_cast(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 (index.row() < m_pdmObjectGroup->objects.size()) + if (index.row() < static_cast(m_pdmObjectGroup->objects.size())) { PdmObject* pdmObject = m_pdmObjectGroup->objects[index.row()]; if (pdmObject) @@ -125,7 +125,7 @@ QVariant caf::UiTableModelPdm::data(const QModelIndex &index, int role /*= Qt::D std::vector fields; pdmObject->fields(fields); - if (index.column() < fields.size()) + if (index.column() < static_cast(fields.size())) { size_t fieldIndex = 0;