From f5bbb2db98fe420174328e6c8e2f3d160a9b7758 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 25 Sep 2019 21:09:39 +0200 Subject: Clean up uses of deprecated G_CONST_RETURN ...where /usr/include/glib-2.0/glib/gmacros.h from glib2-devel-2.62.0-1.fc31.x86_64 now has #define G_CONST_RETURN const GLIB_DEPRECATED_MACRO_IN_2_30_FOR(const) causing an "error: const [-Werror]" warning/error. (Cleaning up also vcl/unx/gtk/a11y/atkutil.cxx where the warnings were suppressed by the #define GLIB_DISABLE_DEPRECATION_WARNINGS in vcl/inc/unx/gtk/gtkdata.hxx.) Change-Id: I5d60b4d9fd5b9e6e2fbecdf08d2b763cc15c4311 Reviewed-on: https://gerrit.libreoffice.org/79574 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vcl/unx/gtk/fpicker') diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index e9b16217882b..c106aa0ce4c4 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -1789,7 +1789,7 @@ void SalGtkFilePicker::SetCurFilter( const OUString& rFilter ) for( GSList *iter = filters; !bFound && iter; iter = iter->next ) { GtkFileFilter* pFilter = static_cast( iter->data ); - G_CONST_RETURN gchar * filtername = gtk_file_filter_get_name( pFilter ); + const gchar * filtername = gtk_file_filter_get_name( pFilter ); OUString sFilterName( filtername, strlen( filtername ), RTL_TEXTENCODING_UTF8 ); OUString aShrunkName = shrinkFilterName( rFilter ); -- cgit v1.2.3