kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Fix remaining toAscii/fromAscii

Browse Source 
Qt5 does not have toAscii or fromAscii.  Use toLatin1 and fromLatin1
respectively.  Both replacement functions exist in Qt4.8.
This commit is contained in:
maurerpe
2016-02-21 13:33:37 -05:00
committed by wmayer
parent 8fd08f9b43
commit 2e4efb5b10
10 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Sandbox/Gui/Overlay.cpp
View File

@@ -59,7 +59,7 @@ public:
{
QPainter p(&img);
p.setPen(Qt::white);
p.drawText(200,200,QString::fromAscii("Render to QImage"));
p.drawText(200,200,QString::fromLatin1("Render to QImage"));
}
img = QGLWidget::convertToGLFormat(img);
@@ -70,7 +70,7 @@ public:
{
QPainter p(fbo);
p.setPen(Qt::white);
p.drawText(200,200,QString::fromAscii("Render to QGLFramebufferObject"));
p.drawText(200,200,QString::fromLatin1("Render to QGLFramebufferObject"));
p.end();
//img = fbo->toImage();
//img = QGLWidget::convertToGLFormat(img);
@@ -498,7 +498,7 @@ void DrawingPlane::terminate()
SoGLRenderAction a(SbViewportRegion(128,128));
a.apply(_pcView3D->getSoRenderManager()->getSceneGraph());
fbo->release();
fbo->toImage().save(QString::fromAscii("C:/Temp/DrawingPlane.png"));
fbo->toImage().save(QString::fromLatin1("C:/Temp/DrawingPlane.png"));
delete fbo;
}