[libgnomekbd] Remove the `extern` keyword
- From: Corentin Noël <corentinnoel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgnomekbd] Remove the `extern` keyword
- Date: Tue, 14 Jun 2022 16:55:42 +0000 (UTC)
commit b85937388ed9aa2a69d5ec842bc94a45e49480fa
Author: Corentin Noël <tintou noel tf>
Date: Tue Jun 14 18:53:47 2022 +0200
Remove the `extern` keyword
Also make all the constant arrays internal.
libgnomekbd/gkbd-config-private.h | 20 +++++---------
libgnomekbd/gkbd-configuration.c | 6 ++---
libgnomekbd/gkbd-configuration.h | 52 ++++++++++++++++++-------------------
libgnomekbd/gkbd-desktop-config.h | 27 ++++++++-----------
libgnomekbd/gkbd-indicator-config.h | 26 +++++++++----------
libgnomekbd/gkbd-indicator.h | 18 ++++++-------
libgnomekbd/gkbd-keyboard-config.h | 36 ++++++++++++-------------
libgnomekbd/gkbd-status.h | 12 ++++-----
libgnomekbd/gkbd-util.h | 12 ++++-----
9 files changed, 97 insertions(+), 112 deletions(-)
---
diff --git a/libgnomekbd/gkbd-config-private.h b/libgnomekbd/gkbd-config-private.h
index 179a8d3..ea3f487 100644
--- a/libgnomekbd/gkbd-config-private.h
+++ b/libgnomekbd/gkbd-config-private.h
@@ -25,45 +25,39 @@
#define GKBD_SCHEMA_PREVIEW "org.gnome.libgnomekbd.preview"
-extern const gchar GKBD_PREVIEW_CONFIG_DIR[];
-extern const gchar GKBD_PREVIEW_CONFIG_KEY_X[];
-extern const gchar GKBD_PREVIEW_CONFIG_KEY_Y[];
-extern const gchar GKBD_PREVIEW_CONFIG_KEY_WIDTH[];
-extern const gchar GKBD_PREVIEW_CONFIG_KEY_HEIGHT[];
-
/**
* General config functions (private)
*/
-extern void gkbd_keyboard_config_model_set (GkbdKeyboardConfig *
+void gkbd_keyboard_config_model_set (GkbdKeyboardConfig *
kbd_config,
const gchar * model_name);
-extern void gkbd_keyboard_config_options_set (GkbdKeyboardConfig *
+void gkbd_keyboard_config_options_set (GkbdKeyboardConfig *
kbd_config, gint idx,
const gchar * group_name,
const gchar * option_name);
-extern gboolean gkbd_keyboard_config_options_is_set (GkbdKeyboardConfig *
+gboolean gkbd_keyboard_config_options_is_set (GkbdKeyboardConfig *
kbd_config,
const gchar *
group_name,
const gchar *
option_name);
-extern gboolean gkbd_keyboard_config_dump_settings (GkbdKeyboardConfig *
+gboolean gkbd_keyboard_config_dump_settings (GkbdKeyboardConfig *
kbd_config,
const char *file_name);
-extern void gkbd_keyboard_config_start_listen (GkbdKeyboardConfig *
+void gkbd_keyboard_config_start_listen (GkbdKeyboardConfig *
kbd_config,
GCallback func,
gpointer user_data);
-extern void gkbd_keyboard_config_stop_listen (GkbdKeyboardConfig *
+void gkbd_keyboard_config_stop_listen (GkbdKeyboardConfig *
kbd_config);
-extern gboolean gkbd_keyboard_config_get_lv_descriptions (XklConfigRegistry
+gboolean gkbd_keyboard_config_get_lv_descriptions (XklConfigRegistry
*
config_registry,
const gchar *
diff --git a/libgnomekbd/gkbd-configuration.c b/libgnomekbd/gkbd-configuration.c
index 4592a00..538ef32 100644
--- a/libgnomekbd/gkbd-configuration.c
+++ b/libgnomekbd/gkbd-configuration.c
@@ -571,7 +571,7 @@ gkbd_configuration_get_all_objects (GkbdConfiguration * configuration)
return priv->widget_instances;
}
-extern void
+void
gkbd_configuration_append_object (GkbdConfiguration * configuration,
GObject * obj)
{
@@ -583,7 +583,7 @@ gkbd_configuration_append_object (GkbdConfiguration * configuration,
g_slist_append (priv->widget_instances, obj);
}
-extern void
+void
gkbd_configuration_remove_object (GkbdConfiguration * configuration,
GObject * obj)
{
@@ -698,7 +698,7 @@ gkbd_configuration_create_label_title (int group, GHashTable ** ln2cnt_map,
return lbl_title;
}
-extern gboolean
+gboolean
gkbd_configuration_if_any_object_exists (GkbdConfiguration * configuration)
{
GkbdConfigurationPrivate *priv = gkbd_configuration_get_instance_private (configuration);
diff --git a/libgnomekbd/gkbd-configuration.h b/libgnomekbd/gkbd-configuration.h
index 046cc32..1593f27 100644
--- a/libgnomekbd/gkbd-configuration.h
+++ b/libgnomekbd/gkbd-configuration.h
@@ -37,69 +37,69 @@ struct _GkbdConfigurationClass {
GObjectClass parent_class;
};
-extern GkbdConfiguration *gkbd_configuration_get (void);
+GkbdConfiguration *gkbd_configuration_get (void);
-extern XklEngine *gkbd_configuration_get_xkl_engine (GkbdConfiguration *
+XklEngine *gkbd_configuration_get_xkl_engine (GkbdConfiguration *
configuration);
-extern gchar **gkbd_configuration_get_group_names (GkbdConfiguration *
+gchar **gkbd_configuration_get_group_names (GkbdConfiguration *
configuration);
-extern gchar **gkbd_configuration_get_short_group_names (GkbdConfiguration
+gchar **gkbd_configuration_get_short_group_names (GkbdConfiguration
* configuration);
-extern gchar *gkbd_configuration_get_image_filename (GkbdConfiguration *
+gchar *gkbd_configuration_get_image_filename (GkbdConfiguration *
configuration,
guint group);
-extern gchar *gkbd_configuration_get_current_tooltip (GkbdConfiguration *
+gchar *gkbd_configuration_get_current_tooltip (GkbdConfiguration *
configuration);
-extern gboolean gkbd_configuration_if_flags_shown (GkbdConfiguration *
+gboolean gkbd_configuration_if_flags_shown (GkbdConfiguration *
configuration);
-extern gchar *gkbd_configuration_extract_layout_name (GkbdConfiguration *
+gchar *gkbd_configuration_extract_layout_name (GkbdConfiguration *
configuration,
int group);
-extern void gkbd_configuration_lock_next_group (GkbdConfiguration *
+void gkbd_configuration_lock_next_group (GkbdConfiguration *
configuration);
-extern void gkbd_configuration_lock_group (GkbdConfiguration *
+void gkbd_configuration_lock_group (GkbdConfiguration *
configuration, guint group);
-extern guint gkbd_configuration_get_current_group (GkbdConfiguration *
+guint gkbd_configuration_get_current_group (GkbdConfiguration *
configuration);
-extern gchar *gkbd_configuration_get_group_name (GkbdConfiguration *
+gchar *gkbd_configuration_get_group_name (GkbdConfiguration *
configuration,
guint group);
-extern void gkbd_configuration_start_listen (GkbdConfiguration *
+void gkbd_configuration_start_listen (GkbdConfiguration *
configuration);
-extern void gkbd_configuration_stop_listen (GkbdConfiguration *
+void gkbd_configuration_stop_listen (GkbdConfiguration *
configuration);
-extern GkbdIndicatorConfig
+GkbdIndicatorConfig
* gkbd_configuration_get_indicator_config (GkbdConfiguration *
configuration);
-extern GkbdKeyboardConfig
+GkbdKeyboardConfig
* gkbd_configuration_get_keyboard_config (GkbdConfiguration *
configuration);
-extern GSList *gkbd_configuration_get_all_objects (GkbdConfiguration *
+GSList *gkbd_configuration_get_all_objects (GkbdConfiguration *
configuration);
-extern gboolean gkbd_configuration_if_any_object_exists (GkbdConfiguration
+gboolean gkbd_configuration_if_any_object_exists (GkbdConfiguration
* configuration);
-extern void gkbd_configuration_append_object (GkbdConfiguration *
+void gkbd_configuration_append_object (GkbdConfiguration *
configuration,
GObject * obj);
-extern void gkbd_configuration_remove_object (GkbdConfiguration *
+void gkbd_configuration_remove_object (GkbdConfiguration *
configuration,
GObject * obj);
@@ -112,23 +112,23 @@ extern void gkbd_configuration_remove_object (GkbdConfiguration *
} \
}
-extern GSList *gkbd_configuration_load_images (GkbdConfiguration *
+GSList *gkbd_configuration_load_images (GkbdConfiguration *
configuration);
-extern void gkbd_configuration_free_images (GkbdConfiguration *
+void gkbd_configuration_free_images (GkbdConfiguration *
configuration,
GSList * images);
-extern gchar *gkbd_configuration_create_label_title (int group,
+gchar *gkbd_configuration_create_label_title (int group,
GHashTable **
ln2cnt_map,
gchar * layout_name);
-extern gboolean gkbd_configuration_get_caps_lock_state (GkbdConfiguration *
+gboolean gkbd_configuration_get_caps_lock_state (GkbdConfiguration *
configuration);
-extern gboolean gkbd_configuration_get_num_lock_state (GkbdConfiguration *
+gboolean gkbd_configuration_get_num_lock_state (GkbdConfiguration *
configuration);
-extern gboolean gkbd_configuration_get_scroll_lock_state (GkbdConfiguration
+gboolean gkbd_configuration_get_scroll_lock_state (GkbdConfiguration
* configuration);
G_END_DECLS
diff --git a/libgnomekbd/gkbd-desktop-config.h b/libgnomekbd/gkbd-desktop-config.h
index 9c737ab..8319b5b 100644
--- a/libgnomekbd/gkbd-desktop-config.h
+++ b/libgnomekbd/gkbd-desktop-config.h
@@ -27,11 +27,6 @@
#define GKBD_DESKTOP_SCHEMA "org.gnome.libgnomekbd.desktop"
-extern const gchar GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP[];
-extern const gchar GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW[];
-extern const gchar GKBD_DESKTOP_CONFIG_KEY_HANDLE_INDICATORS[];
-extern const gchar GKBD_DESKTOP_CONFIG_KEY_LAYOUT_NAMES_AS_GROUP_NAMES[];
-
/*
* General configuration
*/
@@ -52,17 +47,17 @@ struct _GkbdDesktopConfig {
/*
* GkbdDesktopConfig functions
*/
-extern void gkbd_desktop_config_init (GkbdDesktopConfig * config,
+void gkbd_desktop_config_init (GkbdDesktopConfig * config,
XklEngine * engine);
-extern void gkbd_desktop_config_term (GkbdDesktopConfig * config);
+void gkbd_desktop_config_term (GkbdDesktopConfig * config);
-extern void gkbd_desktop_config_load (GkbdDesktopConfig * config);
+void gkbd_desktop_config_load (GkbdDesktopConfig * config);
-extern void gkbd_desktop_config_save (GkbdDesktopConfig * config);
+void gkbd_desktop_config_save (GkbdDesktopConfig * config);
-extern gboolean gkbd_desktop_config_activate (GkbdDesktopConfig * config);
+gboolean gkbd_desktop_config_activate (GkbdDesktopConfig * config);
-extern gboolean
+gboolean
gkbd_desktop_config_load_group_descriptions (GkbdDesktopConfig
* config,
XklConfigRegistry *
@@ -75,18 +70,18 @@ gkbd_desktop_config_load_group_descriptions (GkbdDesktopConfig
short_group_names,
gchar *** full_group_names);
-extern void gkbd_desktop_config_lock_next_group (GkbdDesktopConfig *
+void gkbd_desktop_config_lock_next_group (GkbdDesktopConfig *
config);
-extern void gkbd_desktop_config_lock_prev_group (GkbdDesktopConfig *
+void gkbd_desktop_config_lock_prev_group (GkbdDesktopConfig *
config);
-extern void gkbd_desktop_config_restore_group (GkbdDesktopConfig * config);
+void gkbd_desktop_config_restore_group (GkbdDesktopConfig * config);
-extern void gkbd_desktop_config_start_listen (GkbdDesktopConfig * config,
+void gkbd_desktop_config_start_listen (GkbdDesktopConfig * config,
GCallback func,
gpointer user_data);
-extern void gkbd_desktop_config_stop_listen (GkbdDesktopConfig * config);
+void gkbd_desktop_config_stop_listen (GkbdDesktopConfig * config);
#endif
diff --git a/libgnomekbd/gkbd-indicator-config.h b/libgnomekbd/gkbd-indicator-config.h
index 5e9cab2..c78741f 100644
--- a/libgnomekbd/gkbd-indicator-config.h
+++ b/libgnomekbd/gkbd-indicator-config.h
@@ -50,52 +50,52 @@ struct _GkbdIndicatorConfig {
* some of them require GkbdKeyboardConfig as well -
* for loading approptiate images
*/
-extern void gkbd_indicator_config_init (GkbdIndicatorConfig *
+void gkbd_indicator_config_init (GkbdIndicatorConfig *
applet_config, XklEngine * engine);
-extern void gkbd_indicator_config_term (GkbdIndicatorConfig *
+void gkbd_indicator_config_term (GkbdIndicatorConfig *
applet_config);
-extern void gkbd_indicator_config_load (GkbdIndicatorConfig
+void gkbd_indicator_config_load (GkbdIndicatorConfig
* applet_config);
-extern void gkbd_indicator_config_save (GkbdIndicatorConfig *
+void gkbd_indicator_config_save (GkbdIndicatorConfig *
applet_config);
-extern void
+void
gkbd_indicator_config_get_font_for_widget (GkbdIndicatorConfig * ind_config,
GtkWidget * widget,
gchar ** font_family,
int * font_size);
-extern gchar *
+gchar *
gkbd_indicator_config_get_fg_color_for_widget (GkbdIndicatorConfig * ind_config,
GtkWidget * widget);
-extern void gkbd_indicator_config_refresh_style (GkbdIndicatorConfig *
+void gkbd_indicator_config_refresh_style (GkbdIndicatorConfig *
applet_config);
-extern gchar
+gchar
* gkbd_indicator_config_get_images_file (GkbdIndicatorConfig *
applet_config,
GkbdKeyboardConfig *
kbd_config, int group);
-extern void gkbd_indicator_config_load_image_filenames (GkbdIndicatorConfig
+void gkbd_indicator_config_load_image_filenames (GkbdIndicatorConfig
* applet_config,
GkbdKeyboardConfig
* kbd_config);
-extern void gkbd_indicator_config_free_image_filenames (GkbdIndicatorConfig
+void gkbd_indicator_config_free_image_filenames (GkbdIndicatorConfig
* applet_config);
/* Should be updated on Indicator/GConf configuration change */
-extern void gkbd_indicator_config_activate (GkbdIndicatorConfig *
+void gkbd_indicator_config_activate (GkbdIndicatorConfig *
applet_config);
-extern void gkbd_indicator_config_start_listen (GkbdIndicatorConfig *
+void gkbd_indicator_config_start_listen (GkbdIndicatorConfig *
applet_config,
GCallback func,
gpointer user_data);
-extern void gkbd_indicator_config_stop_listen (GkbdIndicatorConfig *
+void gkbd_indicator_config_stop_listen (GkbdIndicatorConfig *
applet_config);
#endif
diff --git a/libgnomekbd/gkbd-indicator.h b/libgnomekbd/gkbd-indicator.h
index 7f69405..e7796c0 100644
--- a/libgnomekbd/gkbd-indicator.h
+++ b/libgnomekbd/gkbd-indicator.h
@@ -46,23 +46,23 @@ struct _GkbdIndicatorClass {
void (*reinit_ui) (GkbdIndicator * gki);
};
-extern GType gkbd_indicator_get_type (void);
+GType gkbd_indicator_get_type (void);
-extern GtkWidget *gkbd_indicator_new (void);
+GtkWidget *gkbd_indicator_new (void);
-extern void gkbd_indicator_reinit_ui (GkbdIndicator * gki);
+void gkbd_indicator_reinit_ui (GkbdIndicator * gki);
-extern void gkbd_indicator_set_angle (GkbdIndicator * gki, gdouble angle);
+void gkbd_indicator_set_angle (GkbdIndicator * gki, gdouble angle);
-extern XklEngine *gkbd_indicator_get_xkl_engine (void);
+XklEngine *gkbd_indicator_get_xkl_engine (void);
-extern gchar **gkbd_indicator_get_group_names (void);
+gchar **gkbd_indicator_get_group_names (void);
-extern gchar *gkbd_indicator_get_image_filename (guint group);
+gchar *gkbd_indicator_get_image_filename (guint group);
-extern gdouble gkbd_indicator_get_max_width_height_ratio (void);
+gdouble gkbd_indicator_get_max_width_height_ratio (void);
-extern void
+void
gkbd_indicator_set_parent_tooltips (GkbdIndicator * gki, gboolean ifset);
G_END_DECLS
diff --git a/libgnomekbd/gkbd-keyboard-config.h b/libgnomekbd/gkbd-keyboard-config.h
index 5bc1c2f..c4a6257 100644
--- a/libgnomekbd/gkbd-keyboard-config.h
+++ b/libgnomekbd/gkbd-keyboard-config.h
@@ -27,10 +27,6 @@
#define GKBD_KEYBOARD_SCHEMA "org.gnome.libgnomekbd.keyboard"
-extern const gchar GKBD_KEYBOARD_CONFIG_KEY_MODEL[];
-extern const gchar GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS[];
-extern const gchar GKBD_KEYBOARD_CONFIG_KEY_OPTIONS[];
-
/*
* Keyboard Configuration
*/
@@ -49,48 +45,48 @@ struct _GkbdKeyboardConfig {
/*
* GkbdKeyboardConfig functions
*/
-extern void gkbd_keyboard_config_init (GkbdKeyboardConfig * kbd_config,
+void gkbd_keyboard_config_init (GkbdKeyboardConfig * kbd_config,
XklEngine * engine);
-extern void gkbd_keyboard_config_term (GkbdKeyboardConfig * kbd_config);
+void gkbd_keyboard_config_term (GkbdKeyboardConfig * kbd_config);
-extern void gkbd_keyboard_config_load (GkbdKeyboardConfig * kbd_config,
+void gkbd_keyboard_config_load (GkbdKeyboardConfig * kbd_config,
GkbdKeyboardConfig *
kbd_config_default);
-extern void gkbd_keyboard_config_save (GkbdKeyboardConfig * kbd_config);
+void gkbd_keyboard_config_save (GkbdKeyboardConfig * kbd_config);
-extern void gkbd_keyboard_config_load_from_x_initial (GkbdKeyboardConfig *
+void gkbd_keyboard_config_load_from_x_initial (GkbdKeyboardConfig *
kbd_config,
XklConfigRec * buf);
-extern void gkbd_keyboard_config_load_from_x_current (GkbdKeyboardConfig *
+void gkbd_keyboard_config_load_from_x_current (GkbdKeyboardConfig *
kbd_config,
XklConfigRec * buf);
-extern void gkbd_keyboard_config_start_listen (GkbdKeyboardConfig *
+void gkbd_keyboard_config_start_listen (GkbdKeyboardConfig *
kbd_config,
GCallback func,
gpointer user_data);
-extern void gkbd_keyboard_config_stop_listen (GkbdKeyboardConfig *
+void gkbd_keyboard_config_stop_listen (GkbdKeyboardConfig *
kbd_config);
-extern gboolean gkbd_keyboard_config_equals (GkbdKeyboardConfig *
+gboolean gkbd_keyboard_config_equals (GkbdKeyboardConfig *
kbd_config1,
GkbdKeyboardConfig *
kbd_config2);
-extern gboolean gkbd_keyboard_config_activate (GkbdKeyboardConfig *
+gboolean gkbd_keyboard_config_activate (GkbdKeyboardConfig *
kbd_config);
-extern const gchar *gkbd_keyboard_config_merge_items (const gchar * parent,
+const gchar *gkbd_keyboard_config_merge_items (const gchar * parent,
const gchar * child);
-extern gboolean gkbd_keyboard_config_split_items (const gchar * merged,
+gboolean gkbd_keyboard_config_split_items (const gchar * merged,
gchar ** parent,
gchar ** child);
-extern gboolean gkbd_keyboard_config_get_descriptions (XklConfigRegistry *
+gboolean gkbd_keyboard_config_get_descriptions (XklConfigRegistry *
config_registry,
const gchar * name,
gchar **
@@ -102,17 +98,17 @@ extern gboolean gkbd_keyboard_config_get_descriptions (XklConfigRegistry *
gchar **
variant_descr);
-extern const gchar *gkbd_keyboard_config_format_full_description (const
+const gchar *gkbd_keyboard_config_format_full_description (const
gchar *
layout_descr,
const
gchar *
variant_descr);
-extern gchar *gkbd_keyboard_config_to_string (const GkbdKeyboardConfig *
+gchar *gkbd_keyboard_config_to_string (const GkbdKeyboardConfig *
config);
-extern gchar
+gchar
**
gkbd_keyboard_config_add_default_switch_option_if_necessary (gchar **
layouts_list,
diff --git a/libgnomekbd/gkbd-status.h b/libgnomekbd/gkbd-status.h
index 086f8cc..b7929aa 100644
--- a/libgnomekbd/gkbd-status.h
+++ b/libgnomekbd/gkbd-status.h
@@ -44,17 +44,17 @@ struct _GkbdStatusClass {
GtkNotebookClass parent_class;
};
-extern GType gkbd_status_get_type (void);
+GType gkbd_status_get_type (void);
-extern GtkStatusIcon *gkbd_status_new (void);
+GtkStatusIcon *gkbd_status_new (void);
-extern void gkbd_status_reinit_ui (GkbdStatus * gki);
+void gkbd_status_reinit_ui (GkbdStatus * gki);
-extern XklEngine *gkbd_status_get_xkl_engine (void);
+XklEngine *gkbd_status_get_xkl_engine (void);
-extern gchar **gkbd_status_get_group_names (void);
+gchar **gkbd_status_get_group_names (void);
-extern gchar *gkbd_status_get_image_filename (guint group);
+gchar *gkbd_status_get_image_filename (guint group);
G_END_DECLS
#endif
diff --git a/libgnomekbd/gkbd-util.h b/libgnomekbd/gkbd-util.h
index fb6e9c1..2b5557f 100644
--- a/libgnomekbd/gkbd-util.h
+++ b/libgnomekbd/gkbd-util.h
@@ -23,17 +23,17 @@
#include <glib.h>
#include <gdk/gdk.h>
-extern void gkbd_install_glib_log_appender (void);
+void gkbd_install_glib_log_appender (void);
-extern GdkRectangle *gkbd_preview_load_position (void);
+GdkRectangle *gkbd_preview_load_position (void);
-extern void gkbd_preview_save_position (GdkRectangle * rect);
+void gkbd_preview_save_position (GdkRectangle * rect);
/* Missing in glib */
-extern gboolean gkbd_strv_remove (gchar ** arr, const gchar * element);
+gboolean gkbd_strv_remove (gchar ** arr, const gchar * element);
-extern gchar **gkbd_strv_append (gchar ** arr, gchar * element);
+gchar **gkbd_strv_append (gchar ** arr, gchar * element);
-extern void gkbd_strv_behead (gchar ** arr);
+void gkbd_strv_behead (gchar ** arr);
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
