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

@@ -607,27 +607,21 @@ const char * Command::endCmdHelp(void)
void Command::applyCommandData(const char* context, Action* action)
{
action->setText(QCoreApplication::translate(
context, getMenuText(), 0,
QCoreApplication::UnicodeUTF8));
context, getMenuText()));
action->setToolTip(QCoreApplication::translate(
context, getToolTipText(), 0,
QCoreApplication::UnicodeUTF8));
context, getToolTipText()));
if (sStatusTip)
action->setStatusTip(QCoreApplication::translate(
context, getStatusTip(), 0,
QCoreApplication::UnicodeUTF8));
context, getStatusTip()));
else
action->setStatusTip(QCoreApplication::translate(
context, getToolTipText(), 0,
QCoreApplication::UnicodeUTF8));
context, getToolTipText()));
if (sWhatsThis)
action->setWhatsThis(QCoreApplication::translate(
context, getWhatsThis(), 0,
QCoreApplication::UnicodeUTF8));
context, getWhatsThis()));
else
action->setWhatsThis(QCoreApplication::translate(
context, getToolTipText(), 0,
QCoreApplication::UnicodeUTF8));
context, getToolTipText()));
QString accel = action->shortcut().toString(QKeySequence::NativeText);
if (!accel.isEmpty()) {
// show shortcut inside tooltip