From 6b7ca162cee0b34083d70c0d8d4f4d91b27f8024 Mon Sep 17 00:00:00 2001 From: granzuglia Date: Fri, 24 May 2013 16:31:16 +0000 Subject: [PATCH] - fixed compile time errors with qt 5.0 --- wrap/gl/splatting_apss/splatrenderer.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wrap/gl/splatting_apss/splatrenderer.h b/wrap/gl/splatting_apss/splatrenderer.h index f70eba57..4a8d78a6 100644 --- a/wrap/gl/splatting_apss/splatrenderer.h +++ b/wrap/gl/splatting_apss/splatrenderer.h @@ -163,7 +163,7 @@ QString SplatRenderer::loadSource(const QString& func,const QString& f QFile f(":/SplatRenderer/shaders/" + filename); if (!f.open(QFile::ReadOnly)) { - std::cerr << "failed to load shader file " << filename.toAscii().data() << "\n"; + std::cerr << "failed to load shader file " << filename.toUtf8().data() << "\n"; return res; } else qDebug("Succesfully loaded shader func '%s' in file '%s'",qPrintable(func),qPrintable(filename)); @@ -207,8 +207,8 @@ void SplatRenderer::configureShaders() { QString vsrc = shading + defines + mShaderSrcs[k*2+0]; QString fsrc = shading + defines + mShaderSrcs[k*2+1]; - mShaders[k].SetSources(mShaderSrcs[k*2+0]!="" ? vsrc.toAscii().data() : 0, - mShaderSrcs[k*2+1]!="" ? fsrc.toAscii().data() : 0); + mShaders[k].SetSources(mShaderSrcs[k*2+0]!="" ? vsrc.toUtf8().data() : 0, + mShaderSrcs[k*2+1]!="" ? fsrc.toUtf8().data() : 0); mShaders[k].prog.Link(); if (mShaderSrcs[k*2+0]!="") {