Fix various compiler warnings

Mostly missing declarations and missing statics.
This commit is contained in:
Matthias Clasen
2014-09-05 21:21:49 -04:00
parent c88c16d1f4
commit d55e3b25a7
13 changed files with 91 additions and 98 deletions

View File

@ -24,6 +24,7 @@
#include "config.h"
#include "gtkadjustment.h"
#include "gtkadjustmentprivate.h"
#include "gtkmarshalers.h"
#include "gtkprivate.h"
#include "gtkintl.h"

View File

@ -206,6 +206,8 @@ gtk_application_impl_dbus_shutdown (GtkApplicationImpl *impl)
{
}
GQuark gtk_application_impl_dbus_export_id_quark (void);
G_DEFINE_QUARK (GtkApplicationImplDBus export id, gtk_application_impl_dbus_export_id)
static void

View File

@ -423,7 +423,7 @@ accels_set_accels_for_action (Accels *accels,
g_hash_table_remove (accels->action_to_accels, action_and_target);
}
gchar **
static gchar **
accels_get_accels_for_action (Accels *accels,
const gchar *action_and_target)
{
@ -486,18 +486,6 @@ struct _GtkApplicationPrivate
G_DEFINE_TYPE_WITH_PRIVATE (GtkApplication, gtk_application, G_TYPE_APPLICATION)
const gchar *
gtk_application_get_app_menu_object_path (GtkApplication *application)
{
g_assert_not_reached (); /* XXX */
}
const gchar *
gtk_application_get_menubar_object_path (GtkApplication *application)
{
g_assert_not_reached (); /* XXX */
}
static gboolean
gtk_application_focus_in_event_cb (GtkWindow *window,
GdkEventFocus *event,
@ -1612,7 +1600,7 @@ gtk_application_list_action_descriptions (GtkApplication *application)
return result;
}
gchar *
static gchar *
normalise_detailed_name (const gchar *detailed_action_name)
{
GError *error = NULL;

View File

@ -29,7 +29,7 @@
G_DEFINE_TYPE (GtkCssImageIconTheme, _gtk_css_image_icon_theme, GTK_TYPE_CSS_IMAGE)
double
static double
gtk_css_image_icon_theme_get_aspect_ratio (GtkCssImage *image)
{
/* icon theme icons only take a single size when requesting, so we insist on being square */

View File

@ -22,6 +22,7 @@
#include <math.h>
#include <string.h>
#include "gtkcsstransformvalueprivate.h"
#include "gtkcssnumbervalueprivate.h"
typedef union _GtkCssTransform GtkCssTransform;

View File

@ -29,6 +29,7 @@
#include "gtkbutton.h"
#include "gtkdialog.h"
#include "gtkdialogprivate.h"
#include "gtkheaderbar.h"
#include "gtkbbox.h"
#include "gtklabel.h"

View File

@ -830,7 +830,7 @@ _gtk_file_system_volume_unref (GtkFileSystemVolume *volume)
}
/* GFileInfo helper functions */
cairo_surface_t *
static cairo_surface_t *
_gtk_file_info_render_icon_internal (GFileInfo *info,
GtkWidget *widget,
gint icon_size,

View File

@ -31,6 +31,8 @@
# include "gtkprinteroptionwidget.h"
#endif
void gtk_glade_catalog_init (const gchar *catalog_name);
/* This function is referred to in gtk/glade/gtk-private-widgets.xml
* and is used to ensure the private types for use in Glade while
* editing UI files that define GTK+s various composite widget classes.

View File

@ -40,6 +40,7 @@ G_BEGIN_DECLS
typedef struct _GtkMenuSectionBox GtkMenuSectionBox;
GType gtk_menu_section_box_get_type (void) G_GNUC_CONST;
void gtk_menu_section_box_new_toplevel (GtkStack *stack,
GMenuModel *model,
const gchar *action_namespace);

View File

@ -389,7 +389,7 @@ gtk_model_menu_item_get_accel (GtkModelMenuItem *item)
return NULL;
}
void
static void
gtk_model_menu_item_get_property (GObject *object,
guint prop_id,
GValue *value,
@ -423,7 +423,8 @@ gtk_model_menu_item_get_property (GObject *object,
g_assert_not_reached ();
}
}
void
static void
gtk_model_menu_item_set_property (GObject *object,
guint prop_id,
const GValue *value,

View File

@ -247,7 +247,7 @@ _gtk_pixel_cache_create_surface_if_needed (GtkPixelCache *cache,
}
}
void
static void
_gtk_pixel_cache_set_position (GtkPixelCache *cache,
cairo_rectangle_int_t *view_rect,
cairo_rectangle_int_t *canvas_rect)
@ -268,11 +268,9 @@ _gtk_pixel_cache_set_position (GtkPixelCache *cache,
/* Reposition so all is visible */
if (view_pos.x < cache->surface_x ||
view_pos.x + view_pos.width >
cache->surface_x + cache->surface_w ||
view_pos.x + view_pos.width > cache->surface_x + cache->surface_w ||
view_pos.y < cache->surface_y ||
view_pos.y + view_pos.height >
cache->surface_y + cache->surface_h)
view_pos.y + view_pos.height > cache->surface_y + cache->surface_h)
{
new_surf_x = cache->surface_x;
if (view_pos.x < cache->surface_x)
@ -327,7 +325,7 @@ _gtk_pixel_cache_set_position (GtkPixelCache *cache,
}
}
void
static void
_gtk_pixel_cache_repaint (GtkPixelCache *cache,
GtkPixelCacheDrawFunc draw,
cairo_rectangle_int_t *view_rect,
@ -434,10 +432,8 @@ void
_gtk_pixel_cache_draw (GtkPixelCache *cache,
cairo_t *cr,
GdkWindow *window,
/* View position in widget coords */
cairo_rectangle_int_t *view_rect,
/* Size and position of canvas in view coords */
cairo_rectangle_int_t *canvas_rect,
cairo_rectangle_int_t *view_rect, /* View position in widget coords */
cairo_rectangle_int_t *canvas_rect, /* Size and position of canvas in view coords */
GtkPixelCacheDrawFunc draw,
gpointer user_data)
{

View File

@ -4531,7 +4531,7 @@ _gtk_style_context_get_changes (GtkStyleContext *context)
return context->priv->invalidating_context;
}
void
static void
gtk_cairo_rectangle_transform (cairo_rectangle_int_t *dest,
const cairo_rectangle_int_t *src,
const cairo_matrix_t *matrix)

View File

@ -17056,7 +17056,7 @@ event_controller_sequence_state_changed (GtkGesture *gesture,
}
}
EventControllerData *
static EventControllerData *
_gtk_widget_has_controller (GtkWidget *widget,
GtkEventController *controller)
{