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

Qt4/Qt5 neutral changes:

Browse Source 
+ 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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Gui/DlgKeyboardImp.cpp
View File

@@ -226,7 +226,7 @@ void DlgCustomKeyboardImp::on_buttonAssign_clicked()
// update the tool tip
QString accel = shortcut.toString(QKeySequence::NativeText);
QString toolTip = QCoreApplication::translate(cmd->className(),
cmd->getToolTipText(), 0, QCoreApplication::UnicodeUTF8);
cmd->getToolTipText());
if (!accel.isEmpty()) {
if (!toolTip.isEmpty()) {
QString tip = QString::fromLatin1("%1 (%2)")
@@ -240,7 +240,7 @@ void DlgCustomKeyboardImp::on_buttonAssign_clicked()
// update the status tip
QString statusTip = QCoreApplication::translate(cmd->className(),
cmd->getStatusTip(), 0, QCoreApplication::UnicodeUTF8);
cmd->getStatusTip());
if (statusTip.isEmpty())
statusTip = toolTip;
if (!accel.isEmpty()) {
@@ -281,12 +281,12 @@ void DlgCustomKeyboardImp::on_buttonClear_clicked()
// update the tool tip
QString toolTip = QCoreApplication::translate(cmd->className(),
cmd->getToolTipText(), 0, QCoreApplication::UnicodeUTF8);
cmd->getToolTipText());
action->setToolTip(toolTip);
// update the status tip
QString statusTip = QCoreApplication::translate(cmd->className(),
cmd->getStatusTip(), 0, QCoreApplication::UnicodeUTF8);
cmd->getStatusTip());
if (statusTip.isEmpty())
statusTip = toolTip;
action->setStatusTip(statusTip);