kindred/create
1
1
Fork 0
Code Issues 30 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

8
src/Gui/HelpView.cpp
View File

@@ -208,7 +208,7 @@ QVariant TextBrowser::loadFileResource(int type, const QUrl& name)
data = file.readAll();
file.close();
} else if (type == QTextDocument::HtmlResource) {
data = QString::fromAscii(
data = QString::fromLatin1(
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">"
"<html>"
"<head>"
@@ -306,7 +306,7 @@ QVariant TextBrowser::loadHttpResource(int type, const QUrl& name)
return d->http->readAll();
} else {
if (type == QTextDocument::HtmlResource) {
data = QString::fromAscii(
data = QString::fromLatin1(
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">"
"<html>"
"<head>"
@@ -474,7 +474,7 @@ void TextBrowser::dropEvent(QDropEvent * e)
QString info = pCmd->getAction()->whatsThis();
if ( !info.isEmpty() ) {
// cannot show help to this command
info = QString::fromAscii(
info = QString::fromLatin1(
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">"
"<html>"
"<body bgcolor=white text=black alink=red link=darkblue vlink=darkmagenta>"
@@ -482,7 +482,7 @@ void TextBrowser::dropEvent(QDropEvent * e)
"</body>"
"</html>" ).arg( info );
} else {
info = QString::fromAscii(
info = QString::fromLatin1(
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">"
"<html>"
"<body bgcolor=white text=black alink=red link=darkblue vlink=darkmagenta>"