From c18cf51868958ac9d7b564e0d4fd6e75a37c747c Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Sat, 23 Nov 2019 14:44:01 +0100 Subject: avoid redundant redeclarations --- eel/eel-canvas.c | 14 +++++++------- eel/eel-editable-label.c | 19 ++++++++----------- libcaja-private/caja-directory-private.h | 2 -- libcaja-private/caja-directory.c | 2 -- libcaja-private/caja-icon-container.c | 16 ++++++++-------- libcaja-private/caja-keep-last-vertical-box.c | 2 -- libcaja-private/caja-query.c | 3 --- libcaja-private/caja-search-engine-beagle.c | 3 --- libcaja-private/caja-search-engine-simple.c | 4 ---- libcaja-private/caja-search-engine-tracker.c | 4 ---- libcaja-private/caja-search-engine.c | 3 --- libcaja-private/caja-tree-view-drag-dest.c | 4 +--- src/caja-information-panel.c | 1 - src/caja-navigation-action.c | 3 --- src/caja-navigation-window-pane.c | 2 -- src/caja-navigation-window-slot.c | 4 +--- src/caja-notebook.c | 2 -- src/caja-side-pane.c | 2 -- src/caja-view-as-action.c | 3 --- src/caja-window-pane.c | 2 -- src/caja-window-slot.c | 3 +-- src/caja-window.h | 2 -- src/caja-zoom-action.c | 3 --- 23 files changed, 26 insertions(+), 77 deletions(-) diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c index 7efa67f8..e72cc7ce 100644 --- a/eel/eel-canvas.c +++ b/eel/eel-canvas.c @@ -3977,13 +3977,6 @@ eel_canvas_item_accessible_factory_create_accessible (GObject *obj) return accessible; } -static void -eel_canvas_item_accessible_factory_class_init (AtkObjectFactoryClass *klass) -{ - klass->create_accessible = eel_canvas_item_accessible_factory_create_accessible; - klass->get_accessible_type = eel_canvas_item_accessible_factory_get_accessible_type; -} - static GType eel_canvas_item_accessible_factory_get_type (void); typedef AtkObjectFactory EelCanvasItemAccessibleFactory; @@ -3991,6 +3984,13 @@ typedef AtkObjectFactoryClass EelCanvasItemAccessibleFactoryClass; G_DEFINE_TYPE (EelCanvasItemAccessibleFactory, eel_canvas_item_accessible_factory, ATK_TYPE_OBJECT_FACTORY) +static void +eel_canvas_item_accessible_factory_class_init (AtkObjectFactoryClass *klass) +{ + klass->create_accessible = eel_canvas_item_accessible_factory_create_accessible; + klass->get_accessible_type = eel_canvas_item_accessible_factory_get_accessible_type; +} + static void eel_canvas_item_accessible_factory_init (EelCanvasItemAccessibleFactory *accessible) { diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c index 800552e8..0b2cef59 100644 --- a/eel/eel-editable-label.c +++ b/eel/eel-editable-label.c @@ -67,8 +67,6 @@ enum static guint signals[LAST_SIGNAL] = { 0 }; static void eel_editable_label_editable_init (GtkEditableInterface *iface); -static void eel_editable_label_class_init (EelEditableLabelClass *klass); -static void eel_editable_label_init (EelEditableLabel *label); static void eel_editable_label_set_property (GObject *object, guint prop_id, const GValue *value, @@ -4229,6 +4227,14 @@ eel_editable_label_accessible_finalize (GObject *object) G_OBJECT_CLASS (a11y_parent_class)->finalize (object); } +G_DEFINE_TYPE_WITH_CODE (EelEditableLabelAccessible, + eel_editable_label_accessible, + GTK_TYPE_WIDGET_ACCESSIBLE, + G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, + atk_editable_text_interface_init) + G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, + atk_text_interface_init)); + static void eel_editable_label_accessible_class_init (EelEditableLabelAccessibleClass *klass) { @@ -4247,12 +4253,3 @@ static void eel_editable_label_accessible_init (EelEditableLabelAccessible *accessible) { } - -G_DEFINE_TYPE_WITH_CODE (EelEditableLabelAccessible, - eel_editable_label_accessible, - GTK_TYPE_WIDGET_ACCESSIBLE, - G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, - atk_editable_text_interface_init) - G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, - atk_text_interface_init)); - diff --git a/libcaja-private/caja-directory-private.h b/libcaja-private/caja-directory-private.h index 5e7b7d68..bff30b6b 100644 --- a/libcaja-private/caja-directory-private.h +++ b/libcaja-private/caja-directory-private.h @@ -222,8 +222,6 @@ FileMonitors * caja_directory_remove_file_monitors (CajaDirectory void caja_directory_add_file_monitors (CajaDirectory *directory, CajaFile *file, FileMonitors *monitors); -void caja_directory_add_file (CajaDirectory *directory, - CajaFile *file); GList * caja_directory_begin_file_name_change (CajaDirectory *directory, CajaFile *file); void caja_directory_end_file_name_change (CajaDirectory *directory, diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c index 00e03499..8b315e00 100644 --- a/libcaja-private/caja-directory.c +++ b/libcaja-private/caja-directory.c @@ -55,8 +55,6 @@ static guint signals[LAST_SIGNAL] = { 0 }; static GHashTable *directories; static void caja_directory_finalize (GObject *object); -static void caja_directory_init (CajaDirectory *directory); -static void caja_directory_class_init (CajaDirectoryClass *klass); static CajaDirectory *caja_directory_new (GFile *location); static char * real_get_name_for_self_as_new_file (CajaDirectory *directory); static GList * real_get_file_list (CajaDirectory *directory); diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c index dbb7050a..5de4ac39 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -9990,6 +9990,14 @@ caja_icon_container_accessible_finalize (GObject *object) G_OBJECT_CLASS (accessible_parent_class)->finalize (object); } +G_DEFINE_TYPE_WITH_CODE (CajaIconContainerAccessible, + caja_icon_container_accessible, + eel_canvas_accessible_get_type (), + G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, + caja_icon_container_accessible_action_interface_init) + G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, + caja_icon_container_accessible_selection_interface_init)); + static void caja_icon_container_accessible_init (CajaIconContainerAccessible *accessible) { @@ -10012,14 +10020,6 @@ caja_icon_container_accessible_class_init (CajaIconContainerAccessibleClass *kla accessible_private_data_quark = g_quark_from_static_string ("icon-container-accessible-private-data"); } -G_DEFINE_TYPE_WITH_CODE (CajaIconContainerAccessible, - caja_icon_container_accessible, - eel_canvas_accessible_get_type (), - G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, - caja_icon_container_accessible_action_interface_init) - G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, - caja_icon_container_accessible_selection_interface_init)); - #if ! defined (CAJA_OMIT_SELF_CHECK) static char * diff --git a/libcaja-private/caja-keep-last-vertical-box.c b/libcaja-private/caja-keep-last-vertical-box.c index 65b6541d..91107c69 100644 --- a/libcaja-private/caja-keep-last-vertical-box.c +++ b/libcaja-private/caja-keep-last-vertical-box.c @@ -26,8 +26,6 @@ #include #include "caja-keep-last-vertical-box.h" -static void caja_keep_last_vertical_box_class_init (CajaKeepLastVerticalBoxClass *class); -static void caja_keep_last_vertical_box_init (CajaKeepLastVerticalBox *box); static void caja_keep_last_vertical_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation); diff --git a/libcaja-private/caja-query.c b/libcaja-private/caja-query.c index 1064fd16..70782c8e 100644 --- a/libcaja-private/caja-query.c +++ b/libcaja-private/caja-query.c @@ -42,9 +42,6 @@ struct CajaQueryDetails char *contained_text; }; -static void caja_query_class_init (CajaQueryClass *class); -static void caja_query_init (CajaQuery *query); - G_DEFINE_TYPE (CajaQuery, caja_query, G_TYPE_OBJECT); diff --git a/libcaja-private/caja-search-engine-beagle.c b/libcaja-private/caja-search-engine-beagle.c index a07fa75d..c01b6539 100644 --- a/libcaja-private/caja-search-engine-beagle.c +++ b/libcaja-private/caja-search-engine-beagle.c @@ -166,9 +166,6 @@ beagle_client_new (const char *client_name) return NULL; } -static void caja_search_engine_beagle_class_init (CajaSearchEngineBeagleClass *class); -static void caja_search_engine_beagle_init (CajaSearchEngineBeagle *engine); - G_DEFINE_TYPE (CajaSearchEngineBeagle, caja_search_engine_beagle, CAJA_TYPE_SEARCH_ENGINE); diff --git a/libcaja-private/caja-search-engine-simple.c b/libcaja-private/caja-search-engine-simple.c index f9c6498d..b7a985d4 100644 --- a/libcaja-private/caja-search-engine-simple.c +++ b/libcaja-private/caja-search-engine-simple.c @@ -64,10 +64,6 @@ struct CajaSearchEngineSimpleDetails gboolean query_finished; }; - -static void caja_search_engine_simple_class_init (CajaSearchEngineSimpleClass *class); -static void caja_search_engine_simple_init (CajaSearchEngineSimple *engine); - G_DEFINE_TYPE (CajaSearchEngineSimple, caja_search_engine_simple, CAJA_TYPE_SEARCH_ENGINE); diff --git a/libcaja-private/caja-search-engine-tracker.c b/libcaja-private/caja-search-engine-tracker.c index 33ac6d9a..102ca060 100644 --- a/libcaja-private/caja-search-engine-tracker.c +++ b/libcaja-private/caja-search-engine-tracker.c @@ -187,10 +187,6 @@ struct CajaSearchEngineTrackerDetails TrackerVersion version; }; - -static void caja_search_engine_tracker_class_init (CajaSearchEngineTrackerClass *class); -static void caja_search_engine_tracker_init (CajaSearchEngineTracker *engine); - G_DEFINE_TYPE (CajaSearchEngineTracker, caja_search_engine_tracker, CAJA_TYPE_SEARCH_ENGINE); diff --git a/libcaja-private/caja-search-engine.c b/libcaja-private/caja-search-engine.c index 74782aa6..20a54190 100644 --- a/libcaja-private/caja-search-engine.c +++ b/libcaja-private/caja-search-engine.c @@ -46,9 +46,6 @@ enum static guint signals[LAST_SIGNAL] = { 0 }; -static void caja_search_engine_class_init (CajaSearchEngineClass *class); -static void caja_search_engine_init (CajaSearchEngine *engine); - G_DEFINE_ABSTRACT_TYPE (CajaSearchEngine, caja_search_engine, G_TYPE_OBJECT); diff --git a/libcaja-private/caja-tree-view-drag-dest.c b/libcaja-private/caja-tree-view-drag-dest.c index 041e26a5..19aaae63 100644 --- a/libcaja-private/caja-tree-view-drag-dest.c +++ b/libcaja-private/caja-tree-view-drag-dest.c @@ -78,13 +78,11 @@ enum LAST_SIGNAL }; -static void caja_tree_view_drag_dest_init (CajaTreeViewDragDest *dest); -static void caja_tree_view_drag_dest_class_init (CajaTreeViewDragDestClass *class); - static guint signals[LAST_SIGNAL] = { 0 }; G_DEFINE_TYPE (CajaTreeViewDragDest, caja_tree_view_drag_dest, G_TYPE_OBJECT); + #define parent_class caja_tree_view_drag_dest_parent_class static const GtkTargetEntry drag_types [] = diff --git a/src/caja-information-panel.c b/src/caja-information-panel.c index cbe6658a..d2eeb150 100644 --- a/src/caja-information-panel.c +++ b/src/caja-information-panel.c @@ -91,7 +91,6 @@ static void caja_information_panel_update_appearance (CajaInformationPan static void caja_information_panel_update_buttons (CajaInformationPanel *information_panel); static void background_metadata_changed_callback (CajaInformationPanel *information_panel); static void caja_information_panel_iface_init (CajaSidebarIface *iface); -static void caja_information_panel_iface_init (CajaSidebarIface *iface); static void sidebar_provider_iface_init (CajaSidebarProviderIface *iface); static GType caja_information_panel_provider_get_type (void); diff --git a/src/caja-navigation-action.c b/src/caja-navigation-action.c index 28f62eab..b55a54ea 100644 --- a/src/caja-navigation-action.c +++ b/src/caja-navigation-action.c @@ -38,9 +38,6 @@ #include "caja-window-private.h" #include "caja-navigation-window-slot.h" -static void caja_navigation_action_init (CajaNavigationAction *action); -static void caja_navigation_action_class_init (CajaNavigationActionClass *class); - struct _CajaNavigationActionPrivate { CajaNavigationWindow *window; diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c index b5e4bb6f..29018b50 100644 --- a/src/caja-navigation-window-pane.c +++ b/src/caja-navigation-window-pane.c @@ -37,8 +37,6 @@ #include "caja-notebook.h" #include "caja-window-slot.h" -static void caja_navigation_window_pane_init (CajaNavigationWindowPane *pane); -static void caja_navigation_window_pane_class_init (CajaNavigationWindowPaneClass *class); static void caja_navigation_window_pane_dispose (GObject *object); G_DEFINE_TYPE (CajaNavigationWindowPane, diff --git a/src/caja-navigation-window-slot.c b/src/caja-navigation-window-slot.c index 993c2fb1..7f89834c 100644 --- a/src/caja-navigation-window-slot.c +++ b/src/caja-navigation-window-slot.c @@ -33,10 +33,8 @@ #include "caja-search-bar.h" #include "caja-navigation-window-pane.h" -static void caja_navigation_window_slot_init (CajaNavigationWindowSlot *slot); -static void caja_navigation_window_slot_class_init (CajaNavigationWindowSlotClass *class); - G_DEFINE_TYPE (CajaNavigationWindowSlot, caja_navigation_window_slot, CAJA_TYPE_WINDOW_SLOT) + #define parent_class caja_navigation_window_slot_parent_class gboolean diff --git a/src/caja-notebook.c b/src/caja-notebook.c index c91ab3c3..9f39f358 100644 --- a/src/caja-notebook.c +++ b/src/caja-notebook.c @@ -41,8 +41,6 @@ #define AFTER_ALL_TABS -1 -static void caja_notebook_init (CajaNotebook *notebook); -static void caja_notebook_class_init (CajaNotebookClass *klass); static int caja_notebook_insert_page (GtkNotebook *notebook, GtkWidget *child, GtkWidget *tab_label, diff --git a/src/caja-side-pane.c b/src/caja-side-pane.c index 63da35f5..437709d2 100644 --- a/src/caja-side-pane.c +++ b/src/caja-side-pane.c @@ -53,8 +53,6 @@ struct _CajaSidePanePrivate GList *panels; }; -static void caja_side_pane_class_init (CajaSidePaneClass *klass); -static void caja_side_pane_init (CajaSidePane *side_pane); static void caja_side_pane_dispose (GObject *object); static void caja_side_pane_finalize (GObject *object); diff --git a/src/caja-view-as-action.c b/src/caja-view-as-action.c index 27e70be2..ad17ec19 100644 --- a/src/caja-view-as-action.c +++ b/src/caja-view-as-action.c @@ -36,9 +36,6 @@ #include "caja-window-private.h" #include "caja-navigation-window-slot.h" -static void caja_view_as_action_init (CajaViewAsAction *action); -static void caja_view_as_action_class_init (CajaViewAsActionClass *class); - static GObjectClass *parent_class = NULL; struct _CajaViewAsActionPrivate diff --git a/src/caja-window-pane.c b/src/caja-window-pane.c index 9ad09475..abc1388b 100644 --- a/src/caja-window-pane.c +++ b/src/caja-window-pane.c @@ -29,8 +29,6 @@ #include "caja-navigation-window-pane.h" #include "caja-window-manage-views.h" -static void caja_window_pane_init (CajaWindowPane *pane); -static void caja_window_pane_class_init (CajaWindowPaneClass *class); static void caja_window_pane_dispose (GObject *object); G_DEFINE_TYPE (CajaWindowPane, diff --git a/src/caja-window-slot.c b/src/caja-window-slot.c index abbb9200..305e2b97 100644 --- a/src/caja-window-slot.c +++ b/src/caja-window-slot.c @@ -35,8 +35,6 @@ #include "caja-window-private.h" #include "caja-window-manage-views.h" -static void caja_window_slot_init (CajaWindowSlot *slot); -static void caja_window_slot_class_init (CajaWindowSlotClass *class); static void caja_window_slot_dispose (GObject *object); static void caja_window_slot_info_iface_init (CajaWindowSlotInfoIface *iface); @@ -46,6 +44,7 @@ G_DEFINE_TYPE_WITH_CODE (CajaWindowSlot, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (CAJA_TYPE_WINDOW_SLOT_INFO, caja_window_slot_info_iface_init)) + #define parent_class caja_window_slot_parent_class static void diff --git a/src/caja-window.h b/src/caja-window.h index 3f012db0..aa5f57e0 100644 --- a/src/caja-window.h +++ b/src/caja-window.h @@ -67,8 +67,6 @@ typedef struct _CajaWindowPane CajaWindowPane; typedef struct CajaWindowSlotClass CajaWindowSlotClass; typedef enum CajaWindowOpenSlotFlags CajaWindowOpenSlotFlags; -GType caja_window_slot_get_type (void); - typedef enum { CAJA_WINDOW_NOT_SHOWN, diff --git a/src/caja-zoom-action.c b/src/caja-zoom-action.c index 6f6c7119..cb164b39 100644 --- a/src/caja-zoom-action.c +++ b/src/caja-zoom-action.c @@ -35,9 +35,6 @@ #include "caja-window-private.h" #include "caja-navigation-window-slot.h" -static void caja_zoom_action_init (CajaZoomAction *action); -static void caja_zoom_action_class_init (CajaZoomActionClass *class); - static GObjectClass *parent_class = NULL; struct _CajaZoomActionPrivate -- cgit v1.2.1