summaryrefslogtreecommitdiffstats
path: root/src/plugins/accessible
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>2011-09-26 15:19:49 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-03 09:59:27 +0200
commit91ba742329de40123299ec2f216c1acf8355103c (patch)
treec5ffb767f60df2ddfb7cad706666f4e5327a364b /src/plugins/accessible
parentb67708f3d3b162b77c12ba73e8885cc499a3046b (diff)
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>
Diffstat (limited to 'src/plugins/accessible')
-rw-r--r--src/plugins/accessible/widgets/complexwidgets.cpp5
-rw-r--r--src/plugins/accessible/widgets/complexwidgets.h2
-rw-r--r--src/plugins/accessible/widgets/simplewidgets.cpp4
-rw-r--r--src/plugins/accessible/widgets/simplewidgets.h4
4 files changed, 8 insertions, 7 deletions
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);