Skip to content

Commit

Permalink
No space between function name and first parenthesis, it eases grepin…
Browse files Browse the repository at this point in the history 
…g (see CODING).
  • Loading branch information
Laurent Monin committed Feb 28, 2009
1 parent 5ac2ac2 commit 96a2690
Show file tree
Hide file tree
Showing 21 changed files with 105 additions and 106 deletions.
2 changes: 1 addition & 1 deletion src/bar_histogram.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ static void bar_pane_histogram_notify_cb(FileData *fd, NotifyType type, gpointer
if (fd == phd->fd) bar_pane_histogram_update(phd);
}

static gboolean bar_pane_histogram_expose_event_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
static gboolean bar_pane_histogram_expose_event_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
{
PaneHistogramData *phd = data;
if (!phd) return TRUE;
Expand Down
8 changes: 4 additions & 4 deletions src/bar_keywords.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ static void bar_pane_keywords_changed(GtkTextBuffer *buffer, gpointer data)
file_data_register_notify_func(bar_pane_keywords_notify_cb, pkd, NOTIFY_PRIORITY_LOW);
}

static void bar_pane_keywords_mark_edited (GtkCellRendererText *cell, const gchar *path, const gchar *text, gpointer data)
static void bar_pane_keywords_mark_edited(GtkCellRendererText *cell, const gchar *path, const gchar *text, gpointer data)
{
PaneKeywordsData *pkd = data;
GtkTreeModel *store;
Expand Down Expand Up @@ -705,10 +705,10 @@ static GtkTreeModel *create_marks_list(void)
{
gchar str[10];
g_sprintf(str, " %d ", i + 1);
gtk_list_store_append (model, &iter);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter, 0, str, -1);
}
gtk_list_store_append (model, &iter);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter, 0, " ... ", -1);
return GTK_TREE_MODEL(model);
}
Expand Down Expand Up @@ -803,7 +803,7 @@ GtkWidget *bar_pane_keywords_new(const gchar *title, const gchar *key, gboolean

gtk_tree_view_column_pack_start(column, renderer, TRUE);
gtk_tree_view_column_add_attribute(column, renderer, "text", KEYWORD_COLUMN_MARK);
g_signal_connect (renderer, "edited",
g_signal_connect(renderer, "edited",
G_CALLBACK (bar_pane_keywords_mark_edited), pkd);
gtk_tree_view_append_column(GTK_TREE_VIEW(pkd->keyword_treeview), column);

Expand Down
4 changes: 2 additions & 2 deletions src/cache-loader.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ static gboolean cache_loader_process(CacheLoader *cl)
if (!cl->il && !cl->error)
{
cl->il = image_loader_new(cl->fd);
g_signal_connect (G_OBJECT(cl->il), "error", (GCallback)cache_loader_error_cb, cl);
g_signal_connect (G_OBJECT(cl->il), "done", (GCallback)cache_loader_done_cb, cl);
g_signal_connect(G_OBJECT(cl->il), "error", (GCallback)cache_loader_error_cb, cl);
g_signal_connect(G_OBJECT(cl->il), "done", (GCallback)cache_loader_done_cb, cl);
if (image_loader_start(cl->il))
{
return FALSE;
Expand Down
36 changes: 18 additions & 18 deletions src/cellrenderericon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell,
GdkRectangle *expose_area,
GtkCellRendererState flags);

static gint gqv_cell_renderer_icon_activate (GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
const gchar *path,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GtkCellRendererState flags);
static gint gqv_cell_renderer_icon_activate(GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
const gchar *path,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GtkCellRendererState flags);

enum {
TOGGLED,
Expand Down Expand Up @@ -263,7 +263,7 @@ gqv_cell_renderer_icon_class_init(GQvCellRendererIconClass *class)
0,
G_PARAM_READWRITE));
toggle_cell_signals[TOGGLED] =
g_signal_new ("toggled",
g_signal_new("toggled",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GQvCellRendererIconClass, toggled),
Expand Down Expand Up @@ -746,7 +746,7 @@ gqv_cell_renderer_icon_render(GtkCellRenderer *cell,
{
for (i = 0; i < cellicon->num_marks; i++)
{
gtk_paint_check (widget->style, window,
gtk_paint_check(widget->style, window,
state, (cellicon->marks & (1 << i)) ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
cell_area, widget, "cellcheck",
pix_rect.x + i * TOGGLE_SPACING + (TOGGLE_WIDTH - TOGGLE_SPACING) / 2,
Expand All @@ -768,16 +768,16 @@ gqv_cell_renderer_icon_render(GtkCellRenderer *cell,
}

static gint
gqv_cell_renderer_icon_activate (GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
const gchar *path,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GtkCellRendererState flags)
gqv_cell_renderer_icon_activate(GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
const gchar *path,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GtkCellRendererState flags)
{
GQvCellRendererIcon *cellicon = (GQvCellRendererIcon *) cell;
GdkEventButton *bevent = &event->button;
GdkEventButton *bevent = &event->button;

if (cellicon->show_marks &&
event->type == GDK_BUTTON_PRESS &&
Expand Down Expand Up @@ -808,7 +808,7 @@ gqv_cell_renderer_icon_activate (GtkCellRenderer *cell,
bevent->y >= rect.y && bevent->y < rect.y + rect.height)
{
cellicon->toggled_mark = i;
g_signal_emit (cell, toggle_cell_signals[TOGGLED], 0, path);
g_signal_emit(cell, toggle_cell_signals[TOGGLED], 0, path);
break;
}
}
Expand Down
9 changes: 4 additions & 5 deletions src/cellrenderericon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ extern "C" {
#endif /* __cplusplus */


#define GQV_TYPE_CELL_RENDERER_ICON (gqv_cell_renderer_icon_get_type ())
#define GQV_TYPE_CELL_RENDERER_ICON (gqv_cell_renderer_icon_get_type())
#define GQV_CELL_RENDERER_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GQV_TYPE_CELL_RENDERER_ICON, GQvCellRendererIcon))
#define GQV_CELL_RENDERER_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GQV_TYPE_CELL_RENDERER_ICON, GQvCellRendererIconClass))
#define GQV_IS_CELL_RENDERER_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GQV_TYPE_CELL_RENDERER_ICON))
Expand Down Expand Up @@ -70,8 +70,7 @@ struct _GQvCellRendererIconClass
{
GtkCellRendererClass parent_class;

void (* toggled) (GQvCellRendererIcon *cell_renderer,
const gchar *path);
void (*toggled)(GQvCellRendererIcon *cell_renderer, const gchar *path);

/* Padding for future expansion */
void (*_gtk_reserved1)(void);
Expand All @@ -80,8 +79,8 @@ struct _GQvCellRendererIconClass
void (*_gtk_reserved4)(void);
};

GType gqv_cell_renderer_icon_get_type (void);
GtkCellRenderer *gqv_cell_renderer_icon_new (void);
GType gqv_cell_renderer_icon_get_type(void);
GtkCellRenderer *gqv_cell_renderer_icon_new(void);

#ifdef __cplusplus
}
Expand Down
4 changes: 2 additions & 2 deletions src/dupe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1534,8 +1534,8 @@ static gint dupe_check_cb(gpointer data)

dw->img_loader = image_loader_new(di->fd);
image_loader_set_buffer_size(dw->img_loader, 8);
g_signal_connect (G_OBJECT(dw->img_loader), "error", (GCallback)dupe_loader_done_cb, dw);
g_signal_connect (G_OBJECT(dw->img_loader), "done", (GCallback)dupe_loader_done_cb, dw);
g_signal_connect(G_OBJECT(dw->img_loader), "error", (GCallback)dupe_loader_done_cb, dw);
g_signal_connect(G_OBJECT(dw->img_loader), "done", (GCallback)dupe_loader_done_cb, dw);

if (!image_loader_start(dw->img_loader))
{
Expand Down
68 changes: 34 additions & 34 deletions src/gq-marshal.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@


#ifdef G_ENABLE_DEBUG
#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
#define g_marshal_value_peek_char(v) g_value_get_char (v)
#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
#define g_marshal_value_peek_int(v) g_value_get_int (v)
#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
#define g_marshal_value_peek_long(v) g_value_get_long (v)
#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
#define g_marshal_value_peek_float(v) g_value_get_float (v)
#define g_marshal_value_peek_double(v) g_value_get_double (v)
#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
#define g_marshal_value_peek_param(v) g_value_get_param (v)
#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
#define g_marshal_value_peek_object(v) g_value_get_object (v)
#define g_marshal_value_peek_boolean(v) g_value_get_boolean(v)
#define g_marshal_value_peek_char(v) g_value_get_char(v)
#define g_marshal_value_peek_uchar(v) g_value_get_uchar(v)
#define g_marshal_value_peek_int(v) g_value_get_int(v)
#define g_marshal_value_peek_uint(v) g_value_get_uint(v)
#define g_marshal_value_peek_long(v) g_value_get_long(v)
#define g_marshal_value_peek_ulong(v) g_value_get_ulong(v)
#define g_marshal_value_peek_int64(v) g_value_get_int64(v)
#define g_marshal_value_peek_uint64(v) g_value_get_uint64(v)
#define g_marshal_value_peek_enum(v) g_value_get_enum(v)
#define g_marshal_value_peek_flags(v) g_value_get_flags(v)
#define g_marshal_value_peek_float(v) g_value_get_float(v)
#define g_marshal_value_peek_double(v) g_value_get_double(v)
#define g_marshal_value_peek_string(v) (char*) g_value_get_string(v)
#define g_marshal_value_peek_param(v) g_value_get_param(v)
#define g_marshal_value_peek_boxed(v) g_value_get_boxed(v)
#define g_marshal_value_peek_pointer(v) g_value_get_pointer(v)
#define g_marshal_value_peek_object(v) g_value_get_object(v)
#else /* !G_ENABLE_DEBUG */
/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
* Do not access GValues directly in your code. Instead, use the
Expand Down Expand Up @@ -52,12 +52,12 @@

/* VOID:INT,INT,INT,INT (gq-marshal.list:2) */
void
gq_marshal_VOID__INT_INT_INT_INT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
gq_marshal_VOID__INT_INT_INT_INT(GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__INT_INT_INT_INT) (gpointer data1,
gint arg_1,
Expand All @@ -69,26 +69,26 @@ gq_marshal_VOID__INT_INT_INT_INT (GClosure *closure,
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;

g_return_if_fail (n_param_values == 5);
g_return_if_fail(n_param_values == 5);

if (G_CCLOSURE_SWAP_DATA (closure))
if (G_CCLOSURE_SWAP_DATA(closure))
{
data1 = closure->data;
data2 = g_value_peek_pointer (param_values + 0);
data2 = g_value_peek_pointer(param_values + 0);
}
else
{
data1 = g_value_peek_pointer (param_values + 0);
data1 = g_value_peek_pointer(param_values + 0);
data2 = closure->data;
}
callback = (GMarshalFunc_VOID__INT_INT_INT_INT) (marshal_data ? marshal_data : cc->callback);

callback (data1,
g_marshal_value_peek_int (param_values + 1),
g_marshal_value_peek_int (param_values + 2),
g_marshal_value_peek_int (param_values + 3),
g_marshal_value_peek_int (param_values + 4),
data2);
callback(data1,
g_marshal_value_peek_int(param_values + 1),
g_marshal_value_peek_int(param_values + 2),
g_marshal_value_peek_int(param_values + 3),
g_marshal_value_peek_int(param_values + 4),
data2);
}

/* VOID:DOUBLE (gq-marshal.list:3) */
Expand Down
18 changes: 9 additions & 9 deletions src/image-load.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@


/**************************************************************************************/
/* image looader class */
/* image loader class */


enum {
Expand All @@ -37,34 +37,34 @@ enum {

static guint signals[SIGNAL_COUNT] = { 0 };

static void image_loader_init (GTypeInstance *instance, gpointer g_class);
static void image_loader_class_init (ImageLoaderClass *class);
static void image_loader_init(GTypeInstance *instance, gpointer g_class);
static void image_loader_class_init(ImageLoaderClass *class);
static void image_loader_finalize(GObject *object);
static void image_loader_stop(ImageLoader *il);

GType image_loader_get_type (void)
GType image_loader_get_type(void)
{
static GType type = 0;
if (type == 0)
{
static const GTypeInfo info = {
sizeof (ImageLoaderClass),
sizeof(ImageLoaderClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc)image_loader_class_init, /* class_init */
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (ImageLoader),
sizeof(ImageLoader),
0, /* n_preallocs */
(GInstanceInitFunc)image_loader_init, /* instance_init */
NULL /* value_table */
};
type = g_type_register_static (G_TYPE_OBJECT, "ImageLoaderType", &info, 0);
type = g_type_register_static(G_TYPE_OBJECT, "ImageLoaderType", &info, 0);
}
return type;
}

static void image_loader_init (GTypeInstance *instance, gpointer g_class)
static void image_loader_init(GTypeInstance *instance, gpointer g_class)
{
ImageLoader *il = (ImageLoader *)instance;

Expand Down Expand Up @@ -96,7 +96,7 @@ static void image_loader_init (GTypeInstance *instance, gpointer g_class)
DEBUG_1("new image loader %p, bufsize=%u idle_loop=%u", il, il->read_buffer_size, il->idle_read_loop_count);
}

static void image_loader_class_init (ImageLoaderClass *class)
static void image_loader_class_init(ImageLoaderClass *class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (class);

Expand Down
4 changes: 2 additions & 2 deletions src/image.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,8 @@ static void image_read_ahead_start(ImageWindow *imd)

image_loader_delay_area_ready(imd->read_ahead_il, TRUE); /* we will need the area_ready signals later */

g_signal_connect (G_OBJECT(imd->read_ahead_il), "error", (GCallback)image_read_ahead_error_cb, imd);
g_signal_connect (G_OBJECT(imd->read_ahead_il), "done", (GCallback)image_read_ahead_done_cb, imd);
g_signal_connect(G_OBJECT(imd->read_ahead_il), "error", (GCallback)image_read_ahead_error_cb, imd);
g_signal_connect(G_OBJECT(imd->read_ahead_il), "done", (GCallback)image_read_ahead_done_cb, imd);

if (!image_loader_start(imd->read_ahead_il))
{
Expand Down
2 changes: 1 addition & 1 deletion src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ gint main(gint argc, gchar *argv[])
CollectionData *cd = NULL;

#ifdef HAVE_GTHREAD
g_thread_init (NULL);
g_thread_init(NULL);
gdk_threads_init();
gdk_threads_enter();
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/md5-util.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "ui_fileops.h" /* for utf-8 filename conversion */


static void md5_transform (guint32 buf[4], const guint32 in[16]);
static void md5_transform(guint32 buf[4], const guint32 in[16]);

static gint _ie = 0x44332211;
static union _endian { gint i; gchar b[4]; } *_endian = (union _endian *)&_ie;
Expand Down
8 changes: 4 additions & 4 deletions src/md5-util.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ typedef struct _MD5Context {


/* raw routines */
void md5_init (MD5Context *ctx);
void md5_update (MD5Context *ctx, const guchar *buf, guint32 len);
void md5_final (MD5Context *ctx, guchar digest[16]);
void md5_init(MD5Context *ctx);
void md5_update(MD5Context *ctx, const guchar *buf, guint32 len);
void md5_final(MD5Context *ctx, guchar digest[16]);

/* generate digest from memory buffer */
void md5_get_digest (const guchar *buffer, gint buffer_size, guchar digest[16]);
void md5_get_digest(const guchar *buffer, gint buffer_size, guchar digest[16]);

/* generate digest from file */
gboolean md5_get_digest_from_file(const gchar *path, guchar digest[16]);
Expand Down
4 changes: 2 additions & 2 deletions src/pan-view.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ static gint pan_queue_step(PanWindow *pw)
#if 0
image_loader_set_area_ready_func(pw->il, pan_queue_image_area_cb, pw);
#endif
g_signal_connect (G_OBJECT(pw->il), "error", (GCallback)pan_queue_image_done_cb, pw);
g_signal_connect (G_OBJECT(pw->il), "done", (GCallback)pan_queue_image_done_cb, pw);
g_signal_connect(G_OBJECT(pw->il), "error", (GCallback)pan_queue_image_done_cb, pw);
g_signal_connect(G_OBJECT(pw->il), "done", (GCallback)pan_queue_image_done_cb, pw);

if (image_loader_start(pw->il)) return FALSE;

Expand Down
2 changes: 1 addition & 1 deletion src/pixbuf-renderer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ struct _PixbufRendererClass
};


GType pixbuf_renderer_get_type (void);
GType pixbuf_renderer_get_type(void);

PixbufRenderer *pixbuf_renderer_new(void);

Expand Down
Loading

0 comments on commit 96a2690

Please sign in to comment.