Make foreground and backgroundColor proper functions.

Change-Id: I93d4355a6c0b6edb1902df6399df7884b25ea744
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>

2 files changed, 13 insertions, 4 deletions

diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
index a4a1da7242..73ccb90347 100644
--- a/src/widgets/accessible/qaccessiblewidget.cpp
+++ b/src/widgets/accessible/qaccessiblewidget.cpp
@@ -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();
     }
diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h
index 07fdd97734..9a6dae69e7 100644
--- a/src/widgets/accessible/qaccessiblewidget.h
+++ b/src/widgets/accessible/qaccessiblewidget.h
@@ -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 &params);
 
 protected: