summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2015-06-10 08:31:49 +0200
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2015-06-10 08:14:44 +0000
commit5dbd1ed7a3ebd69b2ee27512bee5195607dd14e8 (patch)
tree476a5e9cc92bfc9eac7510a16b86a2dcaacd9536 /src
parent36640aa0afb722479ba47d6fbd9401c433dead41 (diff)
downloadqtbase-5dbd1ed7a3ebd69b2ee27512bee5195607dd14e8.tar.gz
Fix signature of new methods
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>
Diffstat (limited to 'src')
-rw-r--r--src/gui/accessible/qaccessible.cpp12
-rw-r--r--src/gui/accessible/qaccessible.h12
2 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index 5b6bae7cab..f2764ac425 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -2743,7 +2743,7 @@ const QString &QAccessibleActionInterface::toggleAction()
Returns the name of the scroll left default action.
\sa actionNames(), localizedActionName()
*/
-const QString &QAccessibleActionInterface::scrollLeftAction()
+QString QAccessibleActionInterface::scrollLeftAction()
{
return accessibleActionStrings()->scrollLeftAction;
}
@@ -2752,7 +2752,7 @@ const QString &QAccessibleActionInterface::scrollLeftAction()
Returns the name of the scroll right default action.
\sa actionNames(), localizedActionName()
*/
-const QString &QAccessibleActionInterface::scrollRightAction()
+QString QAccessibleActionInterface::scrollRightAction()
{
return accessibleActionStrings()->scrollRightAction;
}
@@ -2761,7 +2761,7 @@ const QString &QAccessibleActionInterface::scrollRightAction()
Returns the name of the scroll up default action.
\sa actionNames(), localizedActionName()
*/
-const QString &QAccessibleActionInterface::scrollUpAction()
+QString QAccessibleActionInterface::scrollUpAction()
{
return accessibleActionStrings()->scrollUpAction;
}
@@ -2770,7 +2770,7 @@ const QString &QAccessibleActionInterface::scrollUpAction()
Returns the name of the scroll down default action.
\sa actionNames(), localizedActionName()
*/
-const QString &QAccessibleActionInterface::scrollDownAction()
+QString QAccessibleActionInterface::scrollDownAction()
{
return accessibleActionStrings()->scrollDownAction;
}
@@ -2779,7 +2779,7 @@ const QString &QAccessibleActionInterface::scrollDownAction()
Returns the name of the previous page default action.
\sa actionNames(), localizedActionName()
*/
-const QString &QAccessibleActionInterface::previousPageAction()
+QString QAccessibleActionInterface::previousPageAction()
{
return accessibleActionStrings()->previousPageAction;
}
@@ -2788,7 +2788,7 @@ const QString &QAccessibleActionInterface::previousPageAction()
Returns the name of the next page default action.
\sa actionNames(), localizedActionName()
*/
-const QString &QAccessibleActionInterface::nextPageAction()
+QString QAccessibleActionInterface::nextPageAction()
{
return accessibleActionStrings()->nextPageAction;
}
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index faa8cd719d..bfe1e6c542 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -636,12 +636,12 @@ public:
static const QString &showMenuAction();
static const QString &setFocusAction();
static const QString &toggleAction();
- static const QString &scrollLeftAction();
- static const QString &scrollRightAction();
- static const QString &scrollUpAction();
- static const QString &scrollDownAction();
- static const QString &nextPageAction();
- static const QString &previousPageAction();
+ static QString scrollLeftAction();
+ static QString scrollRightAction();
+ static QString scrollUpAction();
+ static QString scrollDownAction();
+ static QString nextPageAction();
+ static QString previousPageAction();
};
class Q_GUI_EXPORT QAccessibleImageInterface