[epiphany] Enable and placate -Wredundant-decls



commit 142a94dea4825b23af6240da3d078305f2edfe11
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sat Dec 26 21:01:31 2015 -0600

    Enable and placate -Wredundant-decls

 configure.ac                          |    2 +-
 lib/widgets/ephy-file-chooser.c       |    4 +---
 lib/widgets/ephy-zoom-action.c        |    3 ---
 src/bookmarks/ephy-bookmarks-editor.c |    2 --
 src/bookmarks/ephy-bookmarks.c        |    2 --
 src/ephy-link-action.c                |    8 ++++----
 src/ephy-link.h                       |    2 --
 src/ephy-location-controller.c        |    2 --
 src/ephy-navigation-history-action.c  |    4 ----
 src/ephy-shell.c                      |    2 --
 src/ephy-shell.h                      |    2 --
 src/prefs-dialog.c                    |    6 +-----
 12 files changed, 7 insertions(+), 32 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 75eaae6..001fb7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AX_COMPILER_FLAGS([WARN_CFLAGS], [WARN_LDFLAGS], [$ax_is_release], [-Wdeclaratio
        dnl TODO: Remove all of these! These warnings should be fixed, not
        dnl silenced. At least, for the most part. -Wswitch-enum really does
        dnl seem pretty dumb.
-       [-Wno-deprecated-declarations -Wno-switch-enum -Wno-switch-default -Wno-redundant-decls 
-Wno-discarded-qualifiers -Wno-sign-compare])
+       [-Wno-deprecated-declarations -Wno-switch-enum -Wno-switch-default -Wno-discarded-qualifiers 
-Wno-sign-compare])
 
 AC_PROG_CC
 
diff --git a/lib/widgets/ephy-file-chooser.c b/lib/widgets/ephy-file-chooser.c
index 7e68364..f32f457 100644
--- a/lib/widgets/ephy-file-chooser.c
+++ b/lib/widgets/ephy-file-chooser.c
@@ -28,9 +28,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-static void ephy_file_chooser_class_init       (EphyFileChooserClass *klass);
-static void ephy_file_chooser_init             (EphyFileChooser *dialog);
-static void ephy_file_chooser_image_preview    (GtkFileChooser *file_chooser, 
+static void ephy_file_chooser_image_preview    (GtkFileChooser *file_chooser,
                                                 gpointer user_data);
 
 #define PREVIEW_WIDTH 150
diff --git a/lib/widgets/ephy-zoom-action.c b/lib/widgets/ephy-zoom-action.c
index 21db97b..f1e0290 100644
--- a/lib/widgets/ephy-zoom-action.c
+++ b/lib/widgets/ephy-zoom-action.c
@@ -46,9 +46,6 @@ enum
 
 static GParamSpec *obj_properties[LAST_PROP];
 
-static void ephy_zoom_action_init       (EphyZoomAction *action);
-static void ephy_zoom_action_class_init (EphyZoomActionClass *class);
-
 enum
 {
        ZOOM_TO_LEVEL_SIGNAL,
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index d7e4c77..20b48cf 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -75,8 +75,6 @@ export_formats [] =
        { N_("Mozilla (HTML)"), "html" }
 };
 
-static void ephy_bookmarks_editor_class_init (EphyBookmarksEditorClass *klass);
-static void ephy_bookmarks_editor_init (EphyBookmarksEditor *editor);
 static void ephy_bookmarks_editor_finalize (GObject *object);
 static void ephy_bookmarks_editor_dispose  (GObject *object);
 static void ephy_bookmarks_editor_set_property (GObject *object,
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 0254fcb..87fc5d1 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -101,8 +101,6 @@ enum
 
 static guint ephy_bookmarks_signals[LAST_SIGNAL];
 
-static void ephy_bookmarks_class_init  (EphyBookmarksClass *klass);
-static void ephy_bookmarks_init                (EphyBookmarks *tab);
 static void ephy_bookmarks_finalize    (GObject *object);
 static char *impl_resolve_address      (EphyBookmarks*, const char*, const char*);
 static void ephy_local_bookmarks_start_client (EphyBookmarks *bookmarks);
diff --git a/src/ephy-link-action.c b/src/ephy-link-action.c
index 114a5a8..9c48ad7 100644
--- a/src/ephy-link-action.c
+++ b/src/ephy-link-action.c
@@ -157,6 +157,10 @@ ephy_link_action_get_button (EphyLinkAction *action)
        return action->priv->button;
 }
 
+G_DEFINE_TYPE_WITH_CODE (EphyLinkActionGroup, ephy_link_action_group, GTK_TYPE_ACTION_GROUP,
+                        G_IMPLEMENT_INTERFACE (EPHY_TYPE_LINK,
+                                               NULL))
+
 static void
 ephy_link_action_group_class_init (EphyLinkActionGroupClass *klass)
 {
@@ -169,10 +173,6 @@ ephy_link_action_group_init (EphyLinkActionGroup *action_group)
        /* Empty, needed for G_DEFINE_TYPE macro */
 }
 
-G_DEFINE_TYPE_WITH_CODE (EphyLinkActionGroup, ephy_link_action_group, GTK_TYPE_ACTION_GROUP,
-                        G_IMPLEMENT_INTERFACE (EPHY_TYPE_LINK,
-                                               NULL))
-
 EphyLinkActionGroup *
 ephy_link_action_group_new (const char * name)
 {
diff --git a/src/ephy-link.h b/src/ephy-link.h
index 46a0f17..927873f 100644
--- a/src/ephy-link.h
+++ b/src/ephy-link.h
@@ -61,8 +61,6 @@ struct _EphyLinkIface
                                   EphyLinkFlags flags);
 };
 
-GType   ephy_link_flags_get_type       (void);
-
 GType   ephy_link_get_type             (void);
 
 EphyEmbed *ephy_link_open              (EphyLink *link,
diff --git a/src/ephy-location-controller.c b/src/ephy-location-controller.c
index aed1cbf..d827280 100644
--- a/src/ephy-location-controller.c
+++ b/src/ephy-location-controller.c
@@ -59,8 +59,6 @@ struct _EphyLocationControllerPrivate
        gboolean sync_address_is_blocked;
 };
 
-static void ephy_location_controller_init          (EphyLocationController *controller);
-static void ephy_location_controller_class_init (EphyLocationControllerClass *class);
 static void ephy_location_controller_finalize   (GObject *object);
 static void user_changed_cb                (GtkWidget *widget,
                                             EphyLocationController *controller);
diff --git a/src/ephy-navigation-history-action.c b/src/ephy-navigation-history-action.c
index 1bb3369..69cc2d7 100644
--- a/src/ephy-navigation-history-action.c
+++ b/src/ephy-navigation-history-action.c
@@ -67,10 +67,6 @@ typedef enum {
   WEBKIT_HISTORY_FORWARD
 } WebKitHistoryType;
 
-
-static void ephy_navigation_history_action_init       (EphyNavigationHistoryAction *action);
-static void ephy_navigation_history_action_class_init (EphyNavigationHistoryActionClass *klass);
-
 G_DEFINE_TYPE (EphyNavigationHistoryAction, ephy_navigation_history_action, EPHY_TYPE_LINK_ACTION)
 
 static void
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index afacba9..63c0917 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -67,8 +67,6 @@ struct _EphyShellPrivate {
 
 static EphyShell *ephy_shell = NULL;
 
-static void ephy_shell_class_init (EphyShellClass *klass);
-static void ephy_shell_init   (EphyShell *shell);
 static void ephy_shell_dispose    (GObject *object);
 static void ephy_shell_finalize   (GObject *object);
 
diff --git a/src/ephy-shell.h b/src/ephy-shell.h
index 93aafdf..28abd1c 100644
--- a/src/ephy-shell.h
+++ b/src/ephy-shell.h
@@ -101,8 +101,6 @@ struct _EphyShellClass {
   EphyEmbedShellClass parent_class;
 };
 
-GType           ephy_new_tab_flags_get_type             (void) G_GNUC_CONST;
-
 GType           ephy_shell_get_type                     (void);
 
 EphyShell      *ephy_shell_get_default                  (void);
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 250e8c8..8c15824 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -38,6 +38,7 @@
 #include "ephy-shell.h"
 #include "clear-data-dialog.h"
 #include "cookies-dialog.h"
+#include "languages.h"
 #include "passwords-dialog.h"
 
 #include <glib/gi18n.h>
@@ -46,11 +47,6 @@
 
 #define DOWNLOAD_BUTTON_WIDTH  8
 
-static void prefs_dialog_class_init    (PrefsDialogClass *klass);
-static void prefs_dialog_init          (PrefsDialog *pd);
-
-#include "languages.h"
-
 enum
 {
        COL_LANG_NAME,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]