Rename description to localizedDescription in Action interface.

Change-Id: I9e15dabd47bb7dc27cb3748f6763789d8ccc7b42
Reviewed-on: http://codereview.qt-project.org/5622
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>

6 files changed, 10 insertions, 9 deletions

diff --git a/src/gui/accessible/qaccessible2.h b/src/gui/accessible/qaccessible2.h
index 5ac877e1d0..a609defdcc 100644
--- a/src/gui/accessible/qaccessible2.h
+++ b/src/gui/accessible/qaccessible2.h
@@ -333,7 +333,7 @@ public:
 
     virtual int actionCount() = 0;
     virtual void doAction(int actionIndex) = 0;
-    virtual QString description(int actionIndex) = 0;
+    virtual QString localizedDescription(int actionIndex) = 0;
     virtual QString name(int actionIndex) = 0;
     virtual QString localizedName(int actionIndex) = 0;
     virtual QStringList keyBindings(int actionIndex) = 0;
diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp
index 7438164bd4..52a1ae6fcb 100644
--- a/src/plugins/accessible/widgets/complexwidgets.cpp
+++ b/src/plugins/accessible/widgets/complexwidgets.cpp
@@ -1529,7 +1529,7 @@ public:
             m_parent->setCurrentIndex(m_index);
     }
 
-    QString description(int actionIndex)
+    QString localizedDescription(int actionIndex)
     {
         if (actionIndex == 0)
             return QTabWidget::tr("Select this tab");
@@ -1804,7 +1804,8 @@ void QAccessibleComboBox::doAction(int actionIndex)
     doAction(0, 0, QVariantList());
 }
 
-QString QAccessibleComboBox::description(int actionIndex)
+QString QAccessibleComboBox::localizedDescription
+(int actionIndex)
 {
     return QComboBox::tr("Opens the selection list of this combo box.");
 }
diff --git a/src/plugins/accessible/widgets/complexwidgets.h b/src/plugins/accessible/widgets/complexwidgets.h
index 81f79fd235..9abec34510 100644
--- a/src/plugins/accessible/widgets/complexwidgets.h
+++ b/src/plugins/accessible/widgets/complexwidgets.h
@@ -272,7 +272,7 @@ public:
     // QAccessibleActionInterface
     int actionCount();
     void doAction(int actionIndex);
-    QString description(int actionIndex);
+    QString localizedDescription(int actionIndex);
     QString name(int actionIndex);
     QString localizedName(int actionIndex);
     QStringList keyBindings(int actionIndex);
diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp
index c6c1d8248f..b8d8a9dbc8 100644
--- a/src/plugins/accessible/widgets/simplewidgets.cpp
+++ b/src/plugins/accessible/widgets/simplewidgets.cpp
@@ -230,7 +230,7 @@ void QAccessibleButton::doAction(int actionIndex)
     }
 }
 
-QString QAccessibleButton::description(int actionIndex)
+QString QAccessibleButton::localizedDescription(int actionIndex)
 {
     switch (actionIndex) {
     case 0:
@@ -485,7 +485,7 @@ QString QAccessibleToolButton::localizedName(int actionIndex)
     }
 }
 
-QString QAccessibleToolButton::description(int actionIndex)
+QString QAccessibleToolButton::localizedDescription(int actionIndex)
 {
     switch (actionIndex) {
     case 0:
diff --git a/src/plugins/accessible/widgets/simplewidgets.h b/src/plugins/accessible/widgets/simplewidgets.h
index 122d086e74..9ba5d9127e 100644
--- a/src/plugins/accessible/widgets/simplewidgets.h
+++ b/src/plugins/accessible/widgets/simplewidgets.h
@@ -71,7 +71,7 @@ public:
     // QAccessibleActionInterface
     int actionCount();
     void doAction(int actionIndex);
-    QString description(int actionIndex);
+    QString localizedDescription(int actionIndex);
     QString name(int actionIndex);
     QString localizedName(int actionIndex);
     QStringList keyBindings(int actionIndex);
@@ -100,7 +100,7 @@ public:
     // QAccessibleActionInterface
     int actionCount();
     void doAction(int actionIndex);
-    QString description(int actionIndex);
+    QString localizedDescription(int actionIndex);
     QString name(int actionIndex);
     QString localizedName(int actionIndex);
     QStringList keyBindings(int actionIndex);
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index c019f571a2..89eb4904d7 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -1100,7 +1100,7 @@ void tst_QAccessibility::buttonTest()
     interface = QAccessible::queryAccessibleInterface(&toggleButton);
     actionInterface = interface->actionInterface();
     QCOMPARE(interface->role(0), QAccessible::CheckBox);
-    QCOMPARE(actionInterface->description(0), QString("Toggles the button."));
+    QCOMPARE(actionInterface->localizedDescription(0), QString("Toggles the button."));
     QCOMPARE(actionInterface->name(0), QString("Check"));
     QVERIFY(!toggleButton.isChecked());
     QVERIFY((interface->state(0) & QAccessible::Checked) == 0);