*/
QVariant QAccessibleInterface::invokeMethod(Method method, int child, const QVariantList ¶ms)
{
- if (!(state(0) & HasInvokeExtension))
- return QVariant();
-
- return static_cast<QAccessibleInterfaceEx *>(this)->invokeMethodEx(method, child, params);
+ Q_UNUSED(method)
+ Q_UNUSED(child)
+ Q_UNUSED(params)
+ return QVariant();
}
-QVariant QAccessibleInterfaceEx::virtual_hook(const QVariant &)
+QVariant QAccessibleInterface::virtual_hook(const QVariant &)
{
return QVariant();
}
/*! \internal */
QAccessible2Interface *QAccessibleInterface::cast_helper(QAccessible2::InterfaceType t)
{
- if (state(0) & HasInvokeExtension)
- return static_cast<QAccessibleInterfaceEx *>(this)->interface_cast(t);
- return 0;
+ return interface_cast(t);
}
QT_END_NAMESPACE
//AlertHigh = 0x10000000, /* reused for HasInvokeExtension */
Protected = 0x20000000,
HasPopup = 0x40000000,
- Modal = 0x80000000,
+ Modal = 0x80000000
- // #### Qt5 ManagesDescendants
- // #### Qt5 remove HasInvokeExtension
- HasInvokeExtension = 0x10000000 // internal
};
Q_DECLARE_FLAGS(State, StateFlag)
virtual QString actionText(int action, Text t, int child) const = 0;
virtual bool doAction(int action, int child, const QVariantList ¶ms = QVariantList()) = 0;
- QVariant invokeMethod(Method method, int child = 0,
+ virtual QVariant invokeMethod(Method method, int child = 0,
const QVariantList ¶ms = QVariantList());
inline QSet<Method> supportedMethods()
inline QAccessibleTable2Interface *table2Interface()
{ return reinterpret_cast<QAccessibleTable2Interface *>(cast_helper(QAccessible2::Table2Interface)); }
-private:
- QAccessible2Interface *cast_helper(QAccessible2::InterfaceType);
-};
-
-class Q_GUI_EXPORT QAccessibleInterfaceEx: public QAccessibleInterface
-{
-public:
- virtual QVariant invokeMethodEx(Method method, int child, const QVariantList ¶ms) = 0;
+ // FIXME
virtual QVariant virtual_hook(const QVariant &data);
virtual QAccessible2Interface *interface_cast(QAccessible2::InterfaceType)
{ return 0; }
-};
+private:
+ QAccessible2Interface *cast_helper(QAccessible2::InterfaceType);
+};
class Q_GUI_EXPORT QAccessibleEvent : public QEvent
{
return QAccessibleObject::actionText(action, text, child);
}
-// ### Qt 5: remove me - binary compatibility hack
-QAccessibleObjectEx::QAccessibleObjectEx(QObject *object)
-{
- d = new QAccessibleObjectPrivate;
- d->object = object;
-}
-bool QAccessibleObjectEx::isValid() const
-{ return reinterpret_cast<const QAccessibleObject *>(this)->QAccessibleObject::isValid(); }
-QObject *QAccessibleObjectEx::object() const
-{ return reinterpret_cast<const QAccessibleObject *>(this)->QAccessibleObject::object(); }
-QRect QAccessibleObjectEx::rect(int child) const
-{ return reinterpret_cast<const QAccessibleObject *>(this)->QAccessibleObject::rect(child); }
-void QAccessibleObjectEx::setText(Text t, int child, const QString &text)
-{ reinterpret_cast<QAccessibleObject *>(this)->QAccessibleObject::setText(t, child, text); }
-int QAccessibleObjectEx::userActionCount(int child) const
-{ return reinterpret_cast<const QAccessibleObject *>(this)->QAccessibleObject::userActionCount(child); }
-bool QAccessibleObjectEx::doAction(int action, int child, const QVariantList ¶ms)
-{ return reinterpret_cast<QAccessibleObject *>(this)->QAccessibleObject::doAction(action, child, params); }
-QString QAccessibleObjectEx::actionText(int action, Text t, int child) const
-{ return reinterpret_cast<const QAccessibleObject *>(this)->QAccessibleObject::actionText(action, t, child); }
-QAccessibleObjectEx::~QAccessibleObjectEx()
-{ delete d; }
-
QT_END_NAMESPACE
#endif //QT_NO_ACCESSIBILITY
virtual ~QAccessibleObject();
private:
- friend class QAccessibleObjectEx;
QAccessibleObjectPrivate *d;
Q_DISABLE_COPY(QAccessibleObject)
};
-class Q_GUI_EXPORT QAccessibleObjectEx : public QAccessibleInterfaceEx
-{
-public:
- explicit QAccessibleObjectEx(QObject *object);
-
- bool isValid() const;
- QObject *object() const;
-
- // properties
- QRect rect(int child) const;
- void setText(Text t, int child, const QString &text);
-
- // actions
- int userActionCount(int child) const;
- bool doAction(int action, int child, const QVariantList ¶ms);
- QString actionText(int action, Text t, int child) const;
-
-protected:
- virtual ~QAccessibleObjectEx();
-
-private:
- QAccessibleObjectPrivate *d;
- Q_DISABLE_COPY(QAccessibleObjectEx)
-};
-
class Q_GUI_EXPORT QAccessibleApplication : public QAccessibleObject
{
public:
return state;
}
-// ### Qt 5: remove me - binary compatibility hack
-QAccessibleWidgetEx::QAccessibleWidgetEx(QWidget *o, Role role, const QString& name)
- : QAccessibleObjectEx(o)
-{
- Q_ASSERT(widget());
- d = new QAccessibleWidgetPrivate();
- d->role = role;
- d->name = name;
- d->asking = 0;
-}
-
-int QAccessibleWidgetEx::childCount() const
-{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::childCount(); }
-int QAccessibleWidgetEx::indexOfChild(const QAccessibleInterface *child) const
-{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::indexOfChild(child); }
-QAccessible::Relation QAccessibleWidgetEx::relationTo(int child, const QAccessibleInterface *other, int otherChild) const
-{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::relationTo(child, other, otherChild); }
-
-int QAccessibleWidgetEx::childAt(int x, int y) const
-{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::childAt(x, y); }
-QRect QAccessibleWidgetEx::rect(int child) const
-{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::rect(child); }
-int QAccessibleWidgetEx::navigate(RelationFlag rel, int entry, QAccessibleInterface **target) const
-{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::navigate(rel, entry, target); }
-
-QString QAccessibleWidgetEx::text(Text t, int child) const
-{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::text(t, child); }
-QAccessible::Role QAccessibleWidgetEx::role(int child) const
-{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::role(child); }
-QAccessible::State QAccessibleWidgetEx::state(int child) const
-{ return (reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::state(child))
- | HasInvokeExtension; }
-
-QString QAccessibleWidgetEx::actionText(int action, Text t, int child) const
-{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::actionText(action, t, child); }
-bool QAccessibleWidgetEx::doAction(int action, int child, const QVariantList ¶ms)
-{ return reinterpret_cast<QAccessibleWidget *>(this)->QAccessibleWidget::doAction(action, child, params); }
-
-QAccessibleWidgetEx::~QAccessibleWidgetEx()
-{ delete d; }
-QWidget *QAccessibleWidgetEx::widget() const
-{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::widget(); }
-QObject *QAccessibleWidgetEx::parentObject() const
-{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::parentObject(); }
-
-void QAccessibleWidgetEx::addControllingSignal(const QString &signal)
-{ reinterpret_cast<QAccessibleWidget *>(this)->QAccessibleWidget::addControllingSignal(signal); }
-void QAccessibleWidgetEx::setValue(const QString &value)
-{ reinterpret_cast<QAccessibleWidget *>(this)->QAccessibleWidget::setValue(value); }
-void QAccessibleWidgetEx::setDescription(const QString &desc)
-{ reinterpret_cast<QAccessibleWidget *>(this)->QAccessibleWidget::setDescription(desc); }
-void QAccessibleWidgetEx::setHelp(const QString &help)
-{ reinterpret_cast<QAccessibleWidget *>(this)->QAccessibleWidget::setHelp(help); }
-void QAccessibleWidgetEx::setAccelerator(const QString &accel)
-{ reinterpret_cast<QAccessibleWidget *>(this)->QAccessibleWidget::setAccelerator(accel); }
-
-QVariant QAccessibleWidgetEx::invokeMethodEx(Method method, int child, const QVariantList & /*params*/)
+QVariant QAccessibleWidget::invokeMethod(Method method, int child, const QVariantList & /*params*/)
{
if (child)
return QVariant();
bool doAction(int action, int child, const QVariantList ¶ms);
#endif
+ QVariant invokeMethod(Method method, int child, const QVariantList ¶ms);
+
protected:
~QAccessibleWidget();
QWidget *widget() const;
void setAccelerator(const QString &accel);
private:
- friend class QAccessibleWidgetEx;
QAccessibleWidgetPrivate *d;
Q_DISABLE_COPY(QAccessibleWidget)
};
-class Q_GUI_EXPORT QAccessibleWidgetEx : public QAccessibleObjectEx
-{
-public:
- explicit QAccessibleWidgetEx(QWidget *o, Role r = Client, const QString& name = QString());
-
- int childCount() const;
- int indexOfChild(const QAccessibleInterface *child) const;
- Relation relationTo(int child, const QAccessibleInterface *other, int otherChild) const;
-
- int childAt(int x, int y) const;
- QRect rect(int child) const;
- int navigate(RelationFlag rel, int entry, QAccessibleInterface **target) const;
-
- QString text(Text t, int child) const;
- Role role(int child) const;
- State state(int child) const;
-
- QString actionText(int action, Text t, int child) const;
- bool doAction(int action, int child, const QVariantList ¶ms);
-
- QVariant invokeMethodEx(Method method, int child, const QVariantList ¶ms);
-
-protected:
- ~QAccessibleWidgetEx();
- QWidget *widget() const;
- QObject *parentObject() const;
-
- void addControllingSignal(const QString &signal);
- void setValue(const QString &value);
- void setDescription(const QString &desc);
- void setHelp(const QString &help);
- void setAccelerator(const QString &accel);
-
-private:
- QAccessibleWidgetPrivate *d;
- Q_DISABLE_COPY(QAccessibleWidgetEx)
-};
#endif // QT_NO_ACCESSIBILITY
bool QAccessibleItemView::isValid() const
{
if (atViewport())
- return QAccessibleWidgetEx::isValid();
+ return QAccessibleWidget::isValid();
else
return QAccessibleAbstractScrollArea::isValid();
}
Constructs a QAccessibleHeader object for \a w.
*/
QAccessibleHeader::QAccessibleHeader(QWidget *w)
-: QAccessibleWidgetEx(w)
+: QAccessibleWidget(w)
{
Q_ASSERT(header());
addControllingSignal(QLatin1String("sectionClicked(int)"));
QRect QAccessibleHeader::rect(int child) const
{
if (!child)
- return QAccessibleWidgetEx::rect(0);
+ return QAccessibleWidget::rect(0);
QHeaderView *h = header();
QPoint zero = h->mapToGlobal(QPoint(0, 0));
}
}
if (str.isEmpty())
- str = QAccessibleWidgetEx::text(t, child);
+ str = QAccessibleWidget::text(t, child);
return str;
}
/*! \reimp */
QAccessible::State QAccessibleHeader::state(int child) const
{
- State state = QAccessibleWidgetEx::state(child);
+ State state = QAccessibleWidget::state(child);
if (child) {
int section = child - 1;
Constructs a QAccessibleTabBar object for \a w.
*/
QAccessibleTabBar::QAccessibleTabBar(QWidget *w)
-: QAccessibleWidgetEx(w)
+: QAccessibleWidget(w)
{
Q_ASSERT(tabBar());
}
QRect QAccessibleTabBar::rect(int child) const
{
if (!child || !tabBar()->isVisible())
- return QAccessibleWidgetEx::rect(0);
+ return QAccessibleWidget::rect(0);
QPoint tp = tabBar()->mapToGlobal(QPoint(0,0));
QRect rec;
}
if (str.isEmpty())
- str = QAccessibleWidgetEx::text(t, child);;
+ str = QAccessibleWidget::text(t, child);;
return str;
}
/*! \reimp */
int QAccessibleTabBar::navigate(RelationFlag relation, int entry, QAccessibleInterface** target) const
{
- //QAccessibleWidgetEx::navigate might think that this is not a complex widget
+ //QAccessibleWidget::navigate might think that this is not a complex widget
//if close buttons are enabled, so this functions handles those cases in which
//the value to return is different if it's a complex widget and if it's not.
if (!target)
return entry;
return -1;
default:
- return QAccessibleWidgetEx::navigate(relation, entry, target);
+ return QAccessibleWidget::navigate(relation, entry, target);
}
}
/*! \reimp */
QAccessible::State QAccessibleTabBar::state(int child) const
{
- State st = QAccessibleWidgetEx::state(0);
+ State st = QAccessibleWidget::state(0);
if (!child)
return st;
Constructs a QAccessibleComboBox object for \a w.
*/
QAccessibleComboBox::QAccessibleComboBox(QWidget *w)
-: QAccessibleWidgetEx(w, ComboBox)
+: QAccessibleWidget(w, ComboBox)
{
Q_ASSERT(comboBox());
}
sc = QStyle::SC_ComboBoxArrow;
break;
default:
- return QAccessibleWidgetEx::rect(child);
+ return QAccessibleWidget::rect(child);
}
if (sc != QStyle::SC_None) {
default:
break;
}
- return QAccessibleWidgetEx::navigate(rel, entry, target);
+ return QAccessibleWidget::navigate(rel, entry, target);
}
/*! \reimp */
if (child == OpenList)
str = QComboBox::tr("Open");
else
- str = QAccessibleWidgetEx::text(t, 0);
+ str = QAccessibleWidget::text(t, 0);
break;
#endif
case Value:
break;
}
if (str.isEmpty())
- str = QAccessibleWidgetEx::text(t, 0);
+ str = QAccessibleWidget::text(t, 0);
return str;
}
/*! \reimp */
QAccessible::State QAccessibleComboBox::state(int /*child*/) const
{
- return QAccessibleWidgetEx::state(0);
+ return QAccessibleWidget::state(0);
}
/*! \reimp */
#ifndef QT_NO_SCROLLAREA
// ======================= QAccessibleAbstractScrollArea =======================
QAccessibleAbstractScrollArea::QAccessibleAbstractScrollArea(QWidget *widget)
- : QAccessibleWidgetEx(widget, Client)
+ : QAccessibleWidget(widget, Client)
{
Q_ASSERT(qobject_cast<QAbstractScrollArea *>(widget));
}
QString QAccessibleAbstractScrollArea::text(Text textType, int child) const
{
if (child == Self)
- return QAccessibleWidgetEx::text(textType, 0);
+ return QAccessibleWidget::text(textType, 0);
QWidgetList children = accessibleChildren();
if (child < 1 || child > children.count())
return QString();
if (text.isEmpty())
return;
if (child == 0) {
- QAccessibleWidgetEx::setText(textType, 0, text);
+ QAccessibleWidget::setText(textType, 0, text);
return;
}
QWidgetList children = accessibleChildren();
QAccessible::State QAccessibleAbstractScrollArea::state(int child) const
{
if (child == Self)
- return QAccessibleWidgetEx::state(child);
+ return QAccessibleWidget::state(child);
QWidgetList children = accessibleChildren();
if (child < 1 || child > children.count())
- return QAccessibleWidgetEx::state(Self);
+ return QAccessibleWidget::state(Self);
QAccessibleInterface *childInterface = queryAccessibleInterface(children.at(child - 1));
if (!childInterface)
- return QAccessibleWidgetEx::state(Self);
+ return QAccessibleWidget::state(Self);
QAccessible::State returnState = childInterface->state(0);
delete childInterface;
return returnState;
}
-QVariant QAccessibleAbstractScrollArea::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleAbstractScrollArea::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
bool QAccessibleAbstractScrollArea::isValid() const
{
- return (QAccessibleWidgetEx::isValid() && abstractScrollArea() && abstractScrollArea()->viewport());
+ return (QAccessibleWidget::isValid() && abstractScrollArea() && abstractScrollArea()->viewport());
}
int QAccessibleAbstractScrollArea::navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const
break;
}
} else {
- return QAccessibleWidgetEx::navigate(relation, entry, target);
+ return QAccessibleWidget::navigate(relation, entry, target);
}
if (qobject_cast<const QScrollBar *>(targetWidget))
if (!abstractScrollArea()->isVisible())
return QRect();
if (child == Self)
- return QAccessibleWidgetEx::rect(child);
+ return QAccessibleWidget::rect(child);
QWidgetList children = accessibleChildren();
if (child < 1 || child > children.count())
return QRect();
class QScrollArea;
#ifndef QT_NO_SCROLLAREA
-class QAccessibleAbstractScrollArea : public QAccessibleWidgetEx
+class QAccessibleAbstractScrollArea : public QAccessibleWidget
{
public:
explicit QAccessibleAbstractScrollArea(QWidget *widget);
QString text(Text textType, int child) const;
void setText(Text textType, int child, const QString &text);
State state(int child) const;
- QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList ¶ms);
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
bool isValid() const;
#endif // QT_NO_SCROLLAREA
#ifndef QT_NO_ITEMVIEWS
-class QAccessibleHeader : public QAccessibleWidgetEx
+class QAccessibleHeader : public QAccessibleWidget
{
Q_ACCESSIBLE_OBJECT
public:
#endif
#ifndef QT_NO_TABBAR
-class QAccessibleTabBar : public QAccessibleWidgetEx
+class QAccessibleTabBar : public QAccessibleWidget
{
Q_ACCESSIBLE_OBJECT
public:
#endif // QT_NO_TABBAR
#ifndef QT_NO_COMBOBOX
-class QAccessibleComboBox : public QAccessibleWidgetEx
+class QAccessibleComboBox : public QAccessibleWidget
{
Q_ACCESSIBLE_OBJECT
public:
}
QAccessibleTable2::QAccessibleTable2(QWidget *w)
- : QAccessibleObjectEx(w)
+ : QAccessibleObject(w)
{
Q_ASSERT(view());
QAccessible::State QAccessibleTable2::state(int child) const
{
Q_ASSERT(child == 0);
- return QAccessible::Normal | HasInvokeExtension;
+ return QAccessible::Normal;
}
int QAccessibleTable2::childAt(int x, int y) const
class QAccessibleTable2Cell;
class QAccessibleTable2HeaderCell;
-class QAccessibleTable2: public QAccessibleTable2Interface, public QAccessibleObjectEx
+class QAccessibleTable2 :public QAccessibleTable2Interface, public QAccessibleObject
{
Q_ACCESSIBLE_OBJECT
public:
} else if (classname == QLatin1String("QAbstractButton")) {
iface = new QAccessibleButton(widget, PushButton);
} else if (classname == QLatin1String("QDialog")) {
- iface = new QAccessibleWidgetEx(widget, Dialog);
+ iface = new QAccessibleWidget(widget, Dialog);
} else if (classname == QLatin1String("QMessageBox")) {
- iface = new QAccessibleWidgetEx(widget, AlertMessage);
+ iface = new QAccessibleWidget(widget, AlertMessage);
#ifndef QT_NO_MAINWINDOW
} else if (classname == QLatin1String("QMainWindow")) {
iface = new QAccessibleMainWindow(widget);
iface = new QAccessibleProgressBar(widget);
#endif
} else if (classname == QLatin1String("QToolBar")) {
- iface = new QAccessibleWidgetEx(widget, ToolBar, widget->windowTitle());
+ iface = new QAccessibleWidget(widget, ToolBar, widget->windowTitle());
#ifndef QT_NO_MENUBAR
} else if (classname == QLatin1String("QMenuBar")) {
iface = new QAccessibleMenuBar(widget);
iface = new QAccessibleTabBar(widget);
#endif
} else if (classname == QLatin1String("QWorkspaceChild")) {
- iface = new QAccessibleWidgetEx(widget, Window);
+ iface = new QAccessibleWidget(widget, Window);
} else if (classname == QLatin1String("QSizeGrip")) {
- iface = new QAccessibleWidgetEx(widget, Grip);
+ iface = new QAccessibleWidget(widget, Grip);
#ifndef QT_NO_SPLITTER
} else if (classname == QLatin1String("QSplitter")) {
- iface = new QAccessibleWidgetEx(widget, Splitter);
+ iface = new QAccessibleWidget(widget, Splitter);
} else if (classname == QLatin1String("QSplitterHandle")) {
- iface = new QAccessibleWidgetEx(widget, Grip);
+ iface = new QAccessibleWidget(widget, Grip);
#endif
#ifndef QT_NO_TEXTEDIT
} else if (classname == QLatin1String("QTextEdit")) {
#endif
#ifndef QT_NO_RUBBERBAND
} else if (classname == QLatin1String("QRubberBand")) {
- iface = new QAccessibleWidgetEx(widget, QAccessible::Border);
+ iface = new QAccessibleWidget(widget, QAccessible::Border);
#endif
#ifndef QT_NO_TEXTBROWSER
} else if (classname == QLatin1String("QTextBrowser")) {
QString Q_GUI_EXPORT qt_accHotKey(const QString &text);
QAccessibleMenu::QAccessibleMenu(QWidget *w)
-: QAccessibleWidgetEx(w)
+: QAccessibleWidget(w)
{
Q_ASSERT(menu());
}
QRect QAccessibleMenu::rect(int child) const
{
if (!child || child > childCount())
- return QAccessibleWidgetEx::rect(child);
+ return QAccessibleWidget::rect(child);
QRect r = menu()->actionGeometry(menu()->actions()[child - 1]);
QPoint tlp = menu()->mapToGlobal(QPoint(0,0));
QString QAccessibleMenu::text(Text t, int child) const
{
- QString tx = QAccessibleWidgetEx::text(t, child);
+ QString tx = QAccessibleWidget::text(t, child);
if (!child && tx.size())
return tx;
QAccessible::State QAccessibleMenu::state(int child) const
{
- State s = QAccessibleWidgetEx::state(child);
+ State s = QAccessibleWidget::state(child);
if (!child)
return s;
return QMenu::tr("Execute");
}
- return QAccessibleWidgetEx::actionText(action, text, child);
+ return QAccessibleWidget::actionText(action, text, child);
}
bool QAccessibleMenu::doAction(int act, int child, const QVariantList &)
delete iface;
}
} else {
- return QAccessibleWidgetEx::navigate(relation, entry, target);
+ return QAccessibleWidget::navigate(relation, entry, target);
}
break;}
default:
- return QAccessibleWidgetEx::navigate(relation, entry, target);
+ return QAccessibleWidget::navigate(relation, entry, target);
}
#ifndef QT_NO_MENUBAR
QAccessibleMenuBar::QAccessibleMenuBar(QWidget *w)
-: QAccessibleWidgetEx(w)
+: QAccessibleWidget(w)
{
Q_ASSERT(menuBar());
}
QRect QAccessibleMenuBar::rect(int child) const
{
if (!child)
- return QAccessibleWidgetEx::rect(child);
+ return QAccessibleWidget::rect(child);
QRect r = menuBar()->actionGeometry(menuBar()->actions()[child - 1]);
QPoint tlp = menuBar()->mapToGlobal(QPoint(0,0));
}
break;
default:
- return QAccessibleWidgetEx::navigate(relation, entry, target);
+ return QAccessibleWidget::navigate(relation, entry, target);
}
}
}
if (str.isEmpty())
- str = QAccessibleWidgetEx::text(t, child);
+ str = QAccessibleWidget::text(t, child);
return str;
}
QAccessible::State QAccessibleMenuBar::state(int child) const
{
- State s = QAccessibleWidgetEx::state(child);
+ State s = QAccessibleWidget::state(child);
if (!child)
return s;
return QMenu::tr("Execute");
}
- return QAccessibleWidgetEx::actionText(action, text, child);
+ return QAccessibleWidget::actionText(action, text, child);
}
bool QAccessibleMenuBar::doAction(int act, int child, const QVariantList &)
delete iface;
}
}
- return s | HasInvokeExtension;;
+ return s;
}
QString QAccessibleMenuItem::text ( Text t, int child ) const
class QMenuBar;
class QAction;
-class QAccessibleMenu : public QAccessibleWidgetEx
+class QAccessibleMenu : public QAccessibleWidget
{
public:
explicit QAccessibleMenu(QWidget *w);
};
#ifndef QT_NO_MENUBAR
-class QAccessibleMenuBar : public QAccessibleWidgetEx
+class QAccessibleMenuBar : public QAccessibleWidget
{
public:
explicit QAccessibleMenuBar(QWidget *w);
-class QAccessibleMenuItem : public QAccessibleActionInterface, public QAccessibleInterfaceEx
+class QAccessibleMenuItem : public QAccessibleActionInterface, public QAccessibleInterface
{
Q_ACCESSIBLE_OBJECT
public:
: QAccessibleTextWidget(o, EditableText)
{
Q_ASSERT(widget()->inherits("QTextEdit"));
- childOffset = QAccessibleWidgetEx::childCount();
+ childOffset = QAccessibleWidget::childCount();
}
/*! Returns the text edit. */
QRect QAccessibleTextEdit::rect(int child) const
{
if (child <= childOffset)
- return QAccessibleWidgetEx::rect(child);
+ return QAccessibleWidget::rect(child);
QTextEdit *edit = textEdit();
QTextBlock block = qTextBlockAt(edit->document(), child - childOffset - 1);
if (block.isValid())
return qTextBlockPosition(block) + childOffset;
- return QAccessibleWidgetEx::childAt(x, y);
+ return QAccessibleWidget::childAt(x, y);
}
/*! \reimp */
return textEdit()->toPlainText();
}
- return QAccessibleWidgetEx::text(t, child);
+ return QAccessibleWidget::text(t, child);
}
/*! \reimp */
void QAccessibleTextEdit::setText(Text t, int child, const QString &text)
{
if (t != Value || (child > 0 && child <= childOffset)) {
- QAccessibleWidgetEx::setText(t, child, text);
+ QAccessibleWidget::setText(t, child, text);
return;
}
if (textEdit()->isReadOnly())
{
if (child > childOffset)
return EditableText;
- return QAccessibleWidgetEx::role(child);
+ return QAccessibleWidget::role(child);
}
-QVariant QAccessibleTextEdit::invokeMethodEx(QAccessible::Method method, int child,
+QVariant QAccessibleTextEdit::invokeMethod(QAccessible::Method method, int child,
const QVariantList ¶ms)
{
if (child)
QSet<QAccessible::Method> set;
set << ListSupportedMethods << SetCursorPosition << GetCursorPosition;
return QVariant::fromValue(set | qvariant_cast<QSet<QAccessible::Method> >(
- QAccessibleWidgetEx::invokeMethodEx(method, child, params)));
+ QAccessibleWidget::invokeMethod(method, child, params)));
}
case SetCursorPosition:
setCursorPosition(params.value(0).toInt());
case GetCursorPosition:
return textEdit()->textCursor().position();
default:
- return QAccessibleWidgetEx::invokeMethodEx(method, child, params);
+ return QAccessibleWidget::invokeMethod(method, child, params);
}
}
#ifndef QT_NO_STACKEDWIDGET
// ======================= QAccessibleStackedWidget ======================
QAccessibleStackedWidget::QAccessibleStackedWidget(QWidget *widget)
- : QAccessibleWidgetEx(widget, LayeredPane)
+ : QAccessibleWidget(widget, LayeredPane)
{
Q_ASSERT(qobject_cast<QStackedWidget *>(widget));
}
-QVariant QAccessibleStackedWidget::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleStackedWidget::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
targetObject = stackedWidget()->widget(entry-1);
break;
default:
- return QAccessibleWidgetEx::navigate(relation, entry, target);
+ return QAccessibleWidget::navigate(relation, entry, target);
}
*target = QAccessible::queryAccessibleInterface(targetObject);
return *target ? 0 : -1;
#ifndef QT_NO_TOOLBOX
// ======================= QAccessibleToolBox ======================
QAccessibleToolBox::QAccessibleToolBox(QWidget *widget)
- : QAccessibleWidgetEx(widget, LayeredPane)
+ : QAccessibleWidget(widget, LayeredPane)
{
Q_ASSERT(qobject_cast<QToolBox *>(widget));
}
QString QAccessibleToolBox::text(Text textType, int child) const
{
if (textType != Value || child <= 0 || child > toolBox()->count())
- return QAccessibleWidgetEx::text(textType, child);
+ return QAccessibleWidget::text(textType, child);
return toolBox()->itemText(child - 1);
}
void QAccessibleToolBox::setText(Text textType, int child, const QString &text)
{
if (textType != Value || child <= 0 || child > toolBox()->count()) {
- QAccessibleWidgetEx::setText(textType, child, text);
+ QAccessibleWidget::setText(textType, child, text);
return;
}
toolBox()->setItemText(child - 1, text);
{
QWidget *childWidget = toolBox()->widget(child - 1);
if (!childWidget)
- return QAccessibleWidgetEx::state(child);
+ return QAccessibleWidget::state(child);
QAccessible::State childState = QAccessible::Normal;
if (toolBox()->currentWidget() == childWidget)
childState |= QAccessible::Expanded;
return childState;
}
-QVariant QAccessibleToolBox::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleToolBox::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
{
*target = 0;
if (entry <= 0 || entry > toolBox()->count())
- return QAccessibleWidgetEx::navigate(relation, entry, target);
+ return QAccessibleWidget::navigate(relation, entry, target);
int index = -1;
if (relation == QAccessible::Up)
index = entry - 2;
// ======================= QAccessibleMdiArea ======================
#ifndef QT_NO_MDIAREA
QAccessibleMdiArea::QAccessibleMdiArea(QWidget *widget)
- : QAccessibleWidgetEx(widget, LayeredPane)
+ : QAccessibleWidget(widget, LayeredPane)
{
Q_ASSERT(qobject_cast<QMdiArea *>(widget));
}
QAccessible::State QAccessibleMdiArea::state(int child) const
{
if (child < 0)
- return QAccessibleWidgetEx::state(child);
+ return QAccessibleWidget::state(child);
if (child == 0)
return QAccessible::Normal;
QList<QMdiSubWindow *> subWindows = mdiArea()->subWindowList();
if (subWindows.isEmpty() || child > subWindows.count())
- return QAccessibleWidgetEx::state(child);
+ return QAccessibleWidget::state(child);
if (subWindows.at(child - 1) == mdiArea()->activeSubWindow())
return QAccessible::Focused;
return QAccessible::Normal;
}
-QVariant QAccessibleMdiArea::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleMdiArea::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
targetObject = mdiAreaNavigate(mdiArea(), relation, entry);
break;
default:
- return QAccessibleWidgetEx::navigate(relation, entry, target);
+ return QAccessibleWidget::navigate(relation, entry, target);
}
*target = QAccessible::queryAccessibleInterface(targetObject);
return *target ? 0: -1;
// ======================= QAccessibleMdiSubWindow ======================
QAccessibleMdiSubWindow::QAccessibleMdiSubWindow(QWidget *widget)
- : QAccessibleWidgetEx(widget, QAccessible::Window)
+ : QAccessibleWidget(widget, QAccessible::Window)
{
Q_ASSERT(qobject_cast<QMdiSubWindow *>(widget));
}
title.replace(QLatin1String("[*]"), QLatin1String(""));
return title;
}
- return QAccessibleWidgetEx::text(textType, child);
+ return QAccessibleWidget::text(textType, child);
}
void QAccessibleMdiSubWindow::setText(Text textType, int child, const QString &text)
if (textType == QAccessible::Name && (child == 0 || child == 1))
mdiSubWindow()->setWindowTitle(text);
else
- QAccessibleWidgetEx::setText(textType, child, text);
+ QAccessibleWidget::setText(textType, child, text);
}
QAccessible::State QAccessibleMdiSubWindow::state(int child) const
{
if (child != 0 || !mdiSubWindow()->parent())
- return QAccessibleWidgetEx::state(child);
+ return QAccessibleWidget::state(child);
QAccessible::State state = QAccessible::Normal | QAccessible::Focusable;
if (!mdiSubWindow()->isMaximized())
state |= (QAccessible::Movable | QAccessible::Sizeable);
return state;
}
-QVariant QAccessibleMdiSubWindow::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleMdiSubWindow::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
*target = 0;
if (!mdiSubWindow()->parent())
- return QAccessibleWidgetEx::navigate(relation, entry, target);
+ return QAccessibleWidget::navigate(relation, entry, target);
QWidget *targetObject = 0;
QMdiSubWindow *source = mdiSubWindow();
break;
}
default:
- return QAccessibleWidgetEx::navigate(relation, entry, target);
+ return QAccessibleWidget::navigate(relation, entry, target);
}
*target = QAccessible::queryAccessibleInterface(targetObject);
return *target ? 0: -1;
if (mdiSubWindow()->isHidden())
return QRect();
if (!mdiSubWindow()->parent())
- return QAccessibleWidgetEx::rect(child);
+ return QAccessibleWidget::rect(child);
const QPoint pos = mdiSubWindow()->mapToGlobal(QPoint(0, 0));
if (child == 0)
return QRect(pos, mdiSubWindow()->size());
if (!mdiSubWindow()->isVisible())
return -1;
if (!mdiSubWindow()->parent())
- return QAccessibleWidgetEx::childAt(x, y);
+ return QAccessibleWidget::childAt(x, y);
const QRect globalGeometry = rect(0);
if (!globalGeometry.isValid())
return -1;
// ======================= QAccessibleWorkspace ======================
#ifndef QT_NO_WORKSPACE
QAccessibleWorkspace::QAccessibleWorkspace(QWidget *widget)
- : QAccessibleWidgetEx(widget, LayeredPane)
+ : QAccessibleWidget(widget, LayeredPane)
{
Q_ASSERT(qobject_cast<QWorkspace *>(widget));
}
QAccessible::State QAccessibleWorkspace::state(int child) const
{
if (child < 0)
- return QAccessibleWidgetEx::state(child);
+ return QAccessibleWidget::state(child);
if (child == 0)
return QAccessible::Normal;
QWidgetList subWindows = workspace()->windowList();
if (subWindows.isEmpty() || child > subWindows.count())
- return QAccessibleWidgetEx::state(child);
+ return QAccessibleWidget::state(child);
if (subWindows.at(child - 1) == workspace()->activeWindow())
return QAccessible::Focused;
return QAccessible::Normal;
}
-QVariant QAccessibleWorkspace::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleWorkspace::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
targetObject = mdiAreaNavigate(workspace(), relation, entry);
break;
default:
- return QAccessibleWidgetEx::navigate(relation, entry, target);
+ return QAccessibleWidget::navigate(relation, entry, target);
}
*target = QAccessible::queryAccessibleInterface(targetObject);
return *target ? 0: -1;
#ifndef QT_NO_DIALOGBUTTONBOX
// ======================= QAccessibleDialogButtonBox ======================
QAccessibleDialogButtonBox::QAccessibleDialogButtonBox(QWidget *widget)
- : QAccessibleWidgetEx(widget, Grouping)
+ : QAccessibleWidget(widget, Grouping)
{
Q_ASSERT(qobject_cast<QDialogButtonBox*>(widget));
}
-QVariant QAccessibleDialogButtonBox::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleDialogButtonBox::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
#ifndef QT_NO_CALENDARWIDGET
// ===================== QAccessibleCalendarWidget ========================
QAccessibleCalendarWidget::QAccessibleCalendarWidget(QWidget *widget)
- : QAccessibleWidgetEx(widget, Table)
+ : QAccessibleWidget(widget, Table)
{
Q_ASSERT(qobject_cast<QCalendarWidget *>(widget));
}
-QVariant QAccessibleCalendarWidget::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleCalendarWidget::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
{
*target = 0;
if (entry <= 0 || entry > childCount())
- return QAccessibleWidgetEx::navigate(relation, entry, target);
+ return QAccessibleWidget::navigate(relation, entry, target);
QWidget *targetWidget = 0;
switch (relation) {
case Child:
targetWidget = calendarView();
break;
default:
- return QAccessibleWidgetEx::navigate(relation, entry, target);
+ return QAccessibleWidget::navigate(relation, entry, target);
}
*target = queryAccessibleInterface(targetWidget);
return *target ? 0: -1;
if (!calendarWidget()->isVisible() || child > childCount())
return QRect();
if (child == 0)
- return QAccessibleWidgetEx::rect(child);
+ return QAccessibleWidget::rect(child);
QWidget *childWidget = 0;
if (childCount() == 2)
childWidget = child == 1 ? navigationBar() : calendarView();
#ifndef QT_NO_DOCKWIDGET
QAccessibleDockWidget::QAccessibleDockWidget(QWidget *widget)
- : QAccessibleWidgetEx(widget, Window)
+ : QAccessibleWidget(widget, Window)
{
}
*iface = 0;
return -1;
}
- return QAccessibleWidgetEx::navigate(relation, entry, iface);
+ return QAccessibleWidget::navigate(relation, entry, iface);
}
int QAccessibleDockWidget::childAt(int x, int y) const
QAccessible::State QAccessibleDockWidget::state(int child) const
{
//### mark tabified widgets as invisible
- return QAccessibleWidgetEx::state(child);
+ return QAccessibleWidget::state(child);
}
QRect QAccessibleDockWidget::rect (int child ) const
return rect;
}
-QVariant QAccessibleDockWidget::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleDockWidget::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
#endif // QT_NO_DOCKWIDGET
QAccessibleTextWidget::QAccessibleTextWidget(QWidget* o, QAccessible::Role r, const QString& name):
- QAccessibleWidgetEx(o, r, name)
+ QAccessibleWidget(o, r, name)
{
}
#ifndef QT_NO_MAINWINDOW
QAccessibleMainWindow::QAccessibleMainWindow(QWidget *widget)
- : QAccessibleWidgetEx(widget, Window) { }
+ : QAccessibleWidget(widget, Window) { }
-QVariant QAccessibleMainWindow::invokeMethodEx(QAccessible::Method /*method*/, int /*child*/, const QVariantList & /*params*/)
+QVariant QAccessibleMainWindow::invokeMethod(QAccessible::Method /*method*/, int /*child*/, const QVariantList & /*params*/)
{
return QVariant();
}
return *iface ? 0 : -1;
}
}
- return QAccessibleWidgetEx::navigate(relation, entry, iface);
+ return QAccessibleWidget::navigate(relation, entry, iface);
}
int QAccessibleMainWindow::childAt(int x, int y) const
class QTextCursor;
class QTextDocument;
-class QAccessibleTextWidget : public QAccessibleWidgetEx,
+class QAccessibleTextWidget : public QAccessibleWidget,
public QAccessibleTextInterface,
public QAccessibleEditableTextInterface
{
void setText(Text t, int control, const QString &text);
Role role(int child) const;
- QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList ¶ms);
QRect rect(int child) const;
int childAt(int x, int y) const;
};
#endif // QT_NO_TEXTEDIT
-class QAccessibleStackedWidget : public QAccessibleWidgetEx
+class QAccessibleStackedWidget : public QAccessibleWidget
{
Q_ACCESSIBLE_OBJECT
public:
explicit QAccessibleStackedWidget(QWidget *widget);
- QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList ¶ms);
int childAt(int x, int y) const;
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
QStackedWidget *stackedWidget() const;
};
-class QAccessibleToolBox : public QAccessibleWidgetEx
+class QAccessibleToolBox : public QAccessibleWidget
{
Q_ACCESSIBLE_OBJECT
public:
QString text(Text textType, int child) const;
void setText(Text textType, int child, const QString &text);
State state(int child) const;
- QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList ¶ms);
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
int navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const;
};
#ifndef QT_NO_MDIAREA
-class QAccessibleMdiArea : public QAccessibleWidgetEx
+class QAccessibleMdiArea : public QAccessibleWidget
{
public:
explicit QAccessibleMdiArea(QWidget *widget);
State state(int child) const;
- QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList ¶ms);
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
int navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const;
QMdiArea *mdiArea() const;
};
-class QAccessibleMdiSubWindow : public QAccessibleWidgetEx
+class QAccessibleMdiSubWindow : public QAccessibleWidget
{
public:
explicit QAccessibleMdiSubWindow(QWidget *widget);
QString text(Text textType, int child) const;
void setText(Text textType, int child, const QString &text);
State state(int child) const;
- QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList ¶ms);
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
int navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const;
#endif // QT_NO_MDIAREA
#ifndef QT_NO_WORKSPACE
-class QAccessibleWorkspace : public QAccessibleWidgetEx
+class QAccessibleWorkspace : public QAccessibleWidget
{
public:
explicit QAccessibleWorkspace(QWidget *widget);
State state(int child) const;
- QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList ¶ms);
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
int navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const;
};
#endif
-class QAccessibleDialogButtonBox : public QAccessibleWidgetEx
+class QAccessibleDialogButtonBox : public QAccessibleWidget
{
public:
explicit QAccessibleDialogButtonBox(QWidget *widget);
- QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList ¶ms);
};
#ifndef QT_NO_TEXTBROWSER
#endif // QT_NO_TEXTBROWSER
#ifndef QT_NO_CALENDARWIDGET
-class QAccessibleCalendarWidget : public QAccessibleWidgetEx
+class QAccessibleCalendarWidget : public QAccessibleWidget
{
public:
explicit QAccessibleCalendarWidget(QWidget *widget);
- QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList ¶ms);
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
int navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const;
#endif // QT_NO_CALENDARWIDGET
#ifndef QT_NO_DOCKWIDGET
-class QAccessibleDockWidget: public QAccessibleWidgetEx
+class QAccessibleDockWidget: public QAccessibleWidget
{
public:
explicit QAccessibleDockWidget(QWidget *widget);
State state(int child) const;
int childAt(int x, int y) const;
- QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList ¶ms);
QDockWidget *dockWidget() const;
};
#endif // QT_NO_DOCKWIDGET
#ifndef QT_NO_MAINWINDOW
-class QAccessibleMainWindow : public QAccessibleWidgetEx
+class QAccessibleMainWindow : public QAccessibleWidget
{
public:
explicit QAccessibleMainWindow(QWidget *widget);
- QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList ¶ms);
int childCount() const;
int navigate(RelationFlag relation, int entry, QAccessibleInterface **iface) const;
int indexOfChild(const QAccessibleInterface *iface) const;
#ifndef QT_NO_SPINBOX
QAccessibleAbstractSpinBox::QAccessibleAbstractSpinBox(QWidget *w)
-: QAccessibleWidgetEx(w, SpinBox)
+: QAccessibleWidget(w, SpinBox)
{
Q_ASSERT(abstractSpinBox());
}
default:
break;
}
- return QAccessibleWidgetEx::navigate(rel, entry, target);
+ return QAccessibleWidget::navigate(rel, entry, target);
}
/*! \reimp */
default:
break;
}
- return QAccessibleWidgetEx::text(t, 0);
+ return QAccessibleWidget::text(t, 0);
}
/*! \reimp */
default:
break;
}
- return QAccessibleWidgetEx::role(child);
+ return QAccessibleWidget::role(child);
}
/*! \reimp */
break;
}
}
- return QAccessibleWidgetEx::doAction(action, 0, params);
+ return QAccessibleWidget::doAction(action, 0, params);
}
QVariant QAccessibleAbstractSpinBox::currentValue()
return abstractSpinBox()->property("minimum");
}
-QVariant QAccessibleAbstractSpinBox::invokeMethodEx(Method method, int child, const QVariantList ¶ms)
+QVariant QAccessibleAbstractSpinBox::invokeMethod(Method method, int child, const QVariantList ¶ms)
{
switch (method) {
case ListSupportedMethods: {
QSet<QAccessible::Method> set;
set << ListSupportedMethods;
return QVariant::fromValue(set | qvariant_cast<QSet<QAccessible::Method> >(
- QAccessibleWidgetEx::invokeMethodEx(method, child, params)));
+ QAccessibleWidget::invokeMethod(method, child, params)));
}
default:
- return QAccessibleWidgetEx::invokeMethodEx(method, child, params);
+ return QAccessibleWidget::invokeMethod(method, child, params);
}
}
// ================================== QAccessibleDoubleSpinBox ==================================
QAccessibleDoubleSpinBox::QAccessibleDoubleSpinBox(QWidget *widget)
- : QAccessibleWidgetEx(widget, SpinBox)
+ : QAccessibleWidget(widget, SpinBox)
{
Q_ASSERT(qobject_cast<QDoubleSpinBox *>(widget));
addControllingSignal(QLatin1String("valueChanged(double)"));
int QAccessibleDoubleSpinBox::navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const
{
if (entry <= 0)
- return QAccessibleWidgetEx::navigate(relation, entry, target);
+ return QAccessibleWidget::navigate(relation, entry, target);
*target = 0;
switch (relation) {
default:
break;
}
- return QAccessibleWidgetEx::navigate(relation, entry, target);
+ return QAccessibleWidget::navigate(relation, entry, target);
}
-QVariant QAccessibleDoubleSpinBox::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleDoubleSpinBox::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
default:
break;
}
- return QAccessibleWidgetEx::text(textType, 0);
+ return QAccessibleWidget::text(textType, 0);
}
/*! \reimp */
default:
break;
}
- return QAccessibleWidgetEx::role(child);
+ return QAccessibleWidget::role(child);
}
/*! \reimp */
QAccessible::State QAccessibleDoubleSpinBox::state(int child) const
{
- State state = QAccessibleWidgetEx::state(child);
+ State state = QAccessibleWidget::state(child);
switch (child) {
case ValueUp:
if (doubleSpinBox()->value() >= doubleSpinBox()->maximum())
/*!
Constructs a QAccessibleScrollBar object for \a w.
- \a name is propagated to the QAccessibleWidgetEx constructor.
+ \a name is propagated to the QAccessibleWidget constructor.
*/
QAccessibleScrollBar::QAccessibleScrollBar(QWidget *w)
: QAccessibleAbstractSlider(w, ScrollBar)
/*!
Constructs a QAccessibleScrollBar object for \a w.
- \a name is propagated to the QAccessibleWidgetEx constructor.
+ \a name is propagated to the QAccessibleWidget constructor.
*/
QAccessibleSlider::QAccessibleSlider(QWidget *w)
: QAccessibleAbstractSlider(w)
}
QAccessibleAbstractSlider::QAccessibleAbstractSlider(QWidget *w, Role r)
- : QAccessibleWidgetEx(w, r)
+ : QAccessibleWidget(w, r)
{
Q_ASSERT(qobject_cast<QAbstractSlider *>(w));
}
-QVariant QAccessibleAbstractSlider::invokeMethodEx(Method method, int child, const QVariantList ¶ms)
+QVariant QAccessibleAbstractSlider::invokeMethod(Method method, int child, const QVariantList ¶ms)
{
switch (method) {
case ListSupportedMethods: {
QSet<QAccessible::Method> set;
set << ListSupportedMethods;
return QVariant::fromValue(set | qvariant_cast<QSet<QAccessible::Method> >(
- QAccessibleWidgetEx::invokeMethodEx(method, child, params)));
+ QAccessibleWidget::invokeMethod(method, child, params)));
}
default:
- return QAccessibleWidgetEx::invokeMethodEx(method, child, params);
+ return QAccessibleWidget::invokeMethod(method, child, params);
}
}
#ifndef QT_NO_DIAL
// ======================================= QAccessibleDial ======================================
QAccessibleDial::QAccessibleDial(QWidget *widget)
- : QAccessibleWidgetEx(widget, Dial)
+ : QAccessibleWidget(widget, Dial)
{
Q_ASSERT(qobject_cast<QDial *>(widget));
addControllingSignal(QLatin1String("valueChanged(int)"));
return rect;
switch (child) {
case Self:
- return QAccessibleWidgetEx::rect(child);
+ return QAccessibleWidget::rect(child);
case SpeedoMeter: {
// Mixture from qcommonstyle.cpp (focus rect).
int width = dial()->width();
return QDial::tr("SliderHandle");
}
}
- return QAccessibleWidgetEx::text(textType, child);
+ return QAccessibleWidget::text(textType, child);
}
QAccessible::Role QAccessibleDial::role(int child) const
return Slider;
else if (child == SliderHandle)
return Indicator;
- return QAccessibleWidgetEx::role(child);
+ return QAccessibleWidget::role(child);
}
QAccessible::State QAccessibleDial::state(int child) const
{
- const State parentState = QAccessibleWidgetEx::state(0);
+ const State parentState = QAccessibleWidget::state(0);
if (child == SliderHandle)
return parentState | HotTracked;
return parentState;
}
-QVariant QAccessibleDial::invokeMethodEx(Method, int, const QVariantList &)
+QVariant QAccessibleDial::invokeMethod(Method, int, const QVariantList &)
{
return QVariant();
}
class QDial;
#ifndef QT_NO_SPINBOX
-class QAccessibleAbstractSpinBox: public QAccessibleWidgetEx, public QAccessibleValueInterface
+class QAccessibleAbstractSpinBox: public QAccessibleWidget, public QAccessibleValueInterface
{
Q_ACCESSIBLE_OBJECT
public:
bool doAction(int action, int child, const QVariantList ¶ms);
- QVariant invokeMethodEx(Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(Method method, int child, const QVariantList ¶ms);
// QAccessibleValueInterface
QVariant currentValue();
QSpinBox *spinBox() const;
};
-class QAccessibleDoubleSpinBox : public QAccessibleWidgetEx
+class QAccessibleDoubleSpinBox : public QAccessibleWidget
{
public:
explicit QAccessibleDoubleSpinBox(QWidget *widget);
int childCount() const;
QRect rect(int child) const;
int navigate(RelationFlag rel, int entry, QAccessibleInterface **target) const;
- QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList ¶ms);
QString text(Text t, int child) const;
Role role(int child) const;
State state(int child) const;
};
#endif // QT_NO_SPINBOX
-class QAccessibleAbstractSlider: public QAccessibleWidgetEx, public QAccessibleValueInterface
+class QAccessibleAbstractSlider: public QAccessibleWidget, public QAccessibleValueInterface
{
Q_ACCESSIBLE_OBJECT
public:
explicit QAccessibleAbstractSlider(QWidget *w, Role r = Slider);
- QVariant invokeMethodEx(Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(Method method, int child, const QVariantList ¶ms);
// QAccessibleValueInterface
QVariant currentValue();
#endif // QT_NO_SLIDER
#ifndef QT_NO_DIAL
-class QAccessibleDial : public QAccessibleWidgetEx
+class QAccessibleDial : public QAccessibleWidget
{
public:
explicit QAccessibleDial(QWidget *w);
QString text(Text textType, int child) const;
Role role(int child) const;
State state(int child) const;
- QVariant invokeMethodEx(Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(Method method, int child, const QVariantList ¶ms);
protected:
QDial *dial() const;
/*!
Creates a QAccessibleButton object for \a w.
- \a role is propagated to the QAccessibleWidgetEx constructor.
+ \a role is propagated to the QAccessibleWidget constructor.
*/
QAccessibleButton::QAccessibleButton(QWidget *w, Role role)
-: QAccessibleWidgetEx(w, role)
+: QAccessibleWidget(w, role)
{
Q_ASSERT(button());
if (button()->isCheckable())
}
break;
}
- return QAccessibleWidgetEx::actionText(action, text, child);
+ return QAccessibleWidget::actionText(action, text, child);
}
/*! \reimp */
}
return true;
}
- return QAccessibleWidgetEx::doAction(action, child, params);
+ return QAccessibleWidget::doAction(action, child, params);
}
/*! \reimp */
break;
}
if (str.isEmpty())
- str = QAccessibleWidgetEx::text(t, child);
+ str = QAccessibleWidget::text(t, child);
return qt_accStripAmp(str);
}
/*! \reimp */
QAccessible::State QAccessibleButton::state(int child) const
{
- State state = QAccessibleWidgetEx::state(child);
+ State state = QAccessibleWidget::state(child);
QAbstractButton *b = button();
QCheckBox *cb = qobject_cast<QCheckBox *>(b);
/*!
Creates a QAccessibleToolButton object for \a w.
- \a role is propagated to the QAccessibleWidgetEx constructor.
+ \a role is propagated to the QAccessibleWidget constructor.
*/
QAccessibleToolButton::QAccessibleToolButton(QWidget *w, Role role)
: QAccessibleButton(w, role)
/*!
Constructs a QAccessibleDisplay object for \a w.
- \a role is propagated to the QAccessibleWidgetEx constructor.
+ \a role is propagated to the QAccessibleWidget constructor.
*/
QAccessibleDisplay::QAccessibleDisplay(QWidget *w, Role role)
-: QAccessibleWidgetEx(w, role)
+: QAccessibleWidget(w, role)
{
}
} else if (qobject_cast<QStatusBar*>(object())) {
return StatusBar;
}
- return QAccessibleWidgetEx::role(child);
+ return QAccessibleWidget::role(child);
}
/*! \reimp */
break;
}
if (str.isEmpty())
- str = QAccessibleWidgetEx::text(t, child);;
+ str = QAccessibleWidget::text(t, child);;
return qt_accStripAmp(str);
}
QAccessible::Relation QAccessibleDisplay::relationTo(int child, const QAccessibleInterface *other,
int otherChild) const
{
- Relation relation = QAccessibleWidgetEx::relationTo(child, other, otherChild);
+ Relation relation = QAccessibleWidget::relationTo(child, other, otherChild);
if (child || otherChild)
return relation;
if (*target)
return 0;
}
- return QAccessibleWidgetEx::navigate(rel, entry, target);
+ return QAccessibleWidget::navigate(rel, entry, target);
}
/*! \internal */
#ifndef QT_NO_GROUPBOX
QAccessibleGroupBox::QAccessibleGroupBox(QWidget *w)
- : QAccessibleWidgetEx(w, Grouping)
+ : QAccessibleWidget(w, Grouping)
{
}
QString QAccessibleGroupBox::text(QAccessible::Text t, int child) const
{
- QString txt = QAccessibleWidgetEx::text(t, child);
+ QString txt = QAccessibleWidget::text(t, child);
if (txt.isEmpty()) {
switch (t) {
QAccessible::State QAccessibleGroupBox::state(int child) const
{
- QAccessible::State st = QAccessibleWidgetEx::state(child);
+ QAccessible::State st = QAccessibleWidget::state(child);
if (groupBox()->isChecked())
st |= QAccessible::Checked;
QAccessible::Role QAccessibleGroupBox::role(int child) const
{
if (child)
- return QAccessibleWidgetEx::role(child);
+ return QAccessibleWidget::role(child);
return groupBox()->isCheckable() ? QAccessible::CheckBox : QAccessible::Grouping;
}
{
if ((rel == Labelled) && !groupBox()->title().isEmpty())
rel = Child;
- return QAccessibleWidgetEx::navigate(rel, entry, target);
+ return QAccessibleWidget::navigate(rel, entry, target);
}
QAccessible::Relation QAccessibleGroupBox::relationTo(int child, const QAccessibleInterface* other, int otherChild) const
{
QGroupBox *groupbox = this->groupBox();
- QAccessible::Relation relation = QAccessibleWidgetEx::relationTo(child, other, otherChild);
+ QAccessible::Relation relation = QAccessibleWidget::relationTo(child, other, otherChild);
if (!child && !otherChild && !groupbox->title().isEmpty()) {
QObject *o = other->object();
/*!
Constructs a QAccessibleLineEdit object for \a w.
- \a name is propagated to the QAccessibleWidgetEx constructor.
+ \a name is propagated to the QAccessibleWidget constructor.
*/
QAccessibleLineEdit::QAccessibleLineEdit(QWidget *w, const QString &name)
-: QAccessibleWidgetEx(w, EditableText, name), QAccessibleSimpleEditableTextInterface(this)
+: QAccessibleWidget(w, EditableText, name), QAccessibleSimpleEditableTextInterface(this)
{
addControllingSignal(QLatin1String("textChanged(const QString&)"));
addControllingSignal(QLatin1String("returnPressed()"));
break;
}
if (str.isEmpty())
- str = QAccessibleWidgetEx::text(t, child);;
+ str = QAccessibleWidget::text(t, child);;
return qt_accStripAmp(str);
}
void QAccessibleLineEdit::setText(Text t, int control, const QString &text)
{
if (t != Value || control) {
- QAccessibleWidgetEx::setText(t, control, text);
+ QAccessibleWidget::setText(t, control, text);
return;
}
/*! \reimp */
QAccessible::State QAccessibleLineEdit::state(int child) const
{
- State state = QAccessibleWidgetEx::state(child);
+ State state = QAccessibleWidget::state(child);
QLineEdit *l = lineEdit();
if (l->isReadOnly())
return state;
}
-QVariant QAccessibleLineEdit::invokeMethodEx(QAccessible::Method method, int child,
+QVariant QAccessibleLineEdit::invokeMethod(QAccessible::Method method, int child,
const QVariantList ¶ms)
{
if (child)
QSet<QAccessible::Method> set;
set << ListSupportedMethods << SetCursorPosition << GetCursorPosition;
return QVariant::fromValue(set | qvariant_cast<QSet<QAccessible::Method> >(
- QAccessibleWidgetEx::invokeMethodEx(method, child, params)));
+ QAccessibleWidget::invokeMethod(method, child, params)));
}
case SetCursorPosition:
setCursorPosition(params.value(0).toInt());
case GetCursorPosition:
return cursorPosition();
default:
- return QAccessibleWidgetEx::invokeMethodEx(method, child, params);
+ return QAccessibleWidget::invokeMethod(method, child, params);
}
}
class QGroupBox;
class QProgressBar;
-class QAccessibleButton : public QAccessibleWidgetEx, public QAccessibleActionInterface
+class QAccessibleButton : public QAccessibleWidget, public QAccessibleActionInterface
{
Q_ACCESSIBLE_OBJECT
Q_DECLARE_TR_FUNCTIONS(QAccessibleButton)
};
#endif // QT_NO_TOOLBUTTON
-class QAccessibleDisplay : public QAccessibleWidgetEx, public QAccessibleImageInterface
+class QAccessibleDisplay : public QAccessibleWidget, public QAccessibleImageInterface
{
Q_ACCESSIBLE_OBJECT
public:
};
#ifndef QT_NO_GROUPBOX
-class QAccessibleGroupBox : public QAccessibleWidgetEx,
+class QAccessibleGroupBox : public QAccessibleWidget,
public QAccessibleActionInterface
{
Q_ACCESSIBLE_OBJECT
#endif
#ifndef QT_NO_LINEEDIT
-class QAccessibleLineEdit : public QAccessibleWidgetEx, public QAccessibleTextInterface,
+class QAccessibleLineEdit : public QAccessibleWidget, public QAccessibleTextInterface,
public QAccessibleSimpleEditableTextInterface
{
Q_ACCESSIBLE_OBJECT
QString text(Text t, int child) const;
void setText(Text t, int control, const QString &text);
State state(int child) const;
- QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList ¶ms);
+ QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList ¶ms);
// QAccessibleTextInterface
void addSelection(int startOffset, int endOffset);