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

Fix warnings

Browse Source
This commit is contained in:
Magne Sjaastad
2018-09-27 20:40:05 +02:00
parent 4877e058ed
commit acf6a17c40
14 changed files with 84 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/ModelVisualization/RivCellEdgeEffectGenerator.cpp
View File

@@ -140,10 +140,10 @@ void CellEdgeEffectGenerator::updateForShaderBasedRendering(cvf::Effect* effect)
cvf::ShaderProgramGenerator shaderGen("CellEdgeFaceShaderProgramGenerator", cvf::ShaderSourceProvider::instance());
{
QFile data(":/Shader/fs_CellFace.glsl");
if (data.open(QFile::ReadOnly))
QFile file(":/Shader/fs_CellFace.glsl");
if (file.open(QFile::ReadOnly))
{
QTextStream in(&data);
QTextStream in(&file);
QString data = in.readAll();
cvf::String cvfString = cvfqt::Utils::toString(data);
@@ -155,10 +155,10 @@ void CellEdgeEffectGenerator::updateForShaderBasedRendering(cvf::Effect* effect)
if (m_ternaryCellScalarMapper.notNull())
{
{
QFile data(":/Shader/vs_2dTextureCellFace.glsl");
if (data.open(QFile::ReadOnly))
QFile file(":/Shader/vs_2dTextureCellFace.glsl");
if (file.open(QFile::ReadOnly))
{
QTextStream in(&data);
QTextStream in(&file);
QString data = in.readAll();
cvf::String cvfString = cvfqt::Utils::toString(data);
@@ -170,10 +170,10 @@ void CellEdgeEffectGenerator::updateForShaderBasedRendering(cvf::Effect* effect)
else
{
{
QFile data(":/Shader/vs_CellFace.glsl");
if (data.open(QFile::ReadOnly))
QFile file(":/Shader/vs_CellFace.glsl");
if (file.open(QFile::ReadOnly))
{
QTextStream in(&data);
QTextStream in(&file);
QString data = in.readAll();
cvf::String cvfString = cvfqt::Utils::toString(data);