callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed g_const_pointer => gconstpointer.

Browse Source
This commit is contained in:
Owen Taylor 1998-06-10 16:59:28 +00:00
parent b70abe38c1
commit 344572dc71
21 changed files with 136 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Wed Jun 10 12:57:03 1998 Owen Taylor <otaylor@gtk.org>
* gdk/gdkcc.c glib/ghash.c glib/glib.h glib/gstring.c
glib/gutils.c glib/testglib.c glib/gdataset.c
gtk/gtkaccelgroup.c gtk/gtkmain.c gtk/gtksignal.c
gtk/gtktext.c gtk/gtkbindings.c:
renamed g_const_pointer => gconstpointer
Wed Jun 10 06:25:17 1998 Tim Janik <timj@gtk.org> Wed Jun 10 06:25:17 1998 Tim Janik <timj@gtk.org>
* gdk/gdk.c (gdk_init): prevent gdk_init() from segfaulting when * gdk/gdk.c (gdk_init): prevent gdk_init() from segfaulting when

9
ChangeLog.pre-2-0
View File

@ -1,3 +1,12 @@
Wed Jun 10 12:57:03 1998 Owen Taylor <otaylor@gtk.org>
* gdk/gdkcc.c glib/ghash.c glib/glib.h glib/gstring.c
glib/gutils.c glib/testglib.c glib/gdataset.c
gtk/gtkaccelgroup.c gtk/gtkmain.c gtk/gtksignal.c
gtk/gtktext.c gtk/gtkbindings.c:
renamed g_const_pointer => gconstpointer
Wed Jun 10 06:25:17 1998 Tim Janik <timj@gtk.org> Wed Jun 10 06:25:17 1998 Tim Janik <timj@gtk.org>
* gdk/gdk.c (gdk_init): prevent gdk_init() from segfaulting when * gdk/gdk.c (gdk_init): prevent gdk_init() from segfaulting when

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
Wed Jun 10 12:57:03 1998 Owen Taylor <otaylor@gtk.org>
* gdk/gdkcc.c glib/ghash.c glib/glib.h glib/gstring.c
glib/gutils.c glib/testglib.c glib/gdataset.c
gtk/gtkaccelgroup.c gtk/gtkmain.c gtk/gtksignal.c
gtk/gtktext.c gtk/gtkbindings.c:
renamed g_const_pointer => gconstpointer
Wed Jun 10 06:25:17 1998 Tim Janik <timj@gtk.org> Wed Jun 10 06:25:17 1998 Tim Janik <timj@gtk.org>
* gdk/gdk.c (gdk_init): prevent gdk_init() from segfaulting when * gdk/gdk.c (gdk_init): prevent gdk_init() from segfaulting when

9
ChangeLog.pre-2-2
View File

@ -1,3 +1,12 @@
Wed Jun 10 12:57:03 1998 Owen Taylor <otaylor@gtk.org>
* gdk/gdkcc.c glib/ghash.c glib/glib.h glib/gstring.c
glib/gutils.c glib/testglib.c glib/gdataset.c
gtk/gtkaccelgroup.c gtk/gtkmain.c gtk/gtksignal.c
gtk/gtktext.c gtk/gtkbindings.c:
renamed g_const_pointer => gconstpointer
Wed Jun 10 06:25:17 1998 Tim Janik <timj@gtk.org> Wed Jun 10 06:25:17 1998 Tim Janik <timj@gtk.org>
* gdk/gdk.c (gdk_init): prevent gdk_init() from segfaulting when * gdk/gdk.c (gdk_init): prevent gdk_init() from segfaulting when

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
Wed Jun 10 12:57:03 1998 Owen Taylor <otaylor@gtk.org>
* gdk/gdkcc.c glib/ghash.c glib/glib.h glib/gstring.c
glib/gutils.c glib/testglib.c glib/gdataset.c
gtk/gtkaccelgroup.c gtk/gtkmain.c gtk/gtksignal.c
gtk/gtktext.c gtk/gtkbindings.c:
renamed g_const_pointer => gconstpointer
Wed Jun 10 06:25:17 1998 Tim Janik <timj@gtk.org> Wed Jun 10 06:25:17 1998 Tim Janik <timj@gtk.org>
* gdk/gdk.c (gdk_init): prevent gdk_init() from segfaulting when * gdk/gdk.c (gdk_init): prevent gdk_init() from segfaulting when

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
Wed Jun 10 12:57:03 1998 Owen Taylor <otaylor@gtk.org>
* gdk/gdkcc.c glib/ghash.c glib/glib.h glib/gstring.c
glib/gutils.c glib/testglib.c glib/gdataset.c
gtk/gtkaccelgroup.c gtk/gtkmain.c gtk/gtksignal.c
gtk/gtktext.c gtk/gtkbindings.c:
renamed g_const_pointer => gconstpointer
Wed Jun 10 06:25:17 1998 Tim Janik <timj@gtk.org> Wed Jun 10 06:25:17 1998 Tim Janik <timj@gtk.org>
* gdk/gdk.c (gdk_init): prevent gdk_init() from segfaulting when * gdk/gdk.c (gdk_init): prevent gdk_init() from segfaulting when

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
Wed Jun 10 12:57:03 1998 Owen Taylor <otaylor@gtk.org>
* gdk/gdkcc.c glib/ghash.c glib/glib.h glib/gstring.c
glib/gutils.c glib/testglib.c glib/gdataset.c
gtk/gtkaccelgroup.c gtk/gtkmain.c gtk/gtksignal.c
gtk/gtktext.c gtk/gtkbindings.c:
renamed g_const_pointer => gconstpointer
Wed Jun 10 06:25:17 1998 Tim Janik <timj@gtk.org> Wed Jun 10 06:25:17 1998 Tim Janik <timj@gtk.org>
* gdk/gdk.c (gdk_init): prevent gdk_init() from segfaulting when * gdk/gdk.c (gdk_init): prevent gdk_init() from segfaulting when

6
gdk/gdkcc.c
View File

@ -66,7 +66,7 @@
static guint static guint
hash_color (g_const_pointer key) hash_color (gconstpointer key)
{ {
const GdkColor *color = key; const GdkColor *color = key;
@ -74,8 +74,8 @@ hash_color (g_const_pointer key)
} }
static gint static gint
compare_colors (g_const_pointer a, compare_colors (gconstpointer a,
g_const_pointer b) gconstpointer b)
{ {
const GdkColor *aa = a; const GdkColor *aa = a;
const GdkColor *bb = b; const GdkColor *bb = b;

6
gdk/x11/gdkcc-x11.c
View File

@ -66,7 +66,7 @@
static guint static guint
hash_color (g_const_pointer key) hash_color (gconstpointer key)
{ {
const GdkColor *color = key; const GdkColor *color = key;
@ -74,8 +74,8 @@ hash_color (g_const_pointer key)
} }
static gint static gint
compare_colors (g_const_pointer a, compare_colors (gconstpointer a,
g_const_pointer b) gconstpointer b)
{ {
const GdkColor *aa = a; const GdkColor *aa = a;
const GdkColor *bb = b; const GdkColor *bb = b;

4
glib/ChangeLog
View File

@ -1,3 +1,7 @@
Wed Jun 10 12:56:07 1998 Owen Taylor <otaylor@gtk.org>
* glib.h: renamed g_const_pointer => gconstpointer
Tue Jun 9 17:47:33 1998 Owen Taylor <otaylor@gtk.org> Tue Jun 9 17:47:33 1998 Owen Taylor <otaylor@gtk.org>
* glib.h: Remove #error - HP/UX. * glib.h: Remove #error - HP/UX.

28
glib/gdataset.c
View File

@ -41,14 +41,14 @@ struct _GDatasetData
struct _GDataset struct _GDataset
{ {
g_const_pointer location; gconstpointer location;
GDatasetData *data_list; GDatasetData *data_list;
}; };
/* --- prototypes --- */ /* --- prototypes --- */
static inline GDataset* g_dataset_lookup (g_const_pointer dataset_location); static inline GDataset* g_dataset_lookup (gconstpointer dataset_location);
static inline void g_dataset_destroy_i (GDataset *dataset); static inline void g_dataset_destroy_i (GDataset *dataset);
static void g_dataset_initialize (void); static void g_dataset_initialize (void);
static guint* g_dataset_id_new (void); static guint* g_dataset_id_new (void);
@ -65,7 +65,7 @@ static guint g_dataset_id_index = G_DATASET_ID_BLOCK_SIZE + 1;
/* --- functions --- */ /* --- functions --- */
static inline GDataset* static inline GDataset*
g_dataset_lookup (g_const_pointer dataset_location) g_dataset_lookup (gconstpointer dataset_location)
{ {
register GDataset *dataset; register GDataset *dataset;
@ -109,7 +109,7 @@ g_dataset_destroy_i (GDataset *dataset)
} }
void void
g_dataset_destroy (g_const_pointer dataset_location) g_dataset_destroy (gconstpointer dataset_location)
{ {
register GDataset *dataset; register GDataset *dataset;
@ -121,9 +121,9 @@ g_dataset_destroy (g_const_pointer dataset_location)
} }
void void
g_dataset_id_set_destroy (g_const_pointer dataset_location, g_dataset_id_set_destroy (gconstpointer dataset_location,
guint key_id, guint key_id,
GDestroyNotify destroy_func) GDestroyNotify destroy_func)
{ {
g_return_if_fail (dataset_location != NULL); g_return_if_fail (dataset_location != NULL);
@ -150,8 +150,8 @@ g_dataset_id_set_destroy (g_const_pointer dataset_location,
} }
gpointer gpointer
g_dataset_id_get_data (g_const_pointer dataset_location, g_dataset_id_get_data (gconstpointer dataset_location,
guint key_id) guint key_id)
{ {
g_return_val_if_fail (dataset_location != NULL, NULL); g_return_val_if_fail (dataset_location != NULL, NULL);
@ -174,10 +174,10 @@ g_dataset_id_get_data (g_const_pointer dataset_location,
} }
void void
g_dataset_id_set_data_full (g_const_pointer dataset_location, g_dataset_id_set_data_full (gconstpointer dataset_location,
guint key_id, guint key_id,
gpointer data, gpointer data,
GDestroyNotify destroy_func) GDestroyNotify destroy_func)
{ {
register GDataset *dataset; register GDataset *dataset;
register GDatasetData *list; register GDatasetData *list;

8
glib/ghash.c
View File

@ -145,8 +145,8 @@ g_hash_table_insert (GHashTable *hash_table,
} }
void void
g_hash_table_remove (GHashTable *hash_table, g_hash_table_remove (GHashTable *hash_table,
g_const_pointer key) gconstpointer key)
{ {
GRealHashTable *rhash_table; GRealHashTable *rhash_table;
GHashNode *node; GHashNode *node;
@ -186,8 +186,8 @@ g_hash_table_remove (GHashTable *hash_table,
} }
gpointer gpointer
g_hash_table_lookup (GHashTable *hash_table, g_hash_table_lookup (GHashTable *hash_table,
g_const_pointer key) gconstpointer key)
{ {
GRealHashTable *rhash_table; GRealHashTable *rhash_table;
GHashNode *node; GHashNode *node;

28
glib/glib.h
View File

@ -389,7 +389,7 @@ typedef double gldouble;
#endif /* 0 */ #endif /* 0 */
typedef void* gpointer; typedef void* gpointer;
typedef const void *g_const_pointer; typedef const void *gconstpointer;
#if (SIZEOF_CHAR == 1) #if (SIZEOF_CHAR == 1)
typedef signed char gint8; typedef signed char gint8;
@ -472,9 +472,9 @@ typedef void (*GScannerMsgFunc) (GScanner *scanner,
gint error); gint error);
typedef void (*GDestroyNotify) (gpointer data); typedef void (*GDestroyNotify) (gpointer data);
typedef guint (*GHashFunc) (g_const_pointer key); typedef guint (*GHashFunc) (gconstpointer key);
typedef gint (*GCompareFunc) (g_const_pointer a, typedef gint (*GCompareFunc) (gconstpointer a,
g_const_pointer b); gconstpointer b);
struct _GList struct _GList
{ {
@ -627,9 +627,9 @@ void g_hash_table_insert (GHashTable *hash_table,
gpointer key, gpointer key,
gpointer value); gpointer value);
void g_hash_table_remove (GHashTable *hash_table, void g_hash_table_remove (GHashTable *hash_table,
g_const_pointer key); gconstpointer key);
gpointer g_hash_table_lookup (GHashTable *hash_table, gpointer g_hash_table_lookup (GHashTable *hash_table,
g_const_pointer key); gconstpointer key);
void g_hash_table_freeze (GHashTable *hash_table); void g_hash_table_freeze (GHashTable *hash_table);
void g_hash_table_thaw (GHashTable *hash_table); void g_hash_table_thaw (GHashTable *hash_table);
void g_hash_table_foreach (GHashTable *hash_table, void g_hash_table_foreach (GHashTable *hash_table,
@ -893,29 +893,29 @@ GArray* g_rarray_truncate (GArray *array,
/* Hash Functions /* Hash Functions
*/ */
gint g_str_equal (g_const_pointer v, gint g_str_equal (gconstpointer v,
g_const_pointer v2); gconstpointer v2);
guint g_str_hash (g_const_pointer v); guint g_str_hash (gconstpointer v);
/* This "hash" function will just return the key's adress as an /* This "hash" function will just return the key's adress as an
* unsigned integer. Useful for hashing on plain adresses or * unsigned integer. Useful for hashing on plain adresses or
* simple integer values. * simple integer values.
*/ */
guint g_direct_hash (g_const_pointer key); guint g_direct_hash (gconstpointer key);
/* Location Associated Data /* Location Associated Data
*/ */
void g_dataset_destroy (g_const_pointer dataset_location); void g_dataset_destroy (gconstpointer dataset_location);
guint g_dataset_try_key (const gchar *key); guint g_dataset_try_key (const gchar *key);
guint g_dataset_force_id (const gchar *key); guint g_dataset_force_id (const gchar *key);
gpointer g_dataset_id_get_data (g_const_pointer dataset_location, gpointer g_dataset_id_get_data (gconstpointer dataset_location,
guint key_id); guint key_id);
void g_dataset_id_set_data_full (g_const_pointer dataset_location, void g_dataset_id_set_data_full (gconstpointer dataset_location,
guint key_id, guint key_id,
gpointer data, gpointer data,
GDestroyNotify destroy_func); GDestroyNotify destroy_func);
void g_dataset_id_set_destroy (g_const_pointer dataset_location, void g_dataset_id_set_destroy (gconstpointer dataset_location,
guint key_id, guint key_id,
GDestroyNotify destroy_func); GDestroyNotify destroy_func);

4
glib/gstring.c
View File

@ -50,14 +50,14 @@ static GMemChunk *string_mem_chunk = NULL;
*/ */
gint gint
g_str_equal (g_const_pointer v, g_const_pointer v2) g_str_equal (gconstpointer v, gconstpointer v2)
{ {
return strcmp ((const gchar*) v, (const gchar*)v2) == 0; return strcmp ((const gchar*) v, (const gchar*)v2) == 0;
} }
/* a char* hash function from ASU */ /* a char* hash function from ASU */
guint guint
g_str_hash (g_const_pointer v) g_str_hash (gconstpointer v)
{ {
const char *s = (char*)v; const char *s = (char*)v;
const char *p; const char *p;

2
glib/gutils.c
View File

@ -847,7 +847,7 @@ g_parse_debug_string (const gchar *string,
} }
guint guint
g_direct_hash(g_const_pointer key) g_direct_hash(gconstpointer key)
{ {
return GPOINTER_TO_UINT (key); return GPOINTER_TO_UINT (key);
} }

14
glib/testglib.c
View File

@ -33,20 +33,20 @@ my_hash_callback (gpointer key,
} }
guint guint
my_hash (g_const_pointer key) my_hash (gconstpointer key)
{ {
return (guint) *((const gint*) key); return (guint) *((const gint*) key);
} }
gint gint
my_hash_compare (g_const_pointer a, my_hash_compare (gconstpointer a,
g_const_pointer b) gconstpointer b)
{ {
return *((const gint*) a) == *((const gint*) b); return *((const gint*) a) == *((const gint*) b);
} }
gint gint
my_list_compare_one (g_const_pointer a, g_const_pointer b) my_list_compare_one (gconstpointer a, gconstpointer b)
{ {
gint one = *((const gint*)a); gint one = *((const gint*)a);
gint two = *((const gint*)b); gint two = *((const gint*)b);
@ -54,7 +54,7 @@ my_list_compare_one (g_const_pointer a, g_const_pointer b)
} }
gint gint
my_list_compare_two (g_const_pointer a, g_const_pointer b) my_list_compare_two (gconstpointer a, gconstpointer b)
{ {
gint one = *((const gint*)a); gint one = *((const gint*)a);
gint two = *((const gint*)b); gint two = *((const gint*)b);
@ -69,8 +69,8 @@ my_list_print (gpointer a, gpointer b)
}; */ }; */
gint gint
my_compare (g_const_pointer a, my_compare (gconstpointer a,
g_const_pointer b) gconstpointer b)
{ {
const char *cha = a; const char *cha = a;
const char *chb = b; const char *chb = b;

6
gtk/gtkaccelgroup.c
View File

@ -57,8 +57,8 @@ static GMemChunk *accel_entries_mem_chunk = NULL;
/* --- functions --- */ /* --- functions --- */
static gint static gint
gtk_accel_entries_equal (g_const_pointer a, gtk_accel_entries_equal (gconstpointer a,
g_const_pointer b) gconstpointer b)
{ {
const GtkAccelEntry *e1; const GtkAccelEntry *e1;
const GtkAccelEntry *e2; const GtkAccelEntry *e2;
@ -72,7 +72,7 @@ gtk_accel_entries_equal (g_const_pointer a,
} }
static guint static guint
gtk_accel_entries_hash (g_const_pointer a) gtk_accel_entries_hash (gconstpointer a)
{ {
const GtkAccelEntry *e; const GtkAccelEntry *e;
guint h; guint h;

10
gtk/gtkbindings.c
View File

@ -70,7 +70,7 @@ binding_signal_free (GtkBindingSignal *sig)
} }
static guint static guint
binding_entry_hash (g_const_pointer key) binding_entry_hash (gconstpointer key)
{ {
register const GtkBindingEntry *e = key; register const GtkBindingEntry *e = key;
register guint h; register guint h;
@ -82,8 +82,8 @@ binding_entry_hash (g_const_pointer key)
} }
static gint static gint
binding_entries_compare (g_const_pointer a, binding_entries_compare (gconstpointer a,
g_const_pointer b) gconstpointer b)
{ {
register const GtkBindingEntry *ea = a; register const GtkBindingEntry *ea = a;
register const GtkBindingEntry *eb = b; register const GtkBindingEntry *eb = b;
@ -762,8 +762,8 @@ binding_match_activate (GSList *pspec_list,
} }
static gint static gint
gtk_binding_pattern_compare (g_const_pointer a, gtk_binding_pattern_compare (gconstpointer a,
g_const_pointer b) gconstpointer b)
{ {
register const GtkPatternSpec *pa = a; register const GtkPatternSpec *pa = a;
register const GtkPatternSpec *pb = b; register const GtkPatternSpec *pb = b;

12
gtk/gtkmain.c
View File

@ -128,11 +128,11 @@ static gint gtk_timeout_remove_from_list (GList **list,
guint tag, guint tag,
gint remove_link); gint remove_link);
static gint gtk_idle_compare (g_const_pointer a, static gint gtk_idle_compare (gconstpointer a,
g_const_pointer b); gconstpointer b);
static gint gtk_timeout_compare (g_const_pointer a, static gint gtk_timeout_compare (gconstpointer a,
g_const_pointer b); gconstpointer b);
const guint gtk_major_version = GTK_MAJOR_VERSION; const guint gtk_major_version = GTK_MAJOR_VERSION;
const guint gtk_minor_version = GTK_MINOR_VERSION; const guint gtk_minor_version = GTK_MINOR_VERSION;
@ -995,7 +995,7 @@ gtk_timeout_remove (guint tag)
* sure that we insert at the _end_ of the idles of this priority * sure that we insert at the _end_ of the idles of this priority
*/ */
static gint static gint
gtk_idle_compare (g_const_pointer a, g_const_pointer b) gtk_idle_compare (gconstpointer a, gconstpointer b)
{ {
return (((const GtkIdleFunction *)a)->priority < return (((const GtkIdleFunction *)a)->priority <
((const GtkIdleFunction *)b)->priority) ((const GtkIdleFunction *)b)->priority)
@ -1364,7 +1364,7 @@ gtk_exit_func (void)
* sure that we insert after timeouts of equal interval * sure that we insert after timeouts of equal interval
*/ */
static gint static gint
gtk_timeout_compare (g_const_pointer a, g_const_pointer b) gtk_timeout_compare (gconstpointer a, gconstpointer b)
{ {
return (((const GtkTimeoutFunction *)a)->interval < return (((const GtkTimeoutFunction *)a)->interval <
((const GtkTimeoutFunction *)b)->interval) ((const GtkTimeoutFunction *)b)->interval)

12
gtk/gtksignal.c
View File

@ -119,9 +119,9 @@ struct _GtkDisconnectInfo
}; };
static guint gtk_signal_hash (g_const_pointer h); static guint gtk_signal_hash (gconstpointer h);
static gint gtk_signal_compare (g_const_pointer h1, static gint gtk_signal_compare (gconstpointer h1,
g_const_pointer h2); gconstpointer h2);
static GtkHandler* gtk_signal_handler_new (void); static GtkHandler* gtk_signal_handler_new (void);
static void gtk_signal_handler_ref (GtkHandler *handler); static void gtk_signal_handler_ref (GtkHandler *handler);
static void gtk_signal_handler_unref (GtkHandler *handler, static void gtk_signal_handler_unref (GtkHandler *handler,
@ -1186,7 +1186,7 @@ gtk_signal_set_funcs (GtkSignalMarshal marshal_func,
} }
static guint static guint
gtk_signal_hash (g_const_pointer h) gtk_signal_hash (gconstpointer h)
{ {
register const GtkSignalHash *hash = h; register const GtkSignalHash *hash = h;
@ -1194,8 +1194,8 @@ gtk_signal_hash (g_const_pointer h)
} }
static gint static gint
gtk_signal_compare (g_const_pointer h1, gtk_signal_compare (gconstpointer h1,
g_const_pointer h2) gconstpointer h2)
{ {
register const GtkSignalHash *hash1 = h1; register const GtkSignalHash *hash1 = h1;
register const GtkSignalHash *hash2 = h2; register const GtkSignalHash *hash2 = h2;

2
gtk/gtktext.c
View File

@ -2495,7 +2495,7 @@ insert_expose (GtkText* text, guint old_pixels, gint nchars,
} }
static guint static guint
font_hash (g_const_pointer font) font_hash (gconstpointer font)
{ {
return gdk_font_id ((const GdkFont*) font); return gdk_font_id ((const GdkFont*) font);
} }