1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix signature of new methods

Browse Source 
Don't return a const QString &, return the QString by value. This
is still broken for some of the older methods, but let's not add
to it.

Change-Id: Ic5cabb1b89eda0fcf678dbe175963e03109e5c2c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
This commit is contained in:
Lars Knoll 2015-06-10 08:31:49 +02:00 committed by Jani Heikkinen
parent 36640aa0af
commit 5dbd1ed7a3
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/accessible/qaccessible.cpp
View File

@ -2743,7 +2743,7 @@ const QString &QAccessibleActionInterface::toggleAction()
Returns the name of the scroll left default action. Returns the name of the scroll left default action.
\sa actionNames(), localizedActionName() \sa actionNames(), localizedActionName()
*/ */
const QString &QAccessibleActionInterface::scrollLeftAction() QString QAccessibleActionInterface::scrollLeftAction()
{ {
return accessibleActionStrings()->scrollLeftAction; return accessibleActionStrings()->scrollLeftAction;
} }
@ -2752,7 +2752,7 @@ const QString &QAccessibleActionInterface::scrollLeftAction()
Returns the name of the scroll right default action. Returns the name of the scroll right default action.
\sa actionNames(), localizedActionName() \sa actionNames(), localizedActionName()
*/ */
const QString &QAccessibleActionInterface::scrollRightAction() QString QAccessibleActionInterface::scrollRightAction()
{ {
return accessibleActionStrings()->scrollRightAction; return accessibleActionStrings()->scrollRightAction;
} }
@ -2761,7 +2761,7 @@ const QString &QAccessibleActionInterface::scrollRightAction()
Returns the name of the scroll up default action. Returns the name of the scroll up default action.
\sa actionNames(), localizedActionName() \sa actionNames(), localizedActionName()
*/ */
const QString &QAccessibleActionInterface::scrollUpAction() QString QAccessibleActionInterface::scrollUpAction()
{ {
return accessibleActionStrings()->scrollUpAction; return accessibleActionStrings()->scrollUpAction;
} }
@ -2770,7 +2770,7 @@ const QString &QAccessibleActionInterface::scrollUpAction()
Returns the name of the scroll down default action. Returns the name of the scroll down default action.
\sa actionNames(), localizedActionName() \sa actionNames(), localizedActionName()
*/ */
const QString &QAccessibleActionInterface::scrollDownAction() QString QAccessibleActionInterface::scrollDownAction()
{ {
return accessibleActionStrings()->scrollDownAction; return accessibleActionStrings()->scrollDownAction;
} }
@ -2779,7 +2779,7 @@ const QString &QAccessibleActionInterface::scrollDownAction()
Returns the name of the previous page default action. Returns the name of the previous page default action.
\sa actionNames(), localizedActionName() \sa actionNames(), localizedActionName()
*/ */
const QString &QAccessibleActionInterface::previousPageAction() QString QAccessibleActionInterface::previousPageAction()
{ {
return accessibleActionStrings()->previousPageAction; return accessibleActionStrings()->previousPageAction;
} }
@ -2788,7 +2788,7 @@ const QString &QAccessibleActionInterface::previousPageAction()
Returns the name of the next page default action. Returns the name of the next page default action.
\sa actionNames(), localizedActionName() \sa actionNames(), localizedActionName()
*/ */
const QString &QAccessibleActionInterface::nextPageAction() QString QAccessibleActionInterface::nextPageAction()
{ {
return accessibleActionStrings()->nextPageAction; return accessibleActionStrings()->nextPageAction;
} }

12
src/gui/accessible/qaccessible.h
View File

@ -636,12 +636,12 @@ public:
static const QString &showMenuAction(); static const QString &showMenuAction();
static const QString &setFocusAction(); static const QString &setFocusAction();
static const QString &toggleAction(); static const QString &toggleAction();
static const QString &scrollLeftAction(); static QString scrollLeftAction();
static const QString &scrollRightAction(); static QString scrollRightAction();
static const QString &scrollUpAction(); static QString scrollUpAction();
static const QString &scrollDownAction(); static QString scrollDownAction();
static const QString &nextPageAction(); static QString nextPageAction();
static const QString &previousPageAction(); static QString previousPageAction();
}; };
class Q_GUI_EXPORT QAccessibleImageInterface class Q_GUI_EXPORT QAccessibleImageInterface