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

Removed compiler warnings on linux as well. Now there are (nearly)only ERT warnings left.

Browse Source 
p4#: 20238
This commit is contained in:
Jacob Støren
2013-01-24 14:26:51 +01:00
parent 6465913e0d
commit 288c8bda71
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
View File

@@ -142,7 +142,7 @@ bool RifEclipseOutputFileTools::keywordsOnFile(QStringList* keywords, size_t num
}
// Append keyword to the list if it has the given number of values in total
if (numKWValues == numDataItems)
if (numKWValues == static_cast<int>(numDataItems))
{
keywords->append(QString(kw));
}

4
CommonCode/cafMouseState.cpp
View File

@@ -140,8 +140,8 @@ void QtMouseState::updateFromMouseEvent(QGraphicsSceneMouseEvent* event)
if (numMouseButtonsInState(m_mouseButtonState) == 1)
{
m_cleanButtonPressButton = buttonPressed;
m_cleanButtonPressPosX = event->scenePos().x();
m_cleanButtonPressPosY = event->scenePos().y();
m_cleanButtonPressPosX = (int)event->scenePos().x();
m_cleanButtonPressPosY = (int)event->scenePos().y();
}
}

3
cafUserInterface/cafProgressInfo.cpp
View File

@@ -312,13 +312,12 @@ void ProgressInfoStatic::setProgress(size_t progressValue)
if (progressValue == progressStack().back()) return; // Do nothing if no progress.
// Guard against the max value set for this level
if (progressValue < 0 ) progressValue = 0;
if (progressValue > maxProgressStack().back() ) progressValue = maxProgressStack().back();
progressStack().back() = progressValue;
progressSpanStack().back() = 1;
assert(currentTotalProgress() <= progressDialog()->maximum());
assert(static_cast<int>(currentTotalProgress()) <= progressDialog()->maximum());
size_t totProg = currentTotalProgress();
progressDialog()->setMaximum(static_cast<int>(currentTotalMaxProgressValue()));