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 --- 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 --- 11 files changed, 2 insertions(+), 25 deletions(-) (limited to 'src') 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