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

Remove Cursor functions from invokeMethod. 

Cursor position is handled by the text interface.
This was a binary compatibility hack in Qt 4.

Change-Id: I45520e6942a490834f6e9346a4c173300a9bf7a9
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
bb10
Frederik Gladhorn 2011-12-01 20:14:48 +01:00 committed by Qt by Nokia
parent dfa6ac160f
commit 41af951eef
5 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/accessible/qaccessible.h
View File

@ -298,9 +298,7 @@ public:
Q_DECLARE_FLAGS(Relation, RelationFlag)
enum Method {
ListSupportedMethods = 0,
SetCursorPosition = 1,
GetCursorPosition = 2
ListSupportedMethods = 0
};
enum InterfaceType

20
src/plugins/accessible/widgets/qaccessiblewidgets.cpp
View File

@ -282,26 +282,6 @@ void QAccessibleTextEdit::setText(QAccessible::Text t, const QString &text)
textEdit()->setText(text);
}
QVariant QAccessibleTextEdit::invokeMethod(QAccessible::Method method,
const QVariantList &params)
{
switch (method) {
case QAccessible::ListSupportedMethods: {
QSet<QAccessible::Method> set;
set << QAccessible::ListSupportedMethods << QAccessible::SetCursorPosition << QAccessible::GetCursorPosition;
return QVariant::fromValue(set | qvariant_cast<QSet<QAccessible::Method> >(
QAccessibleWidget::invokeMethod(method, params)));
}
case QAccessible::SetCursorPosition:
setCursorPosition(params.value(0).toInt());
return true;
case QAccessible::GetCursorPosition:
return textEdit()->textCursor().position();
default:
return QAccessibleWidget::invokeMethod(method, params);
}
}
void *QAccessibleTextEdit::interface_cast(QAccessible::InterfaceType t)
{
if (t == QAccessible::TextInterface)

1
src/plugins/accessible/widgets/qaccessiblewidgets.h
View File

@ -75,7 +75,6 @@ public:
QString text(QAccessible::Text t) const;
void setText(QAccessible::Text t, const QString &text);
QVariant invokeMethod(QAccessible::Method method, const QVariantList &params);
void *interface_cast(QAccessible::InterfaceType t);
// QAccessibleTextInterface

20
src/plugins/accessible/widgets/simplewidgets.cpp
View File

@ -601,26 +601,6 @@ QAccessible::State QAccessibleLineEdit::state() const
return state;
}
QVariant QAccessibleLineEdit::invokeMethod(QAccessible::Method method,
const QVariantList &params)
{
switch (method) {
case QAccessible::ListSupportedMethods: {
QSet<QAccessible::Method> set;
set << QAccessible::ListSupportedMethods << QAccessible::SetCursorPosition << QAccessible::GetCursorPosition;
return QVariant::fromValue(set | qvariant_cast<QSet<QAccessible::Method> >(
QAccessibleWidget::invokeMethod(method, params)));
}
case QAccessible::SetCursorPosition:
setCursorPosition(params.value(0).toInt());
return true;
case QAccessible::GetCursorPosition:
return cursorPosition();
default:
return QAccessibleWidget::invokeMethod(method, params);
}
}
void *QAccessibleLineEdit::interface_cast(QAccessible::InterfaceType t)
{
if (t == QAccessible::TextInterface)

1
src/plugins/accessible/widgets/simplewidgets.h
View File

@ -124,7 +124,6 @@ public:
QString text(QAccessible::Text t) const;
void setText(QAccessible::Text t, const QString &text);
QAccessible::State state() const;
QVariant invokeMethod(QAccessible::Method method, const QVariantList &params);
void *interface_cast(QAccessible::InterfaceType t);
// QAccessibleTextInterface