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

QString::fromAscii() is obsolete in Qt5. Replace it with fromLatin1().

Browse Source 
This change is Qt4/Qt5 neutral.
This commit is contained in:
Mateusz Skowroński
2015-12-15 07:00:20 +01:00
committed by wmayer
parent d5c074f80d
commit cd2db00f22
154 changed files with 836 additions and 836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Gui/SoTextLabel.cpp
View File

@@ -209,7 +209,7 @@ void SoTextLabel::GLRender(SoGLRenderAction *action)
// The font name is of the form "family:style". If 'style' is given it can be
// 'Bold', 'Italic' or 'Bold Italic'.
QFont font;
QString fn = QString::fromAscii(fontname.getString());
QString fn = QString::fromLatin1(fontname.getString());
int pos = fn.indexOf(QLatin1Char(':'));
if (pos > -1) {
if (fn.indexOf(QLatin1String("Bold"),pos,Qt::CaseInsensitive) > pos)
@@ -434,7 +434,7 @@ void SoFrameLabel::drawImage()
return;
}
QFont font(QString::fromAscii(name.getValue()), size.getValue());
QFont font(QString::fromLatin1(name.getValue()), size.getValue());
QFontMetrics fm(font);
int w = 0;
int h = fm.height() * num;