Image interface functions should be const.

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

diff --git a/src/gui/accessible/qaccessible2.h b/src/gui/accessible/qaccessible2.h
index 8de5297..0ec2cc4 100644 (file)
--- a/src/gui/accessible/qaccessible2.h
+++ b/src/gui/accessible/qaccessible2.h
@@ -274,9 +274,9 @@ class Q_GUI_EXPORT QAccessibleImageInterface
 public:
     virtual ~QAccessibleImageInterface() {}
 
-    virtual QString imageDescription() = 0;
-    virtual QSize imageSize() = 0;
-    virtual QRect imagePosition(QAccessible2::CoordinateType coordType) = 0;
+    virtual QString imageDescription() const = 0;
+    virtual QSize imageSize() const = 0;
+    virtual QRect imagePosition(QAccessible2::CoordinateType coordType) const = 0;
 };
 
 #endif // QT_NO_ACCESSIBILITY

diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp
index 86257f7..a244116 100644 (file)
--- a/src/plugins/accessible/widgets/simplewidgets.cpp
+++ b/src/plugins/accessible/widgets/simplewidgets.cpp
@@ -482,7 +482,7 @@ void *QAccessibleDisplay::interface_cast(QAccessible::InterfaceType t)
 }
 
 /*! \internal */
-QString QAccessibleDisplay::imageDescription()
+QString QAccessibleDisplay::imageDescription() const
 {
 #ifndef QT_NO_TOOLTIP
     return widget()->toolTip();
@@ -492,7 +492,7 @@ QString QAccessibleDisplay::imageDescription()
 }
 
 /*! \internal */
-QSize QAccessibleDisplay::imageSize()
+QSize QAccessibleDisplay::imageSize() const
 {
     QLabel *label = qobject_cast<QLabel *>(widget());
     if (!label)
@@ -504,7 +504,7 @@ QSize QAccessibleDisplay::imageSize()
 }
 
 /*! \internal */
-QRect QAccessibleDisplay::imagePosition(QAccessible2::CoordinateType coordType)
+QRect QAccessibleDisplay::imagePosition(QAccessible2::CoordinateType coordType) const
 {
     QLabel *label = qobject_cast<QLabel *>(widget());
     if (!label)

diff --git a/src/plugins/accessible/widgets/simplewidgets.h b/src/plugins/accessible/widgets/simplewidgets.h
index 2ab1890..8387972 100644 (file)
--- a/src/plugins/accessible/widgets/simplewidgets.h
+++ b/src/plugins/accessible/widgets/simplewidgets.h
@@ -109,9 +109,9 @@ public:
     void *interface_cast(QAccessible::InterfaceType t);
 
     // QAccessibleImageInterface
-    QString imageDescription();
-    QSize imageSize();
-    QRect imagePosition(QAccessible2::CoordinateType coordType);
+    QString imageDescription() const;
+    QSize imageSize() const;
+    QRect imagePosition(QAccessible2::CoordinateType coordType) const;
 };
 
 #ifndef QT_NO_LINEEDIT