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

@@ -615,39 +615,29 @@ void StdCmdDrawStyle::languageChange()
QList<QAction*> a = pcAction->actions();
a[0]->setText(QCoreApplication::translate(
"Std_DrawStyle", "As is", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "As is"));
a[0]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Normal mode", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Normal mode"));
a[1]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Flat lines", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Flat lines"));
a[1]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Flat lines mode", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Flat lines mode"));
a[2]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Shaded", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Shaded"));
a[2]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Shaded mode", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Shaded mode"));
a[3]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Wireframe", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Wireframe"));
a[3]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Wireframe mode", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Wireframe mode"));
a[4]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Points", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Points"));
a[4]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Points mode", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Points mode"));
}
void StdCmdDrawStyle::updateIcon(const MDIView *view)
@@ -1453,8 +1443,7 @@ Action * StdViewDockUndockFullscreen::createAction(void)
ActionGroup* pcAction = new ActionGroup(this, getMainWindow());
pcAction->setDropDownMenu(true);
pcAction->setText(QCoreApplication::translate(
this->className(), sMenuText, 0,
QCoreApplication::CodecForTr));
this->className(), sMenuText));
CommandManager &rcCmdMgr = Application::Instance->commandManager();
Command* cmdD = rcCmdMgr.getCommandByName("Std_ViewDock");