suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QKeySequence::operator QString() is obsolete in Qt5. Use toString(QKeySequence::NativeText) instead.

Browse Source 
This change is Qt4/Qt5 neutral.
This commit is contained in:
Mateusz Skowroński 2015-12-23 20:51:01 +01:00 committed by wmayer
parent 3b463f2138
commit 9beb7d21f3
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Gui/DlgKeyboardImp.cpp
View File

@ -147,7 +147,7 @@ void DlgCustomKeyboardImp::on_commandTreeWidget_currentItemChanged(QTreeWidgetIt
if (ks.isEmpty())
accelLineEditShortcut->setText( tr("none") );
else
accelLineEditShortcut->setText(ks);
accelLineEditShortcut->setText(ks.toString(QKeySequence::NativeText));
buttonAssign->setEnabled(!editShortcut->text().isEmpty() && (ks != ks3));
buttonReset->setEnabled((ks != ks2));
@ -156,7 +156,7 @@ void DlgCustomKeyboardImp::on_commandTreeWidget_currentItemChanged(QTreeWidgetIt
if (ks.isEmpty())
accelLineEditShortcut->setText( tr("none") );
else
accelLineEditShortcut->setText(ks);
accelLineEditShortcut->setText(ks.toString(QKeySequence::NativeText));
buttonAssign->setEnabled(false);
buttonReset->setEnabled(false);
}
@ -218,7 +218,7 @@ void DlgCustomKeyboardImp::on_buttonAssign_clicked()
if (cmd && cmd->getAction()) {
Action* action = cmd->getAction();
QKeySequence shortcut = editShortcut->text();
action->setShortcut(shortcut);
action->setShortcut(shortcut.toString(QKeySequence::NativeText));
accelLineEditShortcut->setText(editShortcut->text());
editShortcut->clear();
@ -274,7 +274,7 @@ void DlgCustomKeyboardImp::on_buttonReset_clicked()
Command* cmd = cCmdMgr.getCommandByName(name.constData());
if (cmd && cmd->getAction()) {
cmd->getAction()->setShortcut(QString::fromLatin1(cmd->getAccel()));
QString txt = cmd->getAction()->shortcut();
QString txt = cmd->getAction()->shortcut().toString(QKeySequence::NativeText);
accelLineEditShortcut->setText((txt.isEmpty() ? tr("none") : txt));
ParameterGrp::handle hGrp = WindowParameter::getDefaultParameter()->GetGroup("Shortcut");
hGrp->RemoveASCII(name.constData());
@ -290,7 +290,8 @@ void DlgCustomKeyboardImp::on_buttonResetAll_clicked()
std::vector<Command*> cmds = cCmdMgr.getAllCommands();
for (std::vector<Command*>::iterator it = cmds.begin(); it != cmds.end(); ++it) {
if ((*it)->getAction()) {
(*it)->getAction()->setShortcut(QKeySequence(QString::fromLatin1((*it)->getAccel())));
(*it)->getAction()->setShortcut(QKeySequence(QString::fromLatin1((*it)->getAccel()))
.toString(QKeySequence::NativeText));
}
}

2
src/Gui/Workbench.cpp
View File

@ -324,7 +324,7 @@ void Workbench::setupCustomShortcuts() const
// may be UTF-8 encoded
QString str = QString::fromUtf8(it->second.c_str());
QKeySequence shortcut = str;
cmd->getAction()->setShortcut(shortcut);
cmd->getAction()->setShortcut(shortcut.toString(QKeySequence::NativeText));
}
}
}