whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Frederik Gladhorn 2011-09-26 15:19:49 +02:00 committed by Qt by Nokia
parent b67708f3d3
commit 91ba742329
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/accessible/qaccessible2.h
View File

@ -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;

5
src/plugins/accessible/widgets/complexwidgets.cpp
View File

@ -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.");
}

2
src/plugins/accessible/widgets/complexwidgets.h
View File

@ -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);

4
src/plugins/accessible/widgets/simplewidgets.cpp
View File

@ -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:

4
src/plugins/accessible/widgets/simplewidgets.h
View File

@ -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);

2
tests/auto/qaccessibility/tst_qaccessibility.cpp
View File

@ -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);