[beast/rc1: 4/4] BEAST-GTK: use size_t instead of unsigned long to compile on 32bit platforms
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast/rc1: 4/4] BEAST-GTK: use size_t instead of unsigned long to compile on 32bit platforms
- Date: Wed, 15 Oct 2014 14:09:29 +0000 (UTC)
commit 57c79c517a234dad3e61d3341c859cd09316fb18
Author: Tim Janik <timj gnu org>
Date: Wed Oct 15 04:37:54 2014 +0200
BEAST-GTK: use size_t instead of unsigned long to compile on 32bit platforms
beast-gtk/bstapp.cc | 16 ++++++++--------
beast-gtk/bstbuseditor.cc | 8 ++++----
beast-gtk/bstbusmixer.cc | 8 ++++----
beast-gtk/bstbusview.cc | 8 ++++----
beast-gtk/bstkeybindings.cc | 4 ++--
beast-gtk/bstpartdialog.cc | 12 ++++++------
beast-gtk/bstpartview.cc | 8 ++++----
beast-gtk/bstrackview.cc | 8 ++++----
beast-gtk/bstsnetrouter.cc | 2 +-
beast-gtk/bsttrackview.cc | 8 ++++----
beast-gtk/bstwaveview.cc | 8 ++++----
beast-gtk/gxk/gxkaction.cc | 14 +++++++-------
beast-gtk/gxk/gxkaction.hh | 20 ++++++++++----------
13 files changed, 62 insertions(+), 62 deletions(-)
---
diff --git a/beast-gtk/bstapp.cc b/beast-gtk/bstapp.cc
index 99bf846..cca4cc3 100644
--- a/beast-gtk/bstapp.cc
+++ b/beast-gtk/bstapp.cc
@@ -20,13 +20,13 @@
/* --- prototypes --- */
static void bst_app_run_script_proc (gpointer data,
- gulong category_id);
+ size_t category_id);
static GxkActionList* demo_entries_create (BstApp *app);
static GxkActionList* skin_entries_create (BstApp *app);
static void app_action_exec (gpointer data,
- gulong action);
+ size_t action);
static gboolean app_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp);
static void bst_app_reload_pages (BstApp *self);
@@ -706,7 +706,7 @@ demo_entries_setup (void)
static void
demo_play_song (gpointer data,
- gulong callback_action)
+ size_t callback_action)
{
const gchar *file_name = demo_entries[callback_action - BST_ACTION_LOAD_DEMO_0000].file;
SfiProxy project = bse_server_use_new_project (BSE_SERVER, file_name);
@@ -775,7 +775,7 @@ skin_entries_setup (void)
static void
load_skin (gpointer data,
- gulong callback_action)
+ size_t callback_action)
{
const gchar *file_name = skin_entries[callback_action - BST_ACTION_LOAD_SKIN_0000].file;
BseErrorType error = bst_skin_parse (file_name);
@@ -797,7 +797,7 @@ skin_entries_create (BstApp *app)
static void
bst_app_run_script_proc (gpointer data,
- gulong category_id)
+ size_t category_id)
{
BstApp *self = BST_APP (data);
BseCategory *cat = bse_category_from_id (category_id);
@@ -833,7 +833,7 @@ bst_app_show_release_notes (BstApp *app)
static void
app_action_exec (gpointer data,
- gulong action)
+ size_t action)
{
static GtkWidget *bst_preferences = NULL;
BstApp *self = BST_APP (data);
@@ -1116,7 +1116,7 @@ app_action_exec (gpointer data,
static gboolean
app_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp)
{
BstApp *self = BST_APP (data);
diff --git a/beast-gtk/bstbuseditor.cc b/beast-gtk/bstbuseditor.cc
index 6d9d2e1..9a109d4 100644
--- a/beast-gtk/bstbuseditor.cc
+++ b/beast-gtk/bstbuseditor.cc
@@ -7,9 +7,9 @@
/* --- prototypes --- */
static void bus_editor_action_exec (gpointer data,
- gulong action);
+ size_t action);
static gboolean bus_editor_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp);
@@ -193,7 +193,7 @@ bst_bus_editor_set_bus (BstBusEditor *self,
static void
bus_editor_action_exec (gpointer data,
- gulong action)
+ size_t action)
{
BstBusEditor *self = BST_BUS_EDITOR (data);
switch (action)
@@ -210,7 +210,7 @@ bus_editor_action_exec (gpointer data,
static gboolean
bus_editor_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp)
{
// BstBusEditor *self = BST_BUS_EDITOR (data);
diff --git a/beast-gtk/bstbusmixer.cc b/beast-gtk/bstbusmixer.cc
index a5e90f9..ae7190d 100644
--- a/beast-gtk/bstbusmixer.cc
+++ b/beast-gtk/bstbusmixer.cc
@@ -5,9 +5,9 @@
/* --- prototypes --- */
static void bus_mixer_action_exec (gpointer data,
- gulong action);
+ size_t action);
static gboolean bus_mixer_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp);
@@ -167,7 +167,7 @@ bus_mixer_set_container (BstItemView *iview,
static void
bus_mixer_action_exec (gpointer data,
- gulong action)
+ size_t action)
{
BstBusMixer *self = BST_BUS_MIXER (data);
BstItemView *iview = BST_ITEM_VIEW (self);
@@ -197,7 +197,7 @@ bus_mixer_action_exec (gpointer data,
static gboolean
bus_mixer_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp)
{
BstBusMixer *self = BST_BUS_MIXER (data);
diff --git a/beast-gtk/bstbusview.cc b/beast-gtk/bstbusview.cc
index 204a682..1efa219 100644
--- a/beast-gtk/bstbusview.cc
+++ b/beast-gtk/bstbusview.cc
@@ -4,9 +4,9 @@
/* --- prototypes --- */
static void bus_view_action_exec (gpointer data,
- gulong action);
+ size_t action);
static gboolean bus_view_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp);
@@ -64,7 +64,7 @@ bst_bus_view_new (SfiProxy song)
static void
bus_view_action_exec (gpointer data,
- gulong action)
+ size_t action)
{
BstBusView *self = BST_BUS_VIEW (data);
BstItemView *item_view = BST_ITEM_VIEW (self);
@@ -86,7 +86,7 @@ bus_view_action_exec (gpointer data,
static gboolean
bus_view_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp)
{
BstBusView *self = BST_BUS_VIEW (data);
diff --git a/beast-gtk/bstkeybindings.cc b/beast-gtk/bstkeybindings.cc
index 5a1b5f9..3790051 100644
--- a/beast-gtk/bstkeybindings.cc
+++ b/beast-gtk/bstkeybindings.cc
@@ -81,7 +81,7 @@ key_bindings_load_file (GtkWidget *dialog,
static void
key_bindings_exec_action (gpointer data,
- gulong action)
+ size_t action)
{
GtkWidget *self = GTK_WIDGET (data);
BstKeyBinding *kbinding = (BstKeyBinding*) g_object_get_data ((GObject*) self, "BstKeyBinding");
@@ -232,7 +232,7 @@ key_bindings_exec_action (gpointer data,
static gboolean
key_bindings_check_action (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp)
{
GtkWidget *self = GTK_WIDGET (data);
diff --git a/beast-gtk/bstpartdialog.cc b/beast-gtk/bstpartdialog.cc
index ff78e90..82e4e7a 100644
--- a/beast-gtk/bstpartdialog.cc
+++ b/beast-gtk/bstpartdialog.cc
@@ -23,12 +23,12 @@ static void event_canvas_clicked (BstEventRoll *eroll,
GdkEvent *event,
BstPartDialog *self);
static gboolean part_dialog_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp);
static void part_dialog_action_exec (gpointer data,
- gulong action);
+ size_t action);
static void part_dialog_run_script_proc (gpointer data,
- gulong category_id);
+ size_t category_id);
/* --- track actions --- */
@@ -324,7 +324,7 @@ event_canvas_clicked (BstEventRoll *eroll,
static void
part_dialog_run_script_proc (gpointer data,
- gulong category_id)
+ size_t category_id)
{
BstPartDialog *self = BST_PART_DIALOG (data);
BseCategory *cat = bse_category_from_id (category_id);
@@ -338,7 +338,7 @@ part_dialog_run_script_proc (gpointer data,
static gboolean
part_dialog_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp)
{
BstPartDialog *self = BST_PART_DIALOG (data);
@@ -378,7 +378,7 @@ part_dialog_action_check (gpointer data,
static void
part_dialog_action_exec (gpointer data,
- gulong action)
+ size_t action)
{
BstPartDialog *self = BST_PART_DIALOG (data);
diff --git a/beast-gtk/bstpartview.cc b/beast-gtk/bstpartview.cc
index c47bfb0..839be92 100644
--- a/beast-gtk/bstpartview.cc
+++ b/beast-gtk/bstpartview.cc
@@ -8,9 +8,9 @@
/* --- prototypes --- */
static void part_view_action_exec (gpointer data,
- gulong action);
+ size_t action);
static gboolean part_view_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp);
@@ -84,7 +84,7 @@ bst_part_view_new (SfiProxy song)
static void
part_view_action_exec (gpointer data,
- gulong action)
+ size_t action)
{
BstPartView *self = BST_PART_VIEW (data);
BstItemView *item_view = BST_ITEM_VIEW (self);
@@ -109,7 +109,7 @@ part_view_action_exec (gpointer data,
static gboolean
part_view_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp)
{
BstPartView *self = BST_PART_VIEW (data);
diff --git a/beast-gtk/bstrackview.cc b/beast-gtk/bstrackview.cc
index 0a7c873..d2c3dea 100644
--- a/beast-gtk/bstrackview.cc
+++ b/beast-gtk/bstrackview.cc
@@ -11,9 +11,9 @@ static void rack_view_finalize (GObject *object);
static gboolean rack_view_button_press_event (BstRackView *self,
GdkEventButton *event);
static void rack_view_popup_action (gpointer user_data,
- gulong action_id);
+ size_t action_id);
static gboolean rack_view_popup_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp);
@@ -216,7 +216,7 @@ rack_view_button_press_event (BstRackView *self,
static void
rack_view_popup_action (gpointer user_data,
- gulong action_id)
+ size_t action_id)
{
BstRackView *self = BST_RACK_VIEW (user_data);
switch (action_id)
@@ -237,7 +237,7 @@ rack_view_popup_action (gpointer user_data,
static gboolean
rack_view_popup_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp)
{
BstRackView *self = BST_RACK_VIEW (data);
diff --git a/beast-gtk/bstsnetrouter.cc b/beast-gtk/bstsnetrouter.cc
index 371ec01..3c231da 100644
--- a/beast-gtk/bstsnetrouter.cc
+++ b/beast-gtk/bstsnetrouter.cc
@@ -884,7 +884,7 @@ snet_router_tool2text (BstSNetRouter *self)
static void
snet_router_action_exec (gpointer user_data,
- gulong action_id)
+ size_t action_id)
{
BstSNetRouter *self = BST_SNET_ROUTER (user_data);
GnomeCanvas *canvas = GNOME_CANVAS (self);
diff --git a/beast-gtk/bsttrackview.cc b/beast-gtk/bsttrackview.cc
index 98e07b3..60bcc5a 100644
--- a/beast-gtk/bsttrackview.cc
+++ b/beast-gtk/bsttrackview.cc
@@ -12,10 +12,10 @@
/* --- prototypes --- */
static void bst_track_view_finalize (GObject *object);
static gboolean track_view_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp);
static void track_view_action_exec (gpointer data,
- gulong action);
+ size_t action);
static void track_view_set_container (BstItemView *self,
SfiProxy new_container);
static void track_view_listen_on (BstItemView *iview,
@@ -700,7 +700,7 @@ track_view_unlisten_on (BstItemView *iview,
static void
track_view_action_exec (gpointer data,
- gulong action)
+ size_t action)
{
BstTrackView *self = BST_TRACK_VIEW (data);
BstItemView *item_view = BST_ITEM_VIEW (self);
@@ -739,7 +739,7 @@ track_view_action_exec (gpointer data,
static gboolean
track_view_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp)
{
BstTrackView *self = BST_TRACK_VIEW (data);
diff --git a/beast-gtk/bstwaveview.cc b/beast-gtk/bstwaveview.cc
index 6451287..7921d34 100644
--- a/beast-gtk/bstwaveview.cc
+++ b/beast-gtk/bstwaveview.cc
@@ -8,9 +8,9 @@
/* --- prototypes --- */
static void wave_view_action_exec (gpointer data,
- gulong action);
+ size_t action);
static gboolean wave_view_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp);
@@ -125,7 +125,7 @@ bst_wave_view_set_editable (BstWaveView *self,
static void
wave_view_action_exec (gpointer data,
- gulong action)
+ size_t action)
{
BstWaveView *self = BST_WAVE_VIEW (data);
BstItemView *item_view = BST_ITEM_VIEW (self);
@@ -155,7 +155,7 @@ wave_view_action_exec (gpointer data,
static gboolean
wave_view_action_check (gpointer data,
- gulong action,
+ size_t action,
guint64 action_stamp)
{
BstWaveView *self = BST_WAVE_VIEW (data);
diff --git a/beast-gtk/gxk/gxkaction.cc b/beast-gtk/gxk/gxkaction.cc
index 766c40a..316b7f6 100644
--- a/beast-gtk/gxk/gxkaction.cc
+++ b/beast-gtk/gxk/gxkaction.cc
@@ -25,7 +25,7 @@ gxk_action_inc_cache_stamp (void)
static inline gboolean
action_check_stamped (GxkActionCheck acheck_func,
gpointer user_data,
- gulong action_id,
+ size_t action_id,
gboolean alter_stamp)
{
if (alter_stamp)
@@ -217,7 +217,7 @@ gxk_action_list_add_translated (GxkActionList *alist,
const gchar *name, /* translated (key) */
const gchar *accelerator,
const gchar *tooltip, /* translated */
- gulong action_id,
+ size_t action_id,
const gchar *stock_icon,
GxkActionCheck acheck,
GxkActionExec aexec,
@@ -729,7 +729,7 @@ gxk_widget_publish_action_list (gpointer widget,
GSList*
gxk_widget_peek_action_widgets (gpointer widget,
const gchar *prefix,
- gulong action_id)
+ size_t action_id)
{
GSList *alinklist = (GSList*) g_object_get_qdata ((GObject*) widget, quark_widget_actions);
for (; alinklist; alinklist = alinklist->next)
@@ -800,7 +800,7 @@ gxk_widget_publish_grouped_translated (gpointer widget,
const gchar *name, /* translated (key) */
const gchar *accelerator,
const gchar *tooltip, /* translated */
- gulong action_id,
+ size_t action_id,
const gchar *stock_icon,
GxkActionCheck acheck,
GxkActionExec aexec)
@@ -820,7 +820,7 @@ gxk_widget_publish_translated (gpointer widget,
const gchar *name, /* translated (part of key) */
const gchar *accelerator,
const gchar *tooltip, /* translated */
- gulong action_id,
+ size_t action_id,
const gchar *stock_icon,
GxkActionCheck acheck,
GxkActionExec aexec)
@@ -873,7 +873,7 @@ gxk_window_remove_action_client (GtkWindow *window,
}
/* --- action group --- */
-static gulong action_group_signal_changed = 0;
+static size_t action_group_signal_changed = 0;
static void
gxk_action_group_class_init (GxkActionGroupClass *klass)
@@ -923,7 +923,7 @@ gxk_action_group_new (void)
void
gxk_action_group_select (GxkActionGroup *self,
- gulong action_id)
+ size_t action_id)
{
g_return_if_fail (GXK_IS_ACTION_GROUP (self));
if (!self->lock_count && (action_id != self->action_id || self->invert_dups))
diff --git a/beast-gtk/gxk/gxkaction.hh b/beast-gtk/gxk/gxkaction.hh
index 06ab917..31e4bf6 100644
--- a/beast-gtk/gxk/gxkaction.hh
+++ b/beast-gtk/gxk/gxkaction.hh
@@ -12,10 +12,10 @@ G_BEGIN_DECLS
/* --- structures --- */
typedef gboolean (*GxkActionCheck) (gpointer user_data,
- gulong action_id,
+ size_t action_id,
guint64 action_stamp);
typedef void (*GxkActionExec) (gpointer user_data,
- gulong action_id);
+ size_t action_id);
typedef struct GxkActionGroup GxkActionGroup; /* prototyped */
typedef struct GxkActionList GxkActionList;
typedef struct {
@@ -24,7 +24,7 @@ typedef struct {
const gchar *name;
const gchar *accelerator;
const gchar *tooltip;
- gulong action_id;
+ size_t action_id;
const gchar *stock_icon; /* stock_id for the icon or NULL */
} GxkAction;
@@ -32,7 +32,7 @@ typedef struct {
const gchar *name; /* subject to i18n (key) */
const gchar *accelerator;
const gchar *tooltip; /* subject to i18n */
- gulong action_id;
+ size_t action_id;
const gchar *stock_icon; /* stock_id for the icon */
} GxkStockAction;
@@ -52,7 +52,7 @@ void gxk_action_list_add_translated (GxkActionList *alist,
const gchar *name, /* translated (key)
*/
const gchar *accelerator,
const gchar *tooltip, /* translated */
- gulong action_id,
+ size_t action_id,
const gchar *stock_icon,
GxkActionCheck acheck,
GxkActionExec aexec,
@@ -81,7 +81,7 @@ void gxk_widget_publish_action_list (gpointer widget,
GxkActionList *alist);
GSList* gxk_widget_peek_action_widgets (gpointer widget,
const gchar *prefix,
- gulong action_id);
+ size_t action_id);
void gxk_widget_publish_actions (gpointer widget,
const gchar *prefix,
guint n_actions,
@@ -103,7 +103,7 @@ void gxk_widget_publish_translated (gpointer widget,
const gchar *name, /* translated (key)
*/
const gchar *accelerator,
const gchar *tooltip, /* translated */
- gulong action_id,
+ size_t action_id,
const gchar *stock_icon,
GxkActionCheck acheck,
GxkActionExec aexec);
@@ -114,7 +114,7 @@ void gxk_widget_publish_grouped_translated (gpointer widget,
const gchar *name, /* translated (key)
*/
const gchar *accelerator,
const gchar *tooltip, /* translated */
- gulong action_id,
+ size_t action_id,
const gchar *stock_icon,
GxkActionCheck acheck,
GxkActionExec aexec);
@@ -142,7 +142,7 @@ void gxk_window_remove_action_client (GtkWindow *window,
#define GXK_ACTION_GROUP_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), GXK_TYPE_ACTION_GROUP,
GxkActionGroupClass))
struct GxkActionGroup {
GObject parent_instance;
- gulong action_id;
+ size_t action_id;
guint lock_count;
guint invert_dups : 1;
};
@@ -153,7 +153,7 @@ typedef struct {
GType gxk_action_group_get_type (void);
GxkActionGroup* gxk_action_group_new (void);
void gxk_action_group_select (GxkActionGroup *agroup,
- gulong action_id);
+ size_t action_id);
void gxk_action_group_lock (GxkActionGroup *agroup);
void gxk_action_group_unlock (GxkActionGroup *agroup);
void gxk_action_group_dispose (GxkActionGroup *agroup);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
