From 43de19b0c93d93bdf3a136d18e04364cf381fb35 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Fri, 15 Jul 2011 17:27:40 -0700 Subject: [PATCH] Fixed const declarations per Wiki's Const-correctness. --- src/gtk/Includes/cairo.cdecl | 16 ++++++++-------- src/gtk/Includes/gdk-pixbuf-loader.cdecl | 6 +++--- src/gtk/Includes/gdkcairo.cdecl | 8 ++++---- src/gtk/Includes/gdkcolor.cdecl | 10 +++++----- src/gtk/Includes/gdkfont.cdecl | 8 ++++---- src/gtk/Includes/gdkgc.cdecl | 8 ++++---- src/gtk/Includes/gdkkeys.cdecl | 4 ++-- src/gtk/Includes/gdkwindow.cdecl | 2 +- src/gtk/Includes/gtkstyle.cdecl | 12 ++++++------ src/gtk/Includes/gtkwidget.cdecl | 2 +- src/gtk/Includes/pango-context.cdecl | 16 ++++++++-------- src/gtk/Includes/pango-font.cdecl | 4 ++-- src/gtk/Includes/pango-layout.cdecl | 6 +++--- 13 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/gtk/Includes/cairo.cdecl b/src/gtk/Includes/cairo.cdecl index 2944ccfd5..baaf3a98e 100644 --- a/src/gtk/Includes/cairo.cdecl +++ b/src/gtk/Includes/cairo.cdecl @@ -6,7 +6,7 @@ cairo/cairo.h (v1.4) |# ;(include "cairo-deprecated") ;(extern int cairo_version) -;(extern (const (* char)) cairo_version_string) +;(extern (* (const char)) cairo_version_string) ;(typedef cairo_bool_t int) ;(typedef cairo_t (struct _cairo)) ;(typedef cairo_surface_t (struct _cairo_surface)) @@ -76,11 +76,11 @@ cairo/cairo.h (v1.4) |# ;(extern (* void) cairo_get_user_data ; (cr (* cairo_t)) -; (key (const (* cairo_user_data_key_t)))) +; (key (* (const cairo_user_data_key_t)))) ;(extern cairo_status_t cairo_set_user_data ; (cr (* cairo_t)) -; (key (const (* cairo_user_data_key_t))) +; (key (* (const cairo_user_data_key_t))) ; (user_date (* void)) ; (destroy cairo_destroy_func_t)) @@ -173,7 +173,7 @@ cairo/cairo.h (v1.4) |# ;(extern void cairo_set_dash ; (cr (* cairo_t)) -; (dashes (const (* double))) +; (dashes (* (const double))) ; (num_dashes int) ; (offset double)) @@ -186,10 +186,10 @@ cairo/cairo.h (v1.4) |# (extern void cairo_rotate (cr (* cairo_t)) (angle double)) ;(extern void cairo_transform -; (cr (* cairo_t)) (matrix (const (* cairo_matrix_t)))) +; (cr (* cairo_t)) (matrix (* (const cairo_matrix_t)))) ;(extern void cairo_set_matrix -; (cr (* cairo_t)) (matrix (const (* cairo_matrix_t)))) +; (cr (* cairo_t)) (matrix (* (const cairo_matrix_t)))) ;(extern void cairo_identity_matrix (cr (* cairo_t))) @@ -729,7 +729,7 @@ cairo_surface_get_content (cairo_surface_t *surface); |# (extern cairo_status_t cairo_surface_write_to_png (surface (* cairo_surface_t)) - (filename (const (* char)))) + (filename (* (const char)))) #| (extern cairo_status_t cairo_surface_write_to_png_stream (cairo_surface_t *surface, @@ -1004,7 +1004,7 @@ cairo_matrix_transform_distance (const cairo_matrix_t *matrix, |# ;(extern void cairo_matrix_transform_point -; (matrix (const (* cairo_matrix_t))) +; (matrix (* (const cairo_matrix_t))) ; (x (* double)) (y (* double))) ;(extern void cairo_debug_reset_static_data) diff --git a/src/gtk/Includes/gdk-pixbuf-loader.cdecl b/src/gtk/Includes/gdk-pixbuf-loader.cdecl index 987c7a201..51f548391 100644 --- a/src/gtk/Includes/gdk-pixbuf-loader.cdecl +++ b/src/gtk/Includes/gdk-pixbuf-loader.cdecl @@ -22,11 +22,11 @@ gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h |# (extern (* GdkPixbufLoader) gdk_pixbuf_loader_new) ;(extern (* GdkPixbufLoader) gdk_pixbuf_loader_new_with_type -; (image_type (const (* char))) +; (image_type (* (const char))) ; (error (* (* GError)))) ;(extern (* GdkPixbufLoader) gdk_pixbuf_loader_new_with_mime_type -; (mime_type (const (* char))) +; (mime_type (* (const char))) ; (error (* (* GError)))) ;(extern void gdk_pixbuf_loader_set_size @@ -36,7 +36,7 @@ gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h |# (extern gboolean gdk_pixbuf_loader_write (loader (* GdkPixbufLoader)) - (buf (const (* guchar))) + (buf (* (const guchar))) (count gsize) (error (* (* GError)))) diff --git a/src/gtk/Includes/gdkcairo.cdecl b/src/gtk/Includes/gdkcairo.cdecl index 1b61ecb89..8c4df8b29 100644 --- a/src/gtk/Includes/gdkcairo.cdecl +++ b/src/gtk/Includes/gdkcairo.cdecl @@ -14,10 +14,10 @@ gtk-2.0/gdk/gdkcairo.h |# #;(extern void gdk_cairo_set_source_color (cr (* cairo_t)) - (color (const (* GdkColor)))) + (color (* (const GdkColor)))) #;(extern void gdk_cairo_set_source_pixbuf (cr (* cairo_t)) - (pixbuf (const (* GdkPixbuf))) + (pixbuf (* (const GdkPixbuf))) (pixbuf_x double) (pixbuf_y double)) #;(extern void gdk_cairo_set_source_pixmap @@ -28,7 +28,7 @@ gtk-2.0/gdk/gdkcairo.h |# #;(extern void gdk_cairo_rectangle (cr (* cairo_t)) - (rectangle (const (* GdkRectangle)))) + (rectangle (* (const GdkRectangle)))) #;(extern void gdk_cairo_region (cr (* cairo_t)) - (region (const (* GdkRegion)))) \ No newline at end of file + (region (* (const GdkRegion)))) \ No newline at end of file diff --git a/src/gtk/Includes/gdkcolor.cdecl b/src/gtk/Includes/gdkcolor.cdecl index e7af670f3..7dadf5b4d 100644 --- a/src/gtk/Includes/gdkcolor.cdecl +++ b/src/gtk/Includes/gdkcolor.cdecl @@ -50,14 +50,14 @@ gtk-2.0/gdk/gdkcolor.h |# ;(extern (* GdkVisual) gdk_colormap_get_visual ; (colormap (* GdkColormap))) ;(extern (* GdkColor) gdk_color_copy -; (color (const (* GdkColor)))) +; (color (* (const GdkColor)))) ;(extern void gdk_color_free ; (color (* GdkColor))) (extern gint gdk_color_parse - (spec (const (* gchar))) + (spec (* (const gchar))) (color (* GdkColor))) ;(extern guint gdk_color_hash -; (colora (const (* GdkColor)))) +; (colora (* (const GdkColor)))) ;(extern gboolean gdk_color_equal -; (colora (const (* GdkColor))) -; (colorb (const (* GdkColor)))) \ No newline at end of file +; (colora (* (const GdkColor))) +; (colorb (* (const GdkColor)))) \ No newline at end of file diff --git a/src/gtk/Includes/gdkfont.cdecl b/src/gtk/Includes/gdkfont.cdecl index da0968e0d..94c44fdb1 100644 --- a/src/gtk/Includes/gdkfont.cdecl +++ b/src/gtk/Includes/gdkfont.cdecl @@ -22,14 +22,14 @@ gtk-2.0/gdk/gdkfont.h |# (extern void gdk_font_unref ((* GdkFont) font)) (extern gint gdk_font_id - (font (const (* GdkFont)))) + (font (* (const GdkFont)))) (extern gboolean gdk_font_equal - (fonta (const (* GdkFont))) - (fontb (const (* GdkFont)))) + (fonta (* (const GdkFont))) + (fontb (* (const GdkFont)))) (extern (* GdkFont) gdk_font_load_for_display (display (* GdkDisplay)) - (font_name (const (* gchar)))) + (font_name (* (const gchar)))) (extern (* GdkFont) gdk_fontset_load_for_display (GdkDisplay *display) (const gchar *fontset_name)) diff --git a/src/gtk/Includes/gdkgc.cdecl b/src/gtk/Includes/gdkgc.cdecl index 308ae31af..85cf21d18 100644 --- a/src/gtk/Includes/gdkgc.cdecl +++ b/src/gtk/Includes/gdkgc.cdecl @@ -144,10 +144,10 @@ gtk-2.0/gdk/gdkgc.h |# ; (values_mask GdkGCValuesMask)) ;(extern void gdk_gc_set_foreground ; (gc (* GdkGC)) -; (color (const (* GdkColor)))) +; (color (* (const GdkColor)))) ;(extern void gdk_gc_set_background ; (gc (* GdkGC)) -; (color (const (* GdkColor)))) +; (color (* (const GdkColor)))) ;(extern void gdk_gc_set_function ; (gc (* GdkGC)) ; (function GdkFunction)) @@ -207,9 +207,9 @@ gtk-2.0/gdk/gdkgc.h |# ; (gc (* GdkGC))) ;(extern void gdk_gc_set_rgb_fg_color ; (gc (* GdkGC)) -; (color (const (* GdkColor)))) +; (color (* (const GdkColor)))) ;(extern void gdk_gc_set_rgb_bg_color ; (gc (* GdkGC)) -; (color (const (* GdkColor)))) +; (color (* (const GdkColor)))) ;(extern (* GdkScreen) gdk_gc_get_screen ; (gc (* GdkGC))) \ No newline at end of file diff --git a/src/gtk/Includes/gdkkeys.cdecl b/src/gtk/Includes/gdkkeys.cdecl index bb8f8d9e7..5a212f49a 100644 --- a/src/gtk/Includes/gdkkeys.cdecl +++ b/src/gtk/Includes/gdkkeys.cdecl @@ -27,7 +27,7 @@ gtk-2.0/gdk/gdkkeys.h |# ; ;(extern guint gdk_keymap_lookup_key ; (keymap (* GdkKeymap)) -; (key (const (* GdkKeymapKey)))) +; (key (* (const GdkKeymapKey)))) ;(extern gboolean gdk_keymap_translate_keyboard_state ; (keymap (* GdkKeymap)) ; (hardware_keycode guint) @@ -51,7 +51,7 @@ gtk-2.0/gdk/gdkkeys.h |# ;(extern PangoDirection gdk_keymap_get_direction (keymap (* GdkKeymap))) (extern (* gchar) gdk_keyval_name (keyval guint)) -;(extern guint gdk_keyval_from_name (keyval_name (const (* gchar)))) +;(extern guint gdk_keyval_from_name (keyval_name (* (const gchar)))) ;(extern void gdk_keyval_convert_case ; (symbol guint) (lower (* guint)) (upper (* guint))) ;(extern guint gdk_keyval_to_upper (keyval guint)) diff --git a/src/gtk/Includes/gdkwindow.cdecl b/src/gtk/Includes/gdkwindow.cdecl index 79be93b02..cda3da972 100644 --- a/src/gtk/Includes/gdkwindow.cdecl +++ b/src/gtk/Includes/gdkwindow.cdecl @@ -192,7 +192,7 @@ gtk-2.0/gdk/gdkwindow.h |# (extern void gdk_window_set_background (window (* GdkWindow)) - (color (const (* GdkColor)))) + (color (* (const GdkColor)))) (extern (* GdkWindow) gdk_window_get_pointer (window (* GdkWindow)) diff --git a/src/gtk/Includes/gtkstyle.cdecl b/src/gtk/Includes/gtkstyle.cdecl index 214aa66e8..ba8a20d03 100644 --- a/src/gtk/Includes/gtkstyle.cdecl +++ b/src/gtk/Includes/gtkstyle.cdecl @@ -65,7 +65,7 @@ gtk-2.0/gtk/gtkstyle.h |# (extern gboolean gtk_style_lookup_color (style (* GtkStyle)) - (color_name (const (* gchar))) + (color_name (* (const gchar))) (color (* GdkColor))) #;(extern void gtk_paint_hline @@ -74,7 +74,7 @@ gtk-2.0/gtk/gtkstyle.h |# (state_type GtkStateType) (area (* GdkRectangle)) (widget (* GtkWidget)) - (detail (const (* gchar))) + (detail (* (const gchar))) (x1 gint) (x2 gint) (y gint)) @@ -85,7 +85,7 @@ gtk-2.0/gtk/gtkstyle.h |# (state_type GtkStateType) (area (* GdkRectangle)) (widget (* GtkWidget)) - (detail (const (* gchar))) + (detail (* (const gchar))) (y1_ gint) (y2_ gint) (x gint)) @@ -97,7 +97,7 @@ gtk-2.0/gtk/gtkstyle.h |# (shadow_type GtkShadowType) (area (* GdkRectangle)) (widget (* GtkWidget)) - (detail (const (* gchar))) + (detail (* (const gchar))) (x gint) (y gint) (width gint) @@ -109,7 +109,7 @@ gtk-2.0/gtk/gtkstyle.h |# (state_type GtkStateType) (area (* GdkRectangle)) (widget (* GtkWidget)) - (detail (const (* gchar))) + (detail (* (const gchar))) (x gint) (y gint) (width gint) (height gint)) @@ -120,6 +120,6 @@ gtk-2.0/gtk/gtkstyle.h |# (use_text gboolean) (area (* GdkRectangle)) (widget (* GtkWidget)) - (detail (const (* gchar))) + (detail (* (const gchar))) (x gint) (y gint) (layout (* PangoLayout))) \ No newline at end of file diff --git a/src/gtk/Includes/gtkwidget.cdecl b/src/gtk/Includes/gtkwidget.cdecl index e39b7fb14..c94a05054 100644 --- a/src/gtk/Includes/gtkwidget.cdecl +++ b/src/gtk/Includes/gtkwidget.cdecl @@ -370,4 +370,4 @@ gtk-2.0/gtk/gtkwidget.h |# (extern (* PangoLayout) gtk_widget_create_pango_layout (widget (* GtkWidget)) - (text (const (* gchar)))) \ No newline at end of file + (text (* (const gchar)))) \ No newline at end of file diff --git a/src/gtk/Includes/pango-context.cdecl b/src/gtk/Includes/pango-context.cdecl index c7697aecf..79bc9b50c 100644 --- a/src/gtk/Includes/pango-context.cdecl +++ b/src/gtk/Includes/pango-context.cdecl @@ -19,18 +19,18 @@ pango-1.0/pango/pango-context.h |# ;(extern (* PangoFont) ; pango_context_load_font ; (context (* PangoContext)) -; (desc (const (* PangoFontDescription)))) +; (desc (* (const PangoFontDescription)))) ;(extern (* PangoFontset) ; pango_context_load_fontset ; (context (* PangoContext)) -; (desc (const (* PangoFontDescription))) +; (desc (* (const PangoFontDescription))) ; (language (* PangoLanguage))) (extern (* PangoFontMetrics) pango_context_get_metrics (context (* PangoContext)) - (desc (const (* PangoFontDescription))) + (desc (* (const PangoFontDescription))) (language (* PangoLanguage))) (extern (* PangoFontDescription) @@ -40,7 +40,7 @@ pango-1.0/pango/pango-context.h |# (extern void pango_context_set_font_description (context (* PangoContext)) - (desc (const (* PangoFontDescription)))) + (desc (* (const PangoFontDescription)))) (extern (* PangoLanguage) pango_context_get_language @@ -63,16 +63,16 @@ pango-1.0/pango/pango-context.h |# ;(extern void ; pango_context_set_matrix ; (context (* PangoContext)) -; (matrix (const (* PangoMatrix)))) +; (matrix (* (const PangoMatrix)))) -;(extern (const (* PangoMatrix)) +;(extern (* (const PangoMatrix)) ; pango_context_get_matrix ; (context (* PangoContext))) ;(extern (* GList) ; pango_itemize ; (context (* PangoContext)) -; (text (const (* char))) +; (text (* (const char))) ; (start_index int) ; (length int) ; (attrs (* PangoAttrList)) @@ -82,7 +82,7 @@ pango-1.0/pango/pango-context.h |# ; pango_itemize_with_base_dir ; (context (* PangoContext)) ; (base_dir PangoDirection) -; (text (const (* char))) +; (text (* (const char))) ; (start_index int) ; (length int) ; (attrs (* PangoAttrList)) diff --git a/src/gtk/Includes/pango-font.cdecl b/src/gtk/Includes/pango-font.cdecl index 597d8297a..587f34f7e 100644 --- a/src/gtk/Includes/pango-font.cdecl +++ b/src/gtk/Includes/pango-font.cdecl @@ -90,7 +90,7 @@ pango-1.0/pango/pango-font.h |# (faces (* (* (* PangoFontFace)))) (n_faces (* int))) -(extern (const (* char)) +(extern (* (const char)) pango_font_family_get_name (family (* PangoFontFamily))) @@ -98,6 +98,6 @@ pango-1.0/pango/pango-font.h |# pango_font_family_is_monospace (family (* PangoFontFamily))) -(extern (const (* char)) +(extern (* (const char)) pango_font_face_get_face_name (face (* PangoFontFace))) \ No newline at end of file diff --git a/src/gtk/Includes/pango-layout.cdecl b/src/gtk/Includes/pango-layout.cdecl index 7f4b404c9..823e80135 100644 --- a/src/gtk/Includes/pango-layout.cdecl +++ b/src/gtk/Includes/pango-layout.cdecl @@ -15,14 +15,14 @@ pango-1.0/pango/pango-layout.h |# (extern void pango_layout_set_text (layout (* PangoLayout)) - (text (const (* char))) + (text (* (const char))) (length int)) (extern void pango_layout_set_font_description (layout (* PangoLayout)) - (desc (const (* PangoFontDescription)))) + (desc (* (const PangoFontDescription)))) -(extern (const (* PangoFontDescription)) +(extern (* (const PangoFontDescription)) pango_layout_get_font_description (layout (* PangoLayout))) -- 2.25.1