Make foreground and backgroundColor proper functions.
Change-Id: I93d4355a6c0b6edb1902df6399df7884b25ea744 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
This commit is contained in:
parent
c7f8213bc5
commit
3885a45e48
@ -1060,10 +1060,6 @@ QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > QAccessibleInterfa
|
||||
\sa text(), role()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QColor QAccessibleInterface::backgroundColor()
|
||||
\internal
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QAccessibleEditableTextInterface *QAccessibleInterface::editableTextInterface()
|
||||
@ -1071,9 +1067,24 @@ QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > QAccessibleInterfa
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QColor QAccessibleInterface::foregroundColor()
|
||||
\internal
|
||||
Returns the accessible's foreground color if applicable or an invalid QColor.
|
||||
|
||||
\sa backgroundColor()
|
||||
*/
|
||||
QColor QAccessibleInterface::foregroundColor() const
|
||||
{
|
||||
return QColor();
|
||||
}
|
||||
|
||||
/*!
|
||||
Returns the accessible's background color if applicable or an invalid QColor.
|
||||
|
||||
\sa foregroundColor()
|
||||
*/
|
||||
QColor QAccessibleInterface::backgroundColor() const
|
||||
{
|
||||
return QColor();
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QAccessibleTextInterface *QAccessibleInterface::textInterface()
|
||||
|
@ -389,18 +389,15 @@ public:
|
||||
virtual Role role(int child = 0) const = 0;
|
||||
virtual State state(int child = 0) const = 0;
|
||||
|
||||
virtual QColor foregroundColor() const;
|
||||
virtual QColor backgroundColor() const;
|
||||
|
||||
virtual QVariant invokeMethod(Method method, int child = 0,
|
||||
const QVariantList ¶ms = QVariantList());
|
||||
|
||||
inline QSet<Method> supportedMethods()
|
||||
{ return qvariant_cast<QSet<Method> >(invokeMethod(ListSupportedMethods)); }
|
||||
|
||||
inline QColor foregroundColor()
|
||||
{ return qvariant_cast<QColor>(invokeMethod(ForegroundColor)); }
|
||||
|
||||
inline QColor backgroundColor()
|
||||
{ return qvariant_cast<QColor>(invokeMethod(BackgroundColor)); }
|
||||
|
||||
inline QAccessibleTextInterface *textInterface()
|
||||
{ return reinterpret_cast<QAccessibleTextInterface *>(cast_helper(QAccessible2::TextInterface)); }
|
||||
|
||||
|
@ -866,6 +866,16 @@ QAccessible::State QAccessibleWidget::state(int child) const
|
||||
return state;
|
||||
}
|
||||
|
||||
QColor QAccessibleWidget::foregroundColor() const
|
||||
{
|
||||
return widget()->palette().color(widget()->foregroundRole());
|
||||
}
|
||||
|
||||
QColor QAccessibleWidget::backgroundColor() const
|
||||
{
|
||||
return widget()->palette().color(widget()->backgroundRole());
|
||||
}
|
||||
|
||||
QVariant QAccessibleWidget::invokeMethod(Method method, int child, const QVariantList & /*params*/)
|
||||
{
|
||||
if (child)
|
||||
@ -877,10 +887,6 @@ QVariant QAccessibleWidget::invokeMethod(Method method, int child, const QVarian
|
||||
set << ListSupportedMethods << ForegroundColor << BackgroundColor;
|
||||
return QVariant::fromValue(set);
|
||||
}
|
||||
case ForegroundColor:
|
||||
return widget()->palette().color(widget()->foregroundRole());
|
||||
case BackgroundColor:
|
||||
return widget()->palette().color(widget()->backgroundRole());
|
||||
default:
|
||||
return QVariant();
|
||||
}
|
||||
|
@ -75,6 +75,9 @@ public:
|
||||
Role role(int child = 0) const;
|
||||
State state(int child = 0) const;
|
||||
|
||||
QColor foregroundColor() const;
|
||||
QColor backgroundColor() const;
|
||||
|
||||
QVariant invokeMethod(Method method, int child, const QVariantList ¶ms);
|
||||
|
||||
protected:
|
||||
|
Loading…
Reference in New Issue
Block a user