vcl/unx/gtk3/a11y/gtk3atkaction.cxx | 10 +++++-----
vcl/unx/gtk3/a11y/gtk3atkimage.cxx | 4 ++--
vcl/unx/gtk3/a11y/gtk3atktable.cxx | 6 +++---
vcl/unx/gtk3/a11y/gtk3atkutil.cxx | 4 ++--
vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 094d8dd4615c1a5a5e8d1e8abf672d9b8f235eb9
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Oct 2 13:26:00 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Oct 2 14:37:14 2019 +0200
Reinstate "Clean up uses of deprecated G_CONST_RETURN"
(f5bbb2db98fe420174328e6c8e2f3d160a9b7758), which had erroneously been
dropped
by 1ae450504cf57457f9702684b1517fda1dd3c481 "drop gtk2 support"
Change-Id: Ib7e2fc5bfa394dd6c49d5c9710e1c415fdfe2186
Reviewed-on: https://gerrit.libreoffice.org/80026
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/unx/gtk3/a11y/gtk3atkaction.cxx
b/vcl/unx/gtk3/a11y/gtk3atkaction.cxx
index 81e743238d84..14a172fe6ae3 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkaction.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkaction.cxx
@@ -32,7 +32,7 @@
using namespace ::com::sun::star;
// FIXME
-static G_CONST_RETURN gchar *
+static const gchar *
getAsConst( const OString& rString )
{
static const int nMax = 10;
@@ -97,7 +97,7 @@ action_wrapper_get_n_actions (AtkAction *action)
return 0;
}
-static G_CONST_RETURN gchar *
+static const gchar *
action_wrapper_get_description (AtkAction *, gint)
{
// GAIL implement this only for cells
@@ -105,7 +105,7 @@ action_wrapper_get_description (AtkAction *, gint)
return "";
}
-static G_CONST_RETURN gchar *
+static const gchar *
action_wrapper_get_localized_name (AtkAction *, gint)
{
// GAIL doesn't implement this as well
@@ -116,7 +116,7 @@ action_wrapper_get_localized_name (AtkAction *, gint)
#define ACTION_NAME_PAIR( OOoName, AtkName ) \
std::pair< const OUString, const gchar * > ( OUString( OOoName ), AtkName )
-static G_CONST_RETURN gchar *
+static const gchar *
action_wrapper_get_name (AtkAction *action,
gint i)
{
@@ -214,7 +214,7 @@ appendKeyStrokes(OStringBuffer& rBuffer, const
uno::Sequence< awt::KeyStroke >&
}
}
-static G_CONST_RETURN gchar *
+static const gchar *
action_wrapper_get_keybinding (AtkAction *action,
gint i)
{
diff --git a/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
b/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
index 1c9bc2c640f9..8d9cc20ebbc0 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
@@ -24,7 +24,7 @@
using namespace ::com::sun::star;
// FIXME
-static G_CONST_RETURN gchar *
+static const gchar *
getAsConst( const OUString& rString )
{
static const int nMax = 10;
@@ -55,7 +55,7 @@ static
css::uno::Reference<css::accessibility::XAccessibleImage>
extern "C" {
-static G_CONST_RETURN gchar *
+static const gchar *
image_get_image_description( AtkImage *image )
{
try {
diff --git a/vcl/unx/gtk3/a11y/gtk3atktable.cxx
b/vcl/unx/gtk3/a11y/gtk3atktable.cxx
index 29ffa48d5b9d..221e55d2b287 100644
--- a/vcl/unx/gtk3/a11y/gtk3atktable.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atktable.cxx
@@ -36,7 +36,7 @@ atk_object_wrapper_conditional_ref( const uno::Reference<
accessibility::XAccess
/*****************************************************************************/
// FIXME
-static G_CONST_RETURN gchar *
+static const gchar *
getAsConst( const OUString& rString )
{
static const int nMax = 10;
@@ -244,7 +244,7 @@ table_wrapper_get_caption( AtkTable *table )
/*****************************************************************************/
-static G_CONST_RETURN gchar *
+static const gchar *
table_wrapper_get_row_description( AtkTable *table,
gint row )
{
@@ -263,7 +263,7 @@ table_wrapper_get_row_description( AtkTable *table,
/*****************************************************************************/
-static G_CONST_RETURN gchar *
+static const gchar *
table_wrapper_get_column_description( AtkTable *table,
gint column )
{
diff --git a/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
b/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
index cac3ac6e4805..50ed2793bbf0 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
@@ -701,7 +701,7 @@ static Link<VclSimpleEvent&,void> g_aEventListenerLink(
nullptr, WindowEventHand
extern "C" {
-static G_CONST_RETURN gchar *
+static const gchar *
ooo_atk_util_get_toolkit_name()
{
return "VCL";
@@ -709,7 +709,7 @@ ooo_atk_util_get_toolkit_name()
/*****************************************************************************/
-static G_CONST_RETURN gchar *
+static const gchar *
ooo_atk_util_get_toolkit_version()
{
return LIBO_VERSION_DOTTED;
diff --git a/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
b/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
index 0998553bd927..cd439022cf2a 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
@@ -338,7 +338,7 @@ extern "C" {
/*****************************************************************************/
-static G_CONST_RETURN gchar*
+static const gchar*
wrapper_get_name( AtkObject *atk_obj )
{
AtkObjectWrapper *obj = ATK_OBJECT_WRAPPER (atk_obj);
@@ -369,7 +369,7 @@ wrapper_get_name( AtkObject *atk_obj )
/*****************************************************************************/
-static G_CONST_RETURN gchar*
+static const gchar*
wrapper_get_description( AtkObject *atk_obj )
{
AtkObjectWrapper *obj = ATK_OBJECT_WRAPPER (atk_obj);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
