whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made qt_accStripAmp handle "&&" 

Changed qt_accStripAmp implementation to handle texts which contains
pairs of ampersands representing a single ampersand.

In order to do that, a new static function called qt_accAmpIndex was
created.
This function is based on the code of qt_accHotKey, which was changed
to use qt_accAmpIndex.

Change-Id: Idcc5d07581d7fb3251c30399b189740ca8071104
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
(cherry picked from commit f864f8f79b88bbc3cc9007d2a92b08ca4b5cb871)
bb10
José Millán Soto 2012-01-22 19:48:09 +01:00 committed by Qt by Nokia
parent 50fefebc84
commit 784076fccb
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/widgets/accessible/qaccessiblewidget.cpp
View File

@ -100,16 +100,14 @@ static QString buddyString(const QWidget *widget)
return QString();
}
QString Q_WIDGETS_EXPORT qt_accStripAmp(const QString &text)
{
return QString(text).remove(QLatin1Char('&'));
}
QString Q_WIDGETS_EXPORT qt_accHotKey(const QString &text)
/* This function will return the offset of the '&' in the text that would be
preceding the accelerator character.
If this text does not have an accelerator, -1 will be returned. */
static int qt_accAmpIndex(const QString &text)
{
#ifndef QT_NO_SHORTCUT
if (text.isEmpty())
return text;
return -1;
int fa = 0;
QChar ac;
@ -118,23 +116,42 @@ QString Q_WIDGETS_EXPORT qt_accHotKey(const QString &text)
if (fa < text.length()) {
// ignore "&&"
if (text.at(fa) == QLatin1Char('&')) {
++fa;
continue;
} else {
ac = text.at(fa);
return fa - 1;
break;
}
}
}
if (ac.isNull())
return QString();
return QKeySequence(Qt::ALT).toString(QKeySequence::NativeText) + ac.toUpper();
return -1;
#else
Q_UNUSED(text);
return QString();
return -1;
#endif
}
QString Q_WIDGETS_EXPORT qt_accStripAmp(const QString &text)
{
QString newText(text);
int ampIndex = qt_accAmpIndex(newText);
if (ampIndex != -1)
newText.remove(ampIndex, 1);
return newText.replace(QLatin1String("&&"), QLatin1String("&"));
}
QString Q_WIDGETS_EXPORT qt_accHotKey(const QString &text)
{
int ampIndex = qt_accAmpIndex(text);
if (ampIndex != -1)
return (QString)QKeySequence(Qt::ALT) + text.at(ampIndex + 1);
return QString();
}
class QAccessibleWidgetPrivate
{
public: