Qt4/Qt5 neutral changes:

+ remove QCoreApplication::UnicodeUTF8/QApplication::UnicodeUTF8
+ remove QCoreApplication::CodecForTr/QApplication::CodecForTr
This commit is contained in:
wmayer
2016-12-12 14:52:09 +01:00
parent 25cfb0bc1e
commit d2cb4e4af9
13 changed files with 95 additions and 151 deletions

View File

@@ -215,36 +215,32 @@ void CmdDrawingNewPage::languageChange()
int id = (*it)->property("TemplateId").toInt();
QString orientation = (*it)->property("TemplateOrientation").toString();
if (orientation.compare(QLatin1String("landscape"), Qt::CaseInsensitive) == 0)
orientation = QCoreApplication::translate("Drawing_NewPage", "Landscape", 0, QCoreApplication::CodecForTr);
orientation = QCoreApplication::translate("Drawing_NewPage", "Landscape");
else if (orientation.compare(QLatin1String("portrait"), Qt::CaseInsensitive) == 0)
orientation = QCoreApplication::translate("Drawing_NewPage", "Portrait", 0, QCoreApplication::CodecForTr);
orientation = QCoreApplication::translate("Drawing_NewPage", "Portrait");
QString info = (*it)->property("TemplateInfo").toString();
if (info.isEmpty()) {
(*it)->setText(QCoreApplication::translate(
"Drawing_NewPage", "%1%2 %3", 0,
QCoreApplication::CodecForTr)
"Drawing_NewPage", "%1%2 %3")
.arg(paper)
.arg(id)
.arg(orientation));
(*it)->setToolTip(QCoreApplication::translate(
"Drawing_NewPage", "Insert new %1%2 %3 drawing", 0,
QCoreApplication::CodecForTr)
"Drawing_NewPage", "Insert new %1%2 %3 drawing")
.arg(paper)
.arg(id)
.arg(orientation));
}
else {
(*it)->setText(QCoreApplication::translate(
"Drawing_NewPage", "%1%2 %3 (%4)", 0,
QCoreApplication::CodecForTr)
"Drawing_NewPage", "%1%2 %3 (%4)")
.arg(paper)
.arg(id)
.arg(orientation)
.arg(info));
(*it)->setToolTip(QCoreApplication::translate(
"Drawing_NewPage", "Insert new %1%2 %3 (%4) drawing", 0,
QCoreApplication::CodecForTr)
"Drawing_NewPage", "Insert new %1%2 %3 (%4) drawing")
.arg(paper)
.arg(id)
.arg(orientation)