diff options
234 files changed, 1766 insertions, 1768 deletions
diff --git a/demos/gtk-demo/assistant.c b/demos/gtk-demo/assistant.c index d3f3780a6b..58405f6cc9 100644 --- a/demos/gtk-demo/assistant.c +++ b/demos/gtk-demo/assistant.c @@ -12,7 +12,7 @@ static GtkWidget *progress_bar = NULL; static gboolean apply_changes_gradually (gpointer data) { - gdouble fraction; + double fraction; /* Work, work, work... */ fraction = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (progress_bar)); diff --git a/demos/gtk-demo/drawingarea.c b/demos/gtk-demo/drawingarea.c index d36b6aa6d2..f7b567d382 100644 --- a/demos/gtk-demo/drawingarea.c +++ b/demos/gtk-demo/drawingarea.c @@ -64,8 +64,8 @@ scribble_draw (GtkDrawingArea *da, /* Draw a rectangle on the screen */ static void draw_brush (GtkWidget *widget, - gdouble x, - gdouble y) + double x, + double y) { GdkRectangle update_rect; cairo_t *cr; diff --git a/demos/gtk-demo/font_features.c b/demos/gtk-demo/font_features.c index 0e7a3cf333..6174b27f9b 100644 --- a/demos/gtk-demo/font_features.c +++ b/demos/gtk-demo/font_features.c @@ -728,7 +728,7 @@ static void entry_activated (GtkEntry *entry, GtkAdjustment *adjustment) { - gdouble value; + double value; char *err = NULL; value = g_strtod (gtk_editable_get_text (GTK_EDITABLE (entry)), &err); @@ -939,7 +939,7 @@ instance_changed (GtkComboBox *combo) { Axis *axis; Axis akey; - gdouble value; + double value; value = coords[ai[i].axis_index]; diff --git a/demos/gtk-demo/fontplane.c b/demos/gtk-demo/fontplane.c index 3836799293..b8c4f8c87d 100644 --- a/demos/gtk-demo/fontplane.c +++ b/demos/gtk-demo/fontplane.c @@ -39,7 +39,7 @@ val_to_xy (GtkFontPlane *plane, int *x, int *y) { - gdouble u, v; + double u, v; int width, height; width = gtk_widget_get_allocated_width (GTK_WIDGET (plane)); @@ -129,7 +129,7 @@ update_value (GtkFontPlane *plane, int y) { GtkWidget *widget = GTK_WIDGET (plane); - gdouble u, v; + double u, v; u = CLAMP (x * (1.0 / gtk_widget_get_allocated_width (widget)), 0, 1); v = CLAMP (1 - y * (1.0 / gtk_widget_get_allocated_height (widget)), 0, 1); @@ -142,8 +142,8 @@ update_value (GtkFontPlane *plane, static void plane_drag_gesture_begin (GtkGestureDrag *gesture, - gdouble start_x, - gdouble start_y, + double start_x, + double start_y, GtkFontPlane *plane) { guint button; @@ -164,11 +164,11 @@ plane_drag_gesture_begin (GtkGestureDrag *gesture, static void plane_drag_gesture_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkFontPlane *plane) { - gdouble start_x, start_y; + double start_x, start_y; gtk_gesture_drag_get_start_point (GTK_GESTURE_DRAG (gesture), &start_x, &start_y); @@ -177,8 +177,8 @@ plane_drag_gesture_update (GtkGestureDrag *gesture, static void plane_drag_gesture_end (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkFontPlane *plane) { set_cross_cursor (GTK_WIDGET (plane), FALSE); diff --git a/demos/gtk-demo/gestures.c b/demos/gtk-demo/gestures.c index 99dccaa9a5..690d4ea355 100644 --- a/demos/gtk-demo/gestures.c +++ b/demos/gtk-demo/gestures.c @@ -9,8 +9,8 @@ static GtkGesture *rotate = NULL; static GtkGesture *zoom = NULL; -static gdouble swipe_x = 0; -static gdouble swipe_y = 0; +static double swipe_x = 0; +static double swipe_y = 0; static gboolean long_pressed = FALSE; static gboolean @@ -26,8 +26,8 @@ touchpad_swipe_gesture_begin (GtkGesture *gesture, static void swipe_gesture_swept (GtkGestureSwipe *gesture, - gdouble velocity_x, - gdouble velocity_y, + double velocity_x, + double velocity_y, GtkWidget *widget) { swipe_x = velocity_x / 10; @@ -37,8 +37,8 @@ swipe_gesture_swept (GtkGestureSwipe *gesture, static void long_press_gesture_pressed (GtkGestureLongPress *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkWidget *widget) { long_pressed = TRUE; @@ -56,8 +56,8 @@ long_press_gesture_end (GtkGesture *gesture, static void rotation_angle_changed (GtkGestureRotate *gesture, - gdouble angle, - gdouble delta, + double angle, + double delta, GtkWidget *widget) { gtk_widget_queue_draw (widget); @@ -65,7 +65,7 @@ rotation_angle_changed (GtkGestureRotate *gesture, static void zoom_scale_changed (GtkGestureZoom *gesture, - gdouble scale, + double scale, GtkWidget *widget) { gtk_widget_queue_draw (widget); @@ -93,8 +93,8 @@ drawing_area_draw (GtkDrawingArea *area, { cairo_pattern_t *pat; cairo_matrix_t matrix; - gdouble angle, scale; - gdouble x_center, y_center; + double angle, scale; + double x_center, y_center; gtk_gesture_get_bounding_box_center (GTK_GESTURE (zoom), &x_center, &y_center); diff --git a/demos/gtk-demo/hypertext.c b/demos/gtk-demo/hypertext.c index ad753c1756..95c5a3ea31 100644 --- a/demos/gtk-demo/hypertext.c +++ b/demos/gtk-demo/hypertext.c @@ -140,8 +140,8 @@ static void set_cursor_if_appropriate (GtkTextView *text_view, static void released_cb (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkWidget *text_view) { GtkTextIter start, end, iter; @@ -168,8 +168,8 @@ released_cb (GtkGestureClick *gesture, static void motion_cb (GtkEventControllerMotion *controller, - gdouble x, - gdouble y, + double x, + double y, GtkTextView *text_view) { set_cursor_if_appropriate (text_view, x, y); diff --git a/demos/gtk-demo/listview_colors.c b/demos/gtk-demo/listview_colors.c index b735fd2a1c..edbdb75c4d 100644 --- a/demos/gtk-demo/listview_colors.c +++ b/demos/gtk-demo/listview_colors.c @@ -89,14 +89,14 @@ static GParamSpec *color_properties[N_COLOR_PROPS] = { NULL, }; static void rgb_to_hsv (GdkRGBA *rgba, - gdouble *h_out, - gdouble *s_out, - gdouble *v_out) + double *h_out, + double *s_out, + double *v_out) { - gdouble red, green, blue; - gdouble h, s, v; - gdouble min, max; - gdouble delta; + double red, green, blue; + double h, s, v; + double min, max; + double delta; red = rgba->red; green = rgba->green; diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index 889b539dc1..722ae6fa08 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -270,8 +270,6 @@ static const char *types[] = "gshort", "gushort", "gulong", - "gdouble", - "gldouble", "gpointer", "NULL", "GList", diff --git a/demos/gtk-demo/paint.c b/demos/gtk-demo/paint.c index d3e6c59cf1..e95e25a5a1 100644 --- a/demos/gtk-demo/paint.c +++ b/demos/gtk-demo/paint.c @@ -20,7 +20,7 @@ typedef struct cairo_t *cr; GdkRGBA draw_color; GtkPadController *pad_controller; - gdouble brush_size; + double brush_size; } DrawingArea; typedef struct @@ -166,7 +166,7 @@ on_pad_knob_change (GSimpleAction *action, GVariant *parameter, DrawingArea *area) { - gdouble value = g_variant_get_double (parameter); + double value = g_variant_get_double (parameter); area->brush_size = value; } @@ -255,9 +255,9 @@ drawing_area_class_init (DrawingAreaClass *klass) static void drawing_area_apply_stroke (DrawingArea *area, GdkDeviceTool *tool, - gdouble x, - gdouble y, - gdouble pressure) + double x, + double y, + double pressure) { if (gdk_device_tool_get_tool_type (tool) == GDK_DEVICE_TOOL_TYPE_ERASER) { @@ -281,8 +281,8 @@ drawing_area_apply_stroke (DrawingArea *area, static void stylus_gesture_down (GtkGestureStylus *gesture, - gdouble x, - gdouble y, + double x, + double y, DrawingArea *area) { cairo_new_path (area->cr); @@ -290,13 +290,13 @@ stylus_gesture_down (GtkGestureStylus *gesture, static void stylus_gesture_motion (GtkGestureStylus *gesture, - gdouble x, - gdouble y, + double x, + double y, DrawingArea *area) { GdkTimeCoord *backlog; GdkDeviceTool *tool; - gdouble pressure; + double pressure; guint n_items; tool = gtk_gesture_stylus_get_device_tool (gesture); diff --git a/demos/gtk-demo/printing.c b/demos/gtk-demo/printing.c index 5dd0ed493b..f095c59575 100644 --- a/demos/gtk-demo/printing.c +++ b/demos/gtk-demo/printing.c @@ -15,7 +15,7 @@ typedef struct { char *resourcename; - gdouble font_size; + double font_size; int lines_per_page; char **lines; @@ -62,7 +62,7 @@ draw_page (GtkPrintOperation *operation, cairo_t *cr; PangoLayout *layout; int text_width, text_height; - gdouble width; + double width; int line, i; PangoFontDescription *desc; char *page_str; diff --git a/demos/gtk-demo/spinbutton.c b/demos/gtk-demo/spinbutton.c index da41f04407..8fd93ddb0f 100644 --- a/demos/gtk-demo/spinbutton.c +++ b/demos/gtk-demo/spinbutton.c @@ -13,11 +13,11 @@ int spinbutton_hex_spin_input (GtkSpinButton *spin_button, - gdouble *new_val) + double *new_val) { const char *buf; char *err; - gdouble res; + double res; buf = gtk_editable_get_text (GTK_EDITABLE (spin_button)); res = strtol (buf, &err, 16); @@ -33,7 +33,7 @@ spinbutton_hex_spin_output (GtkSpinButton *spin_button) { GtkAdjustment *adjustment; char *buf; - gdouble val; + double val; adjustment = gtk_spin_button_get_adjustment (spin_button); val = gtk_adjustment_get_value (adjustment); @@ -50,7 +50,7 @@ spinbutton_hex_spin_output (GtkSpinButton *spin_button) int spinbutton_time_spin_input (GtkSpinButton *spin_button, - gdouble *new_val) + double *new_val) { const char *text; char **str; @@ -92,8 +92,8 @@ spinbutton_time_spin_output (GtkSpinButton *spin_button) { GtkAdjustment *adjustment; char *buf; - gdouble hours; - gdouble minutes; + double hours; + double minutes; adjustment = gtk_spin_button_get_adjustment (spin_button); hours = gtk_adjustment_get_value (adjustment) / 60.0; @@ -123,7 +123,7 @@ static const char *month[12] = { int spinbutton_month_spin_input (GtkSpinButton *spin_button, - gdouble *new_val) + double *new_val) { int i; char *tmp1, *tmp2; @@ -145,7 +145,7 @@ spinbutton_month_spin_input (GtkSpinButton *spin_button, *new_val = 0.0; return GTK_INPUT_ERROR; } - *new_val = (gdouble) i; + *new_val = (double) i; return TRUE; } @@ -154,7 +154,7 @@ int spinbutton_month_spin_output (GtkSpinButton *spin_button) { GtkAdjustment *adjustment; - gdouble value; + double value; int i; adjustment = gtk_spin_button_get_adjustment (spin_button); diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c index 90915f6b70..1ca731eb2c 100644 --- a/demos/widget-factory/widget-factory.c +++ b/demos/widget-factory/widget-factory.c @@ -482,7 +482,7 @@ pulse_it (GtkWidget *widget) static void update_pulse_time (GtkAdjustment *adjustment, GtkWidget *widget) { - gdouble value; + double value; guint pulse_id; value = gtk_adjustment_get_value (adjustment); @@ -537,11 +537,11 @@ on_entry_icon_release (GtkEntry *entry, static void on_scale_button_value_changed (GtkScaleButton *button, - gdouble value, + double value, gpointer user_data) { GtkAdjustment *adjustment; - gdouble val; + double val; char *str; adjustment = gtk_scale_button_get_adjustment (button); diff --git a/docs/reference/gtk/getting_started.md b/docs/reference/gtk/getting_started.md index d3b62b437c..d12d35ff30 100644 --- a/docs/reference/gtk/getting_started.md +++ b/docs/reference/gtk/getting_started.md @@ -426,8 +426,8 @@ draw_cb (GtkDrawingArea *drawing_area, /* Draw a rectangle on the surface at the given position */ static void draw_brush (GtkWidget *widget, - gdouble x, - gdouble y) + double x, + double y) { cairo_t *cr; diff --git a/examples/drawing.c b/examples/drawing.c index 4986f69539..9bc05e5fdb 100644 --- a/examples/drawing.c +++ b/examples/drawing.c @@ -59,8 +59,8 @@ draw_cb (GtkDrawingArea *drawing_area, /* Draw a rectangle on the surface at the given position */ static void draw_brush (GtkWidget *widget, - gdouble x, - gdouble y) + double x, + double y) { cairo_t *cr; diff --git a/gdk/broadway/gdkdevice-broadway.c b/gdk/broadway/gdkdevice-broadway.c index 23fc5fd8dd..8fe6eab346 100644 --- a/gdk/broadway/gdkdevice-broadway.c +++ b/gdk/broadway/gdkdevice-broadway.c @@ -24,8 +24,8 @@ #include "gdkprivate-broadway.h" static void gdk_broadway_device_get_state (GdkDevice *device, - GdkSurface *surface, - gdouble *axes, + GdkSurface *surface, + double *axes, GdkModifierType *mask); static void gdk_broadway_device_set_surface_cursor (GdkDevice *device, GdkSurface *surface, @@ -46,8 +46,8 @@ static GdkGrabStatus gdk_broadway_device_grab (GdkDevice *device, static void gdk_broadway_device_ungrab (GdkDevice *device, guint32 time_); static GdkSurface * gdk_broadway_device_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask); @@ -79,11 +79,11 @@ gdk_broadway_device_init (GdkBroadwayDevice *device_core) static void gdk_broadway_device_get_state (GdkDevice *device, - GdkSurface *surface, - gdouble *axes, + GdkSurface *surface, + double *axes, GdkModifierType *mask) { - gdouble x, y; + double x, y; gdk_surface_get_device_position (surface, device, &x, &y, mask); @@ -271,8 +271,8 @@ gdk_broadway_device_ungrab (GdkDevice *device, static GdkSurface * gdk_broadway_device_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkSurface *surface = NULL; diff --git a/gdk/broadway/gdksurface-broadway.c b/gdk/broadway/gdksurface-broadway.c index 5b5abdb6b3..87a0642630 100644 --- a/gdk/broadway/gdksurface-broadway.c +++ b/gdk/broadway/gdksurface-broadway.c @@ -736,8 +736,8 @@ gdk_broadway_surface_get_root_coords (GdkSurface *surface, static gboolean gdk_broadway_surface_get_device_state (GdkSurface *surface, GdkDevice *device, - gdouble *x, - gdouble *y, + double *x, + double *y, GdkModifierType *mask) { GdkSurface *child; diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c index 908fc75af8..d28b7e5b97 100644 --- a/gdk/gdkcairo.c +++ b/gdk/gdkcairo.c @@ -213,8 +213,8 @@ gdk_cairo_surface_paint_pixbuf (cairo_surface_t *surface, void gdk_cairo_set_source_pixbuf (cairo_t *cr, const GdkPixbuf *pixbuf, - gdouble pixbuf_x, - gdouble pixbuf_y) + double pixbuf_x, + double pixbuf_y) { cairo_format_t format; cairo_surface_t *surface; diff --git a/gdk/gdkcairo.h b/gdk/gdkcairo.h index 49b4117eb0..e2dc85c41c 100644 --- a/gdk/gdkcairo.h +++ b/gdk/gdkcairo.h @@ -35,8 +35,8 @@ void gdk_cairo_set_source_rgba (cairo_t *cr, GDK_AVAILABLE_IN_ALL void gdk_cairo_set_source_pixbuf (cairo_t *cr, const GdkPixbuf *pixbuf, - gdouble pixbuf_x, - gdouble pixbuf_y); + double pixbuf_x, + double pixbuf_y); GDK_AVAILABLE_IN_ALL void gdk_cairo_rectangle (cairo_t *cr, diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index ae6cd79e6b..745b8910a0 100644 --- a/gdk/gdkdevice.c +++ b/gdk/gdkdevice.c @@ -52,11 +52,11 @@ typedef struct _GdkAxisInfo GdkAxisInfo; struct _GdkAxisInfo { GdkAxisUse use; - gdouble min_axis; - gdouble max_axis; - gdouble min_value; - gdouble max_value; - gdouble resolution; + double min_axis; + double max_axis; + double min_value; + double max_value; + double resolution; }; enum { @@ -550,7 +550,7 @@ gdk_device_get_property (GObject *object, void gdk_device_get_state (GdkDevice *device, GdkSurface *surface, - gdouble *axes, + double *axes, GdkModifierType *mask) { g_return_if_fail (GDK_IS_DEVICE (device)); @@ -608,7 +608,7 @@ gdk_device_get_surface_at_position (GdkDevice *device, double *win_x, double *win_y) { - gdouble tmp_x, tmp_y; + double tmp_x, tmp_y; GdkSurface *surface; g_return_val_if_fail (GDK_IS_DEVICE (device), NULL); @@ -873,9 +873,9 @@ gdk_device_get_n_axes (GdkDevice *device) **/ gboolean gdk_device_get_axis (GdkDevice *device, - gdouble *axes, + double *axes, GdkAxisUse use, - gdouble *value) + double *value) { int i; @@ -994,9 +994,9 @@ _gdk_device_reset_axes (GdkDevice *device) guint _gdk_device_add_axis (GdkDevice *device, GdkAxisUse use, - gdouble min_value, - gdouble max_value, - gdouble resolution) + double min_value, + double max_value, + double resolution) { GdkAxisInfo axis_info; guint pos; @@ -1039,9 +1039,9 @@ void _gdk_device_get_axis_info (GdkDevice *device, guint index_, GdkAxisUse *use, - gdouble *min_value, - gdouble *max_value, - gdouble *resolution) + double *min_value, + double *max_value, + double *resolution) { GdkAxisInfo *info; @@ -1078,17 +1078,17 @@ gboolean _gdk_device_translate_surface_coord (GdkDevice *device, GdkSurface *surface, guint index_, - gdouble value, - gdouble *axis_value) + double value, + double *axis_value) { GdkAxisInfo axis_info; GdkAxisInfo *axis_info_x, *axis_info_y; - gdouble device_width, device_height; - gdouble x_offset, y_offset; - gdouble x_scale, y_scale; - gdouble x_min, y_min; - gdouble x_resolution, y_resolution; - gdouble device_aspect; + double device_width, device_height; + double x_offset, y_offset; + double x_scale, y_scale; + double x_min, y_min; + double x_resolution, y_resolution; + double device_aspect; int surface_width, surface_height; if (index_ >= device->axes->len) @@ -1179,16 +1179,16 @@ _gdk_device_translate_surface_coord (GdkDevice *device, gboolean _gdk_device_translate_screen_coord (GdkDevice *device, GdkSurface *surface, - gdouble surface_root_x, - gdouble surface_root_y, - gdouble screen_width, - gdouble screen_height, + double surface_root_x, + double surface_root_y, + double screen_width, + double screen_height, guint index_, - gdouble value, - gdouble *axis_value) + double value, + double *axis_value) { GdkAxisInfo axis_info; - gdouble axis_width, scale, offset; + double axis_width, scale, offset; if (index_ >= device->axes->len) return FALSE; @@ -1229,11 +1229,11 @@ _gdk_device_translate_screen_coord (GdkDevice *device, gboolean _gdk_device_translate_axis (GdkDevice *device, guint index_, - gdouble value, - gdouble *axis_value) + double value, + double *axis_value) { GdkAxisInfo axis_info; - gdouble axis_width, out; + double axis_width, out; if (index_ >= device->axes->len) return FALSE; @@ -1258,8 +1258,8 @@ void _gdk_device_query_state (GdkDevice *device, GdkSurface *surface, GdkSurface **child_surface, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GDK_DEVICE_GET_CLASS (device)->query_state (device, @@ -1272,8 +1272,8 @@ _gdk_device_query_state (GdkDevice *device, GdkSurface * _gdk_device_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { return GDK_DEVICE_GET_CLASS (device)->surface_at_position (device, diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h index 09286c6119..7fe2aebb84 100644 --- a/gdk/gdkdevice.h +++ b/gdk/gdkdevice.h @@ -116,7 +116,7 @@ GdkAxisUse gdk_device_get_axis_use (GdkDevice *device, GDK_AVAILABLE_IN_ALL void gdk_device_get_state (GdkDevice *device, GdkSurface *surface, - gdouble *axes, + double *axes, GdkModifierType *mask); GDK_AVAILABLE_IN_ALL GdkSurface * gdk_device_get_surface_at_position (GdkDevice *device, @@ -127,9 +127,9 @@ GDK_AVAILABLE_IN_ALL int gdk_device_get_n_axes (GdkDevice *device); GDK_AVAILABLE_IN_ALL gboolean gdk_device_get_axis (GdkDevice *device, - gdouble *axes, + double *axes, GdkAxisUse use, - gdouble *value); + double *value); GDK_AVAILABLE_IN_ALL GdkDisplay * gdk_device_get_display (GdkDevice *device); diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h index 1bd00c4241..07184a3abe 100644 --- a/gdk/gdkdeviceprivate.h +++ b/gdk/gdkdeviceprivate.h @@ -63,7 +63,7 @@ struct _GdkDeviceClass void (* get_state) (GdkDevice *device, GdkSurface *surface, - gdouble *axes, + double *axes, GdkModifierType *mask); void (* set_surface_cursor)(GdkDevice *device, @@ -73,8 +73,8 @@ struct _GdkDeviceClass void (* query_state) (GdkDevice *device, GdkSurface *surface, GdkSurface **child_surface, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask); GdkGrabStatus (* grab) (GdkDevice *device, GdkSurface *surface, @@ -98,36 +98,36 @@ void _gdk_device_set_associated_device (GdkDevice *device, void _gdk_device_reset_axes (GdkDevice *device); guint _gdk_device_add_axis (GdkDevice *device, GdkAxisUse use, - gdouble min_value, - gdouble max_value, - gdouble resolution); + double min_value, + double max_value, + double resolution); void _gdk_device_get_axis_info (GdkDevice *device, guint index, GdkAxisUse *use, - gdouble *min_value, - gdouble *max_value, - gdouble *resolution); + double *min_value, + double *max_value, + double *resolution); gboolean _gdk_device_translate_surface_coord (GdkDevice *device, GdkSurface *surface, guint index, - gdouble value, - gdouble *axis_value); + double value, + double *axis_value); gboolean _gdk_device_translate_screen_coord (GdkDevice *device, GdkSurface *surface, - gdouble surface_root_x, - gdouble surface_root_y, - gdouble screen_width, - gdouble screen_height, + double surface_root_x, + double surface_root_y, + double screen_width, + double screen_height, guint index, - gdouble value, - gdouble *axis_value); + double value, + double *axis_value); gboolean _gdk_device_translate_axis (GdkDevice *device, guint index, - gdouble value, - gdouble *axis_value); + double value, + double *axis_value); GdkTimeCoord ** _gdk_device_allocate_history (GdkDevice *device, int n_events); @@ -140,12 +140,12 @@ void _gdk_device_remove_physical_device (GdkDevice *device, void _gdk_device_query_state (GdkDevice *device, GdkSurface *surface, GdkSurface **child_surface, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask); GdkSurface * _gdk_device_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask); void gdk_device_set_seat (GdkDevice *device, diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 5651bd1300..92f1de8a18 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -584,7 +584,7 @@ get_current_toplevel (GdkDisplay *display, GdkModifierType *state_out) { GdkSurface *pointer_surface; - gdouble x, y; + double x, y; GdkModifierType state; pointer_surface = _gdk_device_surface_at_position (device, &x, &y, &state); diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h index 2ddc6d81cf..13decb82be 100644 --- a/gdk/gdkdisplayprivate.h +++ b/gdk/gdkdisplayprivate.h @@ -62,7 +62,7 @@ typedef struct typedef struct { GdkSurface *surface_under_pointer; /* surface that last got a normal enter event */ - gdouble toplevel_x, toplevel_y; + double toplevel_x, toplevel_y; guint32 state; guint32 button; GdkDevice *last_physical_device; diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 2248b94208..8131d54d59 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -993,12 +993,12 @@ gdk_event_triggers_context_menu (GdkEvent *event) static gboolean gdk_events_get_axis_distances (GdkEvent *event1, GdkEvent *event2, - gdouble *x_distance, - gdouble *y_distance, - gdouble *distance) + double *x_distance, + double *y_distance, + double *distance) { - gdouble x1, x2, y1, y2; - gdouble xd, yd; + double x1, x2, y1, y2; + double xd, yd; if (!gdk_event_get_position (event1, &x1, &y1) || !gdk_event_get_position (event2, &x2, &y2)) @@ -1033,7 +1033,7 @@ gdk_events_get_axis_distances (GdkEvent *event1, gboolean gdk_events_get_distance (GdkEvent *event1, GdkEvent *event2, - gdouble *distance) + double *distance) { return gdk_events_get_axis_distances (event1, event2, NULL, NULL, @@ -1056,9 +1056,9 @@ gdk_events_get_distance (GdkEvent *event1, gboolean gdk_events_get_angle (GdkEvent *event1, GdkEvent *event2, - gdouble *angle) + double *angle) { - gdouble x_distance, y_distance, distance; + double x_distance, y_distance, distance; if (!gdk_events_get_axis_distances (event1, event2, &x_distance, &y_distance, @@ -1097,10 +1097,10 @@ gdk_events_get_angle (GdkEvent *event1, gboolean gdk_events_get_center (GdkEvent *event1, GdkEvent *event2, - gdouble *x, - gdouble *y) + double *x, + double *y) { - gdouble x1, x2, y1, y2; + double x1, x2, y1, y2; if (!gdk_event_get_position (event1, &x1, &y1) || !gdk_event_get_position (event2, &x2, &y2)) diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index a4d85365fd..0a70e407d1 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -188,8 +188,8 @@ void _gdk_synthesize_crossing_events (GdkDisplay *display, GdkDevice *device, GdkDevice *source_device, GdkCrossingMode mode, - gdouble toplevel_x, - gdouble toplevel_y, + double toplevel_x, + double toplevel_y, GdkModifierType mask, guint32 time_, GdkEvent *event_in_queue, @@ -331,8 +331,8 @@ struct _GdkGeometry int base_height; int width_inc; int height_inc; - gdouble min_aspect; - gdouble max_aspect; + double min_aspect; + double max_aspect; GdkGravity win_gravity; }; diff --git a/gdk/gdkrgba.c b/gdk/gdkrgba.c index 80c4349572..20940db9d3 100644 --- a/gdk/gdkrgba.c +++ b/gdk/gdkrgba.c @@ -132,7 +132,7 @@ gdk_rgba_is_opaque (const GdkRGBA *rgba) static gboolean parse_rgb_value (const char *str, char **endp, - gdouble *number) + double *number) { const char *p; @@ -186,7 +186,7 @@ gdk_rgba_parse (GdkRGBA *rgba, const char *spec) { gboolean has_alpha; - gdouble r, g, b, a; + double r, g, b, a; char *str = (char *) spec; char *p; diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c index eb2776b164..6b58c1f027 100644 --- a/gdk/gdksurface.c +++ b/gdk/gdksurface.c @@ -1705,7 +1705,7 @@ gdk_surface_get_device_position (GdkSurface *surface, double *y, GdkModifierType *mask) { - gdouble tmp_x, tmp_y; + double tmp_x, tmp_y; GdkModifierType tmp_mask; g_return_if_fail (GDK_IS_SURFACE (surface)); diff --git a/gdk/gdksurfaceprivate.h b/gdk/gdksurfaceprivate.h index b3a8457a58..5d750bfe2e 100644 --- a/gdk/gdksurfaceprivate.h +++ b/gdk/gdksurfaceprivate.h @@ -125,8 +125,8 @@ struct _GdkSurfaceClass int *root_y); gboolean (* get_device_state) (GdkSurface *surface, GdkDevice *device, - gdouble *x, - gdouble *y, + double *x, + double *y, GdkModifierType *mask); void (* set_input_region) (GdkSurface *surface, diff --git a/gdk/macos/gdkmacosdevice.c b/gdk/macos/gdkmacosdevice.c index 3b77c7a7d0..8dbbe1ac61 100644 --- a/gdk/macos/gdkmacosdevice.c +++ b/gdk/macos/gdkmacosdevice.c @@ -65,8 +65,8 @@ gdk_macos_device_set_surface_cursor (GdkDevice *device, static GdkSurface * gdk_macos_device_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *state) { GdkMacosDisplay *display; @@ -129,10 +129,10 @@ gdk_macos_device_ungrab (GdkDevice *device, static void gdk_macos_device_get_state (GdkDevice *device, GdkSurface *surface, - gdouble *axes, + double *axes, GdkModifierType *mask) { - gdouble x_pos, y_pos; + double x_pos, y_pos; g_assert (GDK_IS_MACOS_DEVICE (device)); g_assert (GDK_IS_MACOS_SURFACE (surface)); @@ -150,8 +150,8 @@ static void gdk_macos_device_query_state (GdkDevice *device, GdkSurface *surface, GdkSurface **child_surface, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkDisplay *display; diff --git a/gdk/macos/gdkmacosdisplay-translate.c b/gdk/macos/gdkmacosdisplay-translate.c index 8e86459987..799031e3ef 100644 --- a/gdk/macos/gdkmacosdisplay-translate.c +++ b/gdk/macos/gdkmacosdisplay-translate.c @@ -433,7 +433,7 @@ fill_pinch_event (GdkMacosDisplay *display, } last_state = FP_STATE_IDLE; GdkSeat *seat; GdkTouchpadGesturePhase phase; - gdouble angle_delta = 0.0; + double angle_delta = 0.0; g_assert (GDK_IS_MACOS_DISPLAY (display)); g_assert (GDK_IS_MACOS_SURFACE (surface)); @@ -590,8 +590,8 @@ fill_scroll_event (GdkMacosDisplay *self, GdkDevice *pointer; GdkEvent *ret = NULL; GdkSeat *seat; - gdouble dx; - gdouble dy; + double dx; + double dy; g_assert (GDK_IS_MACOS_SURFACE (surface)); g_assert (nsevent != NULL); @@ -606,8 +606,8 @@ fill_scroll_event (GdkMacosDisplay *self, if ([nsevent hasPreciseScrollingDeltas]) { - gdouble sx; - gdouble sy; + double sx; + double sy; /* * TODO: We probably need another event type for the diff --git a/gdk/macos/gdkmacosdrag.c b/gdk/macos/gdkmacosdrag.c index 7cc70d921e..32c4a4ac74 100644 --- a/gdk/macos/gdkmacosdrag.c +++ b/gdk/macos/gdkmacosdrag.c @@ -305,8 +305,8 @@ gdk_drag_get_current_actions (GdkModifierType state, static void gdk_drag_update (GdkDrag *drag, - gdouble x_root, - gdouble y_root, + double x_root, + double y_root, GdkModifierType mods, guint32 evtime) { diff --git a/gdk/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c index a5bc4098b9..1c0cdc12e9 100644 --- a/gdk/macos/gdkmacossurface.c +++ b/gdk/macos/gdkmacossurface.c @@ -230,8 +230,8 @@ gdk_macos_surface_get_root_coords (GdkSurface *surface, static gboolean gdk_macos_surface_get_device_state (GdkSurface *surface, GdkDevice *device, - gdouble *x, - gdouble *y, + double *x, + double *y, GdkModifierType *mask) { GdkDisplay *display; diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index e9fc839e83..0715bdeea5 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -73,8 +73,8 @@ typedef struct _GdkWaylandTabletPadData GdkWaylandTabletPadData; struct _GdkWaylandTouchData { uint32_t id; - gdouble x; - gdouble y; + double x; + double y; GdkSurface *surface; uint32_t touch_down_serial; guint initial_touch : 1; @@ -85,7 +85,7 @@ struct _GdkWaylandPointerFrameData GdkEvent *event; /* Specific to the scroll event */ - gdouble delta_x, delta_y; + double delta_x, delta_y; int32_t discrete_x, discrete_y; gint8 is_scroll_stop; enum wl_pointer_axis_source source; @@ -147,7 +147,7 @@ struct _GdkWaylandTabletPadGroupData struct { guint source; gboolean is_stop; - gdouble value; + double value; } axis_tmp_info; }; @@ -186,7 +186,7 @@ struct _GdkWaylandTabletData GdkWaylandTabletToolData *current_tool; int axis_indices[GDK_AXIS_LAST]; - gdouble *axes; + double *axes; }; struct _GdkWaylandSeat @@ -253,7 +253,7 @@ struct _GdkWaylandSeat /* Some tracking on gesture events */ guint gesture_n_fingers; - gdouble gesture_scale; + double gesture_scale; GdkCursor *grab_cursor; }; @@ -310,10 +310,10 @@ static void deliver_key_event (GdkWaylandSeat *seat, static void gdk_wayland_device_get_state (GdkDevice *device, GdkSurface *surface, - gdouble *axes, + double *axes, GdkModifierType *mask) { - gdouble x, y; + double x, y; gdk_surface_get_device_position (surface, device, &x, &y, mask); @@ -538,8 +538,8 @@ static void gdk_wayland_device_query_state (GdkDevice *device, GdkSurface *surface, GdkSurface **child_surface, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkWaylandPointerData *pointer; @@ -788,8 +788,8 @@ gdk_wayland_device_ungrab (GdkDevice *device, static GdkSurface * gdk_wayland_device_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkWaylandPointerData *pointer; @@ -1357,8 +1357,8 @@ flush_discrete_scroll_event (GdkWaylandSeat *seat, static void flush_smooth_scroll_event (GdkWaylandSeat *seat, - gdouble delta_x, - gdouble delta_y, + double delta_x, + double delta_y, gboolean is_stop) { GdkEvent *event; @@ -2543,8 +2543,8 @@ emit_gesture_swipe_event (GdkWaylandSeat *seat, GdkTouchpadGesturePhase phase, guint32 _time, guint32 n_fingers, - gdouble dx, - gdouble dy) + double dx, + double dy) { GdkEvent *event; @@ -2638,10 +2638,10 @@ emit_gesture_pinch_event (GdkWaylandSeat *seat, GdkTouchpadGesturePhase phase, guint32 _time, guint n_fingers, - gdouble dx, - gdouble dy, - gdouble scale, - gdouble angle_delta) + double dx, + double dy, + double scale, + double angle_delta) { GdkEvent *event; @@ -3393,7 +3393,7 @@ gdk_wayland_device_tablet_clone_tool_axes (GdkWaylandTabletData *tablet, g_free (tablet->axes); tablet->axes = - g_new0 (gdouble, gdk_device_get_n_axes (tablet->stylus_device)); + g_new0 (double, gdk_device_get_n_axes (tablet->stylus_device)); g_object_thaw_notify (G_OBJECT (tablet->stylus_device)); } @@ -3402,7 +3402,7 @@ static void gdk_wayland_mimic_device_axes (GdkDevice *logical, GdkDevice *physical) { - gdouble axis_min, axis_max, axis_resolution; + double axis_min, axis_max, axis_resolution; GdkAxisUse axis_use; int axis_count; int i; @@ -3510,7 +3510,7 @@ static double * tablet_copy_axes (GdkWaylandTabletData *tablet) { return g_memdup (tablet->axes, - sizeof (gdouble) * gdk_device_get_n_axes (tablet->stylus_device)); + sizeof (double) * gdk_device_get_n_axes (tablet->stylus_device)); } static void @@ -3917,7 +3917,7 @@ tablet_pad_strip_handle_position (void *data, g_message ("tablet pad strip handle position, strip = %p position = %d", wp_tablet_pad_strip, position)); - group->axis_tmp_info.value = (gdouble) position / 65535; + group->axis_tmp_info.value = (double) position / 65535; } static void diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index d0e6298e56..03a00a14fb 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -1445,11 +1445,11 @@ get_order (const char *s) return 0; } -static gdouble +static double get_dpi_from_gsettings (GdkWaylandDisplay *display_wayland) { GSettings *settings; - gdouble factor; + double factor; settings = g_hash_table_lookup (display_wayland->settings, "org.gnome.desktop.interface"); diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c index b6e60a40fe..2883b61947 100644 --- a/gdk/wayland/gdksurface-wayland.c +++ b/gdk/wayland/gdksurface-wayland.c @@ -3105,8 +3105,8 @@ gdk_wayland_surface_get_root_coords (GdkSurface *surface, static gboolean gdk_wayland_surface_get_device_state (GdkSurface *surface, GdkDevice *device, - gdouble *x, - gdouble *y, + double *x, + double *y, GdkModifierType *mask) { gboolean return_val; diff --git a/gdk/win32/gdkclipdrop-win32.c b/gdk/win32/gdkclipdrop-win32.c index 4a7fac2bd2..4de03fec42 100644 --- a/gdk/win32/gdkclipdrop-win32.c +++ b/gdk/win32/gdkclipdrop-win32.c @@ -2477,7 +2477,7 @@ transmute_cf_dib_to_image_bmp (const guchar *data, { if (p[3] != 0) { - gdouble inverse_alpha = 255./p[3]; + double inverse_alpha = 255./p[3]; p[0] = p[0] * inverse_alpha + 0.5; p[1] = p[1] * inverse_alpha + 0.5; diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c index 9bfdd2c443..a7a6464d75 100644 --- a/gdk/win32/gdkcursor-win32.c +++ b/gdk/win32/gdkcursor-win32.c @@ -1003,8 +1003,8 @@ _gdk_win32_display_update_cursors (GdkWin32Display *display) GdkPixbuf * gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon, - gdouble *x_hot, - gdouble *y_hot) + double *x_hot, + double *y_hot) { GdkPixbuf *pixbuf = NULL; ICONINFO ii; diff --git a/gdk/win32/gdkdevice-virtual.c b/gdk/win32/gdkdevice-virtual.c index c6460c5f22..c63bb7fa9a 100644 --- a/gdk/win32/gdkdevice-virtual.c +++ b/gdk/win32/gdkdevice-virtual.c @@ -37,7 +37,7 @@ _gdk_device_virtual_set_active (GdkDevice *device, GdkDeviceVirtual *virtual = GDK_DEVICE_VIRTUAL (device); int n_axes, i; GdkAxisUse use; - gdouble min_value, max_value, resolution; + double min_value, max_value, resolution; if (virtual->active_device == new_active) return; @@ -62,7 +62,7 @@ _gdk_device_virtual_set_active (GdkDevice *device, static void gdk_device_virtual_get_state (GdkDevice *device, GdkSurface *window, - gdouble *axes, + double *axes, GdkModifierType *mask) { GdkDeviceVirtual *virtual = GDK_DEVICE_VIRTUAL (device); @@ -100,8 +100,8 @@ static void gdk_device_virtual_query_state (GdkDevice *device, GdkSurface *window, GdkSurface **child_window, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkDeviceVirtual *virtual = GDK_DEVICE_VIRTUAL (device); diff --git a/gdk/win32/gdkdevice-win32.c b/gdk/win32/gdkdevice-win32.c index 0f83610952..67b16bd51f 100644 --- a/gdk/win32/gdkdevice-win32.c +++ b/gdk/win32/gdkdevice-win32.c @@ -32,7 +32,7 @@ G_DEFINE_TYPE (GdkDeviceWin32, gdk_device_win32, GDK_TYPE_DEVICE) static void gdk_device_win32_get_state (GdkDevice *device, GdkSurface *window, - gdouble *axes, + double *axes, GdkModifierType *mask) { double x, y; @@ -166,8 +166,8 @@ screen_to_client (HWND hwnd, POINT screen_pt, POINT *client_pt) GdkSurface * _gdk_device_win32_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkSurface *window = NULL; diff --git a/gdk/win32/gdkdevice-win32.h b/gdk/win32/gdkdevice-win32.h index b59d775f99..2559412426 100644 --- a/gdk/win32/gdkdevice-win32.h +++ b/gdk/win32/gdkdevice-win32.h @@ -45,8 +45,8 @@ struct _GdkDeviceWin32Class GType gdk_device_win32_get_type (void) G_GNUC_CONST; GdkSurface *_gdk_device_win32_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask); G_END_DECLS diff --git a/gdk/win32/gdkdevice-wintab.c b/gdk/win32/gdkdevice-wintab.c index 124fcef2e7..04acb571fd 100644 --- a/gdk/win32/gdkdevice-wintab.c +++ b/gdk/win32/gdkdevice-wintab.c @@ -57,7 +57,7 @@ get_current_mask (void) static void gdk_device_wintab_get_state (GdkDevice *device, GdkSurface *window, - gdouble *axes, + double *axes, GdkModifierType *mask) { GdkDeviceWintab *device_wintab; @@ -177,8 +177,8 @@ gdk_device_wintab_ungrab (GdkDevice *device, static GdkSurface * gdk_device_wintab_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { return NULL; @@ -187,14 +187,14 @@ gdk_device_wintab_surface_at_position (GdkDevice *device, void _gdk_device_wintab_translate_axes (GdkDeviceWintab *device_wintab, GdkSurface *window, - gdouble *axes, - gdouble *x, - gdouble *y) + double *axes, + double *x, + double *y) { GdkDevice *device; GdkSurface *impl_surface; int root_x, root_y; - gdouble temp_x, temp_y; + double temp_x, temp_y; int i; device = GDK_DEVICE (device_wintab); diff --git a/gdk/win32/gdkdevice-wintab.h b/gdk/win32/gdkdevice-wintab.h index 2679d73b80..088a84e7f4 100644 --- a/gdk/win32/gdkdevice-wintab.h +++ b/gdk/win32/gdkdevice-wintab.h @@ -62,9 +62,9 @@ GType gdk_device_wintab_get_type (void) G_GNUC_CONST; void _gdk_device_wintab_translate_axes (GdkDeviceWintab *device, GdkSurface *window, - gdouble *axes, - gdouble *x, - gdouble *y); + double *axes, + double *x, + double *y); G_END_DECLS diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c index df456c29fd..fcdf5b13da 100644 --- a/gdk/win32/gdkdevicemanager-win32.c +++ b/gdk/win32/gdkdevicemanager-win32.c @@ -1044,7 +1044,7 @@ gdk_input_other_event (GdkDisplay *display, if (event_type == GDK_BUTTON_PRESS || event_type == GDK_BUTTON_RELEASE) { - axes = g_new (gdouble, num_axes); + axes = g_new (double, num_axes); _gdk_device_wintab_translate_axes (source_device, window, @@ -1080,7 +1080,7 @@ gdk_input_other_event (GdkDisplay *display, } else { - axes = g_new (gdouble, num_axes); + axes = g_new (double, num_axes); _gdk_device_wintab_translate_axes (source_device, window, axes, diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c index 8d6caa9ae3..4720804de6 100644 --- a/gdk/win32/gdkdrag-win32.c +++ b/gdk/win32/gdkdrag-win32.c @@ -2307,8 +2307,8 @@ gdk_win32_drag_drop_performed (GdkDrag *drag, static void gdk_local_drag_update (GdkDrag *drag, - gdouble x_root, - gdouble y_root, + double x_root, + double y_root, DWORD grfKeyState, guint32 evtime) { diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index a2ff0d952e..cd7fea354c 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -2755,9 +2755,9 @@ gdk_event_translate (MSG *msg, delta_x = delta_y = 0.0; if (msg->message == WM_MOUSEWHEEL) - delta_y = (double) GET_WHEEL_DELTA_WPARAM (msg->wParam) / (gdouble) WHEEL_DELTA; + delta_y = (double) GET_WHEEL_DELTA_WPARAM (msg->wParam) / (double) WHEEL_DELTA; else if (msg->message == WM_MOUSEHWHEEL) - delta_x = (double) GET_WHEEL_DELTA_WPARAM (msg->wParam) / (gdouble) WHEEL_DELTA; + delta_x = (double) GET_WHEEL_DELTA_WPARAM (msg->wParam) / (double) WHEEL_DELTA; /* Positive delta scrolls up, not down, see API documentation for WM_MOUSEWHEEL message. */ @@ -3291,7 +3291,7 @@ gdk_event_translate (MSG *msg, RECT decorated_rect; RECT undecorated_drag; int decoration_width, decoration_height; - gdouble drag_aspect; + double drag_aspect; int drag_width, drag_height, new_width, new_height; GetClientRect (GDK_SURFACE_HWND (window), &rect); @@ -3313,7 +3313,7 @@ gdk_event_translate (MSG *msg, drag_width = undecorated_drag.right - undecorated_drag.left; drag_height = undecorated_drag.bottom - undecorated_drag.top; - drag_aspect = (gdouble) drag_width / drag_height; + drag_aspect = (double) drag_width / drag_height; GDK_NOTE (EVENTS, g_print (" (ASPECT:%g--%g curr: %g)", impl->hints.min_aspect, impl->hints.max_aspect, drag_aspect)); diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c index 06af6e8303..ad96754187 100644 --- a/gdk/win32/gdksurface-win32.c +++ b/gdk/win32/gdksurface-win32.c @@ -249,8 +249,8 @@ gdk_win32_impl_frame_clock_after_paint (GdkFrameClock *clock, if (SUCCEEDED (hr)) { - timings->refresh_interval = timing_info.qpcRefreshPeriod * (gdouble)G_USEC_PER_SEC / tick_frequency.QuadPart; - timings->presentation_time = timing_info.qpcCompose * (gdouble)G_USEC_PER_SEC / tick_frequency.QuadPart; + timings->refresh_interval = timing_info.qpcRefreshPeriod * (double)G_USEC_PER_SEC / tick_frequency.QuadPart; + timings->presentation_time = timing_info.qpcCompose * (double)G_USEC_PER_SEC / tick_frequency.QuadPart; } } @@ -1804,8 +1804,8 @@ gdk_win32_surface_get_root_coords (GdkSurface *window, static gboolean gdk_surface_win32_get_device_state (GdkSurface *window, GdkDevice *device, - gdouble *x, - gdouble *y, + double *x, + double *y, GdkModifierType *mask) { GdkSurface *child; @@ -2249,9 +2249,9 @@ unsnap (GdkSurface *window, /* If the window fits into new work area without resizing it, * place it into new work area without resizing it. */ - gdouble left, right, up, down, hratio, vratio; - gdouble hscale, vscale; - gdouble new_left, new_up; + double left, right, up, down, hratio, vratio; + double hscale, vscale; + double new_left, new_up; left = impl->snap_stash->x; right = 1.0 - (impl->snap_stash->x + impl->snap_stash->width); @@ -2265,7 +2265,7 @@ unsnap (GdkSurface *window, hscale = hratio / (1.0 + hratio); } - new_left = (gdouble) (rect.width - impl->snap_stash_int->width) * hscale; + new_left = (double) (rect.width - impl->snap_stash_int->width) * hscale; vscale = 1.0; @@ -2275,7 +2275,7 @@ unsnap (GdkSurface *window, vscale = vratio / (1.0 + vratio); } - new_up = (gdouble) (rect.height - impl->snap_stash_int->height) * vscale; + new_up = (double) (rect.height - impl->snap_stash_int->height) * vscale; rect.x = round (rect.x + new_left); rect.y = round (rect.y + new_up); @@ -2360,10 +2360,10 @@ stash_window (GdkSurface *window, wwidth = (hmonitor_info.rcWork.right - hmonitor_info.rcWork.left) / impl->surface_scale; wheight = (hmonitor_info.rcWork.bottom - hmonitor_info.rcWork.top) / impl->surface_scale; - impl->snap_stash->x = (gdouble) (x) / (gdouble) (wwidth); - impl->snap_stash->y = (gdouble) (y) / (gdouble) (wheight); - impl->snap_stash->width = (gdouble) width / (gdouble) (wwidth); - impl->snap_stash->height = (gdouble) height / (gdouble) (wheight); + impl->snap_stash->x = (double) (x) / (double) (wwidth); + impl->snap_stash->y = (double) (y) / (double) (wheight); + impl->snap_stash->width = (double) width / (double) (wwidth); + impl->snap_stash->height = (double) height / (double) (wheight); impl->snap_stash_int->x = x; impl->snap_stash_int->y = y; @@ -2730,7 +2730,7 @@ static void adjust_indicator_rectangle (GdkRectangle *rect, gboolean inward) { - gdouble inverter; + double inverter; const int gap = AEROSNAP_INDICATOR_EDGE_GAP; #if defined(MORE_AEROSNAP_DEBUGGING) GdkRectangle cache = *rect; @@ -2759,12 +2759,12 @@ rounded_rectangle (cairo_t *cr, int y, int width, int height, - gdouble radius, - gdouble line_width, + double radius, + double line_width, GdkRGBA *fill, GdkRGBA *outline) { - gdouble degrees = M_PI / 180.0; + double degrees = M_PI / 180.0; if (fill == NULL && outline == NULL) return; @@ -2798,8 +2798,8 @@ rounded_rectangle (cairo_t *cr, } /* Translates linear animation scale into some kind of curve */ -static gdouble -curve (gdouble val) +static double +curve (double val) { /* TODO: try different curves. For now it's just linear */ return val; @@ -2814,10 +2814,10 @@ draw_indicator (GdkW32DragMoveResizeContext *context, GdkRGBA fill = {0, 0, 1.0, 0.8}; GdkRectangle current_rect; gint64 current_time = g_get_monotonic_time (); - gdouble animation_progress; + double animation_progress; gboolean last_draw; - gdouble line_width; - gdouble corner_radius; + double line_width; + double corner_radius; gint64 animation_duration; GdkWin32Surface *impl = GDK_WIN32_SURFACE (context->window); @@ -2836,7 +2836,7 @@ draw_indicator (GdkW32DragMoveResizeContext *context, if (timestamp != 0) current_time = timestamp; - animation_progress = (gdouble) (current_time - context->indicator_start_time) / animation_duration; + animation_progress = (double) (current_time - context->indicator_start_time) / animation_duration; if (animation_progress > 1.0) animation_progress = 1.0; @@ -2919,7 +2919,7 @@ redraw_indicator (gpointer user_data) HDC hdc; POINT source_point = { 0, 0 }; gboolean last_draw; - gdouble indicator_opacity; + double indicator_opacity; GdkWin32Surface *impl; gboolean do_source_remove = FALSE; diff --git a/gdk/win32/gdksurface-win32.h b/gdk/win32/gdksurface-win32.h index 84e7dbaee0..649e29c869 100644 --- a/gdk/win32/gdksurface-win32.h +++ b/gdk/win32/gdksurface-win32.h @@ -79,10 +79,10 @@ typedef enum _GdkWin32AeroSnapState GdkWin32AeroSnapState; struct _GdkRectangleDouble { - gdouble x; - gdouble y; - gdouble width; - gdouble height; + double x; + double y; + double width; + double height; }; typedef struct _GdkRectangleDouble GdkRectangleDouble; @@ -311,7 +311,7 @@ struct _GdkWin32Surface * we remember the opacity value here and apply it * during UpdateLayredWindow() call, for layered windows. */ - gdouble layered_opacity; + double layered_opacity; HDC hdc; int hdc_count; diff --git a/gdk/win32/gdkwin32misc.h b/gdk/win32/gdkwin32misc.h index dcd9471dc9..3582e81572 100644 --- a/gdk/win32/gdkwin32misc.h +++ b/gdk/win32/gdkwin32misc.h @@ -90,8 +90,8 @@ GdkSurface * gdk_win32_surface_lookup_for_display (GdkDisplay *display, /* For internal GTK use only */ GDK_AVAILABLE_IN_ALL GdkPixbuf *gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon, - gdouble *x_hot, - gdouble *y_hot); + double *x_hot, + double *y_hot); GDK_AVAILABLE_IN_ALL HICON gdk_win32_pixbuf_to_hicon_libgtk_only (GdkPixbuf *pixbuf); GDK_AVAILABLE_IN_ALL diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c index 01736e6821..62507c1a3b 100644 --- a/gdk/x11/gdkdevice-xi2.c +++ b/gdk/x11/gdkdevice-xi2.c @@ -39,8 +39,8 @@ struct _ScrollValuator guint n_valuator : 4; guint direction : 4; guint last_value_valid : 1; - gdouble last_value; - gdouble increment; + double last_value; + double increment; }; struct _GdkX11DeviceXI2 @@ -49,7 +49,7 @@ struct _GdkX11DeviceXI2 int device_id; GArray *scroll_valuators; - gdouble *last_axes; + double *last_axes; }; struct _GdkX11DeviceXI2Class @@ -72,7 +72,7 @@ static void gdk_x11_device_xi2_set_property (GObject *object, static void gdk_x11_device_xi2_get_state (GdkDevice *device, GdkSurface *surface, - gdouble *axes, + double *axes, GdkModifierType *mask); static void gdk_x11_device_xi2_set_surface_cursor (GdkDevice *device, GdkSurface *surface, @@ -80,8 +80,8 @@ static void gdk_x11_device_xi2_set_surface_cursor (GdkDevice *device, static void gdk_x11_device_xi2_query_state (GdkDevice *device, GdkSurface *surface, GdkSurface **child_surface, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask); static GdkGrabStatus gdk_x11_device_xi2_grab (GdkDevice *device, @@ -95,8 +95,8 @@ static void gdk_x11_device_xi2_ungrab (GdkDevice *device, guint32 time_); static GdkSurface * gdk_x11_device_xi2_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask); @@ -190,7 +190,7 @@ gdk_x11_device_xi2_set_property (GObject *object, static void gdk_x11_device_xi2_get_state (GdkDevice *device, GdkSurface *surface, - gdouble *axes, + double *axes, GdkModifierType *mask) { GdkX11DeviceXI2 *device_xi2 = GDK_X11_DEVICE_XI2 (device); @@ -214,7 +214,7 @@ gdk_x11_device_xi2_get_state (GdkDevice *device, { XIAnyClassInfo *class_info = info->classes[i]; GdkAxisUse use; - gdouble value; + double value; if (class_info->type != XIValuatorClass) continue; @@ -285,15 +285,15 @@ static void gdk_x11_device_xi2_query_state (GdkDevice *device, GdkSurface *surface, GdkSurface **child_surface, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkX11DeviceXI2 *device_xi2 = GDK_X11_DEVICE_XI2 (device); GdkDisplay *display; GdkX11Screen *default_screen; Window xroot_window, xchild_window, xwindow; - gdouble xroot_x, xroot_y, xwin_x, xwin_y; + double xroot_x, xroot_y, xwin_x, xwin_y; XIButtonState button_state; XIModifierState mod_state; XIGroupState group_state; @@ -447,8 +447,8 @@ gdk_x11_device_xi2_ungrab (GdkDevice *device, static GdkSurface * gdk_x11_device_xi2_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkX11Surface *impl; @@ -458,7 +458,7 @@ gdk_x11_device_xi2_surface_at_position (GdkDevice *device, Display *xdisplay; GdkSurface *surface; Window xwindow, root, child, last = None; - gdouble xroot_x, xroot_y, xwin_x, xwin_y; + double xroot_x, xroot_y, xwin_x, xwin_y; XIButtonState button_state = { 0 }; XIModifierState mod_state; XIGroupState group_state; @@ -744,7 +744,7 @@ void _gdk_x11_device_xi2_add_scroll_valuator (GdkX11DeviceXI2 *device, guint n_valuator, GdkScrollDirection direction, - gdouble increment) + double increment) { ScrollValuator scroll; @@ -762,9 +762,9 @@ _gdk_x11_device_xi2_add_scroll_valuator (GdkX11DeviceXI2 *device, gboolean _gdk_x11_device_xi2_get_scroll_delta (GdkX11DeviceXI2 *device, guint n_valuator, - gdouble valuator_value, + double valuator_value, GdkScrollDirection *direction_ret, - gdouble *delta_ret) + double *delta_ret) { guint i; @@ -835,7 +835,7 @@ _gdk_x11_device_xi2_get_id (GdkX11DeviceXI2 *device) return device->device_id; } -gdouble +double gdk_x11_device_xi2_get_last_axis_value (GdkX11DeviceXI2 *device, int n_axis) { @@ -850,13 +850,13 @@ gdk_x11_device_xi2_get_last_axis_value (GdkX11DeviceXI2 *device, void gdk_x11_device_xi2_store_axes (GdkX11DeviceXI2 *device, - gdouble *axes, + double *axes, int n_axes) { g_free (device->last_axes); if (axes && n_axes) - device->last_axes = g_memdup (axes, sizeof (gdouble) * n_axes); + device->last_axes = g_memdup (axes, sizeof (double) * n_axes); else device->last_axes = NULL; } diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c index 51cd98a2a5..67dccb5b87 100644 --- a/gdk/x11/gdkdevicemanager-xi2.c +++ b/gdk/x11/gdkdevicemanager-xi2.c @@ -204,9 +204,9 @@ static void translate_valuator_class (GdkDisplay *display, GdkDevice *device, Atom valuator_label, - gdouble min, - gdouble max, - gdouble resolution) + double min, + double max, + double resolution) { static gboolean initialized = FALSE; static Atom label_atoms [GDK_AXIS_LAST] = { 0 }; @@ -1187,25 +1187,25 @@ set_user_time (GdkEvent *event) gdk_x11_surface_set_user_time (surface, time); } -static gdouble * +static double * translate_axes (GdkDevice *device, - gdouble x, - gdouble y, + double x, + double y, GdkSurface *surface, XIValuatorState *valuators) { guint n_axes, i; - gdouble *axes; - gdouble *vals; + double *axes; + double *vals; n_axes = gdk_device_get_n_axes (device); - axes = g_new0 (gdouble, n_axes); + axes = g_new0 (double, n_axes); vals = valuators->values; for (i = 0; i < MIN (valuators->mask_len * 8, n_axes); i++) { GdkAxisUse use; - gdouble val; + double val; if (!XIMaskIsSet (valuators->mask, i)) { @@ -1313,13 +1313,13 @@ get_event_surface (GdkEventTranslator *translator, static gboolean scroll_valuators_changed (GdkX11DeviceXI2 *device, XIValuatorState *valuators, - gdouble *dx, - gdouble *dy) + double *dx, + double *dy) { gboolean has_scroll_valuators = FALSE; GdkScrollDirection direction; guint n_axes, i, n_val; - gdouble *vals; + double *vals; n_axes = gdk_device_get_n_axes (GDK_DEVICE (device)); vals = valuators->values; @@ -1328,7 +1328,7 @@ scroll_valuators_changed (GdkX11DeviceXI2 *device, for (i = 0; i < MIN (valuators->mask_len * 8, n_axes); i++) { - gdouble delta; + double delta; if (!XIMaskIsSet (valuators->mask, i)) continue; @@ -1704,7 +1704,7 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator, case XI_Motion: { XIDeviceEvent *xev = (XIDeviceEvent *) ev; - gdouble delta_x, delta_y; + double delta_x, delta_y; double x, y; double *axes; diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c index 291a892156..ba119a45b8 100644 --- a/gdk/x11/gdkdrag-x11.c +++ b/gdk/x11/gdkdrag-x11.c @@ -2163,8 +2163,8 @@ gdk_drag_get_current_actions (GdkModifierType state, static void gdk_drag_update (GdkDrag *drag, - gdouble x_root, - gdouble y_root, + double x_root, + double y_root, GdkModifierType mods, guint32 evtime) { diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c index a5d17e232c..810202614d 100644 --- a/gdk/x11/gdkeventsource.c +++ b/gdk/x11/gdkeventsource.c @@ -130,7 +130,7 @@ create_synth_crossing_event (GdkEventType evtype, GdkEvent *real_event) { GdkEvent *event; - gdouble x, y; + double x, y; g_assert (evtype == GDK_ENTER_NOTIFY || evtype == GDK_LEAVE_NOTIFY); diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h index eeae4abbe5..97155106a5 100644 --- a/gdk/x11/gdkprivate-x11.h +++ b/gdk/x11/gdkprivate-x11.h @@ -152,19 +152,19 @@ GdkDevice * _gdk_x11_device_manager_xi2_lookup (GdkX11DeviceManagerXI2 *devic void _gdk_x11_device_xi2_add_scroll_valuator (GdkX11DeviceXI2 *device, guint n_valuator, GdkScrollDirection direction, - gdouble increment); + double increment); gboolean _gdk_x11_device_xi2_get_scroll_delta (GdkX11DeviceXI2 *device, guint n_valuator, - gdouble valuator_value, + double valuator_value, GdkScrollDirection *direction_ret, - gdouble *delta_ret); + double *delta_ret); void _gdk_device_xi2_reset_scroll_valuators (GdkX11DeviceXI2 *device); -gdouble gdk_x11_device_xi2_get_last_axis_value (GdkX11DeviceXI2 *device, +double gdk_x11_device_xi2_get_last_axis_value (GdkX11DeviceXI2 *device, int n_axis); void gdk_x11_device_xi2_store_axes (GdkX11DeviceXI2 *device, - gdouble *axes, + double *axes, int n_axes); gboolean _gdk_x11_display_supports_cursor_alpha (GdkDisplay *display); diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c index 261b123940..95f340bc70 100644 --- a/gdk/x11/gdksurface-x11.c +++ b/gdk/x11/gdksurface-x11.c @@ -2292,8 +2292,8 @@ gdk_surface_get_geometry_hints (GdkSurface *surface, { *geom_mask |= GDK_HINT_ASPECT; - geometry->min_aspect = (gdouble) size_hints->min_aspect.x / (gdouble) size_hints->min_aspect.y; - geometry->max_aspect = (gdouble) size_hints->max_aspect.x / (gdouble) size_hints->max_aspect.y; + geometry->min_aspect = (double) size_hints->min_aspect.x / (double) size_hints->min_aspect.y; + geometry->max_aspect = (double) size_hints->max_aspect.x / (double) size_hints->max_aspect.y; } if (size_hints->flags & PWinGravity) @@ -2711,8 +2711,8 @@ gdk_x11_surface_get_frame_extents (GdkSurface *surface, static gboolean gdk_x11_surface_get_device_state (GdkSurface *surface, GdkDevice *device, - gdouble *x, - gdouble *y, + double *x, + double *y, GdkModifierType *mask) { GdkSurface *child; @@ -3841,8 +3841,8 @@ get_move_resize_data (GdkDisplay *display, static void check_maximize (MoveResizeData *mv_resize, - gdouble x_root, - gdouble y_root) + double x_root, + double y_root) { GdkSurfaceState state; int y; @@ -3863,8 +3863,8 @@ check_maximize (MoveResizeData *mv_resize, static void check_unmaximize (MoveResizeData *mv_resize, - gdouble x_root, - gdouble y_root) + double x_root, + double y_root) { GdkSurfaceState state; int dx, dy; diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c index 226bbcd985..a3a548227c 100644 --- a/gdk/x11/gdkxftdefaults.c +++ b/gdk/x11/gdkxftdefaults.c @@ -109,7 +109,7 @@ get_boolean_default (GdkX11Screen *x11_screen, static gboolean get_double_default (GdkX11Screen *x11_screen, const char *option, - gdouble *value) + double *value) { Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen); char *v, *e; diff --git a/gsk/gskcairoblur.c b/gsk/gskcairoblur.c index 6e9266c70d..71d2cf4e74 100644 --- a/gsk/gskcairoblur.c +++ b/gsk/gskcairoblur.c @@ -306,8 +306,8 @@ gsk_cairo_blur_start_drawing (cairo_t *cr, double clip_x1, clip_x2, clip_y1, clip_y2, clip_width, clip_height; cairo_surface_t *surface; cairo_t *blur_cr; - gdouble clip_radius; - gdouble x_scale, y_scale; + double clip_radius; + double x_scale, y_scale; gboolean blur_x = (blur_flags & GSK_BLUR_X) != 0; gboolean blur_y = (blur_flags & GSK_BLUR_Y) != 0; @@ -377,7 +377,7 @@ gsk_cairo_blur_finish_drawing (cairo_t *cr, { cairo_t *original_cr; cairo_surface_t *surface; - gdouble x_scale; + double x_scale; if (!needs_blur (radius, blur_flags)) return cr; diff --git a/gsk/gskrendernodeimpl.c b/gsk/gskrendernodeimpl.c index 1013972bcf..05430bea8d 100644 --- a/gsk/gskrendernodeimpl.c +++ b/gsk/gskrendernodeimpl.c @@ -985,7 +985,7 @@ draw_shadow_side (cairo_t *cr, cairo_rectangle_int_t *drawn_rect) { GskBlurFlags blur_flags = GSK_BLUR_REPEAT; - gdouble clip_radius; + double clip_radius; int x1, x2, y1, y2; clip_radius = gsk_cairo_blur_compute_pixels (radius); diff --git a/gtk/a11y/gtklevelbaraccessible.c b/gtk/a11y/gtklevelbaraccessible.c index a8054c204d..cb25428710 100644 --- a/gtk/a11y/gtklevelbaraccessible.c +++ b/gtk/a11y/gtklevelbaraccessible.c @@ -124,7 +124,7 @@ gtk_level_bar_accessible_set_current_value (AtkValue *obj, static void gtk_level_bar_accessible_get_value_and_text (AtkValue *obj, - gdouble *value, + double *value, char **text) { GtkWidget *widget; @@ -153,7 +153,7 @@ gtk_level_bar_accessible_get_range (AtkValue *obj) static void gtk_level_bar_accessible_set_value (AtkValue *obj, - const gdouble value) + const double value) { GtkWidget *widget; GtkLevelBar *level_bar; diff --git a/gtk/a11y/gtkpanedaccessible.c b/gtk/a11y/gtkpanedaccessible.c index 475b65b626..97793626ab 100644 --- a/gtk/a11y/gtkpanedaccessible.c +++ b/gtk/a11y/gtkpanedaccessible.c @@ -143,7 +143,7 @@ gtk_paned_accessible_set_current_value (AtkValue *obj, static void gtk_paned_accessible_get_value_and_text (AtkValue *obj, - gdouble *value, + double *value, char **text) { GtkWidget *widget; @@ -175,7 +175,7 @@ gtk_paned_accessible_get_range (AtkValue *obj) static void gtk_paned_accessible_set_value (AtkValue *obj, - const gdouble value) + const double value) { GtkWidget *widget; GtkPaned *paned; diff --git a/gtk/a11y/gtkprogressbaraccessible.c b/gtk/a11y/gtkprogressbaraccessible.c index 517f845184..cf91831305 100644 --- a/gtk/a11y/gtkprogressbaraccessible.c +++ b/gtk/a11y/gtkprogressbaraccessible.c @@ -78,7 +78,7 @@ gtk_progress_bar_accessible_get_minimum_value (AtkValue *obj, static void gtk_progress_bar_accessible_get_value_and_text (AtkValue *obj, - gdouble *value, + double *value, char **text) { GtkWidget *widget; diff --git a/gtk/a11y/gtkrangeaccessible.c b/gtk/a11y/gtkrangeaccessible.c index 8650f7c452..a004979143 100644 --- a/gtk/a11y/gtkrangeaccessible.c +++ b/gtk/a11y/gtkrangeaccessible.c @@ -152,7 +152,7 @@ gtk_range_accessible_get_maximum_value (AtkValue *obj, { GtkWidget *widget; GtkAdjustment *adjustment; - gdouble max; + double max; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)); adjustment = gtk_range_get_adjustment (GTK_RANGE (widget)); @@ -223,7 +223,7 @@ gtk_range_accessible_set_current_value (AtkValue *obj, static void gtk_range_accessible_get_value_and_text (AtkValue *obj, - gdouble *value, + double *value, char **text) { GtkWidget *widget; @@ -243,7 +243,7 @@ gtk_range_accessible_get_range (AtkValue *obj) { GtkWidget *widget; GtkAdjustment *adjustment; - gdouble min, max; + double min, max; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)); adjustment = gtk_range_get_adjustment (GTK_RANGE (widget)); @@ -262,7 +262,7 @@ gtk_range_accessible_get_range (AtkValue *obj) static void gtk_range_accessible_set_value (AtkValue *obj, - const gdouble value) + const double value) { GtkWidget *widget; GtkAdjustment *adjustment; @@ -275,7 +275,7 @@ gtk_range_accessible_set_value (AtkValue *obj, gtk_adjustment_set_value (adjustment, value); } -static gdouble +static double gtk_range_accessible_get_increment (AtkValue *obj) { GtkWidget *widget; diff --git a/gtk/a11y/gtkscalebuttonaccessible.c b/gtk/a11y/gtkscalebuttonaccessible.c index 7c31735a21..e569fc4dcd 100644 --- a/gtk/a11y/gtkscalebuttonaccessible.c +++ b/gtk/a11y/gtkscalebuttonaccessible.c @@ -300,7 +300,7 @@ gtk_scale_button_accessible_set_current_value (AtkValue *obj, static void gtk_scale_button_accessible_get_value_and_text (AtkValue *obj, - gdouble *value, + double *value, char **text) { GtkWidget *widget; @@ -333,7 +333,7 @@ gtk_scale_button_accessible_get_range (AtkValue *obj) static void gtk_scale_button_accessible_set_value (AtkValue *obj, - const gdouble value) + const double value) { GtkWidget *widget; GtkAdjustment *adjustment; @@ -346,7 +346,7 @@ gtk_scale_button_accessible_set_value (AtkValue *obj, gtk_adjustment_set_value (adjustment, value); } -static gdouble +static double gtk_scale_button_accessible_get_increment (AtkValue *obj) { GtkWidget *widget; diff --git a/gtk/a11y/gtkspinbuttonaccessible.c b/gtk/a11y/gtkspinbuttonaccessible.c index 879a1eb132..0791b4e9e4 100644 --- a/gtk/a11y/gtkspinbuttonaccessible.c +++ b/gtk/a11y/gtkspinbuttonaccessible.c @@ -201,7 +201,7 @@ gtk_spin_button_accessible_set_current_value (AtkValue *obj, static void gtk_spin_button_accessible_get_value_and_text (AtkValue *obj, - gdouble *value, + double *value, char **text) { GtkWidget *widget; @@ -234,7 +234,7 @@ gtk_spin_button_accessible_get_range (AtkValue *obj) static void gtk_spin_button_accessible_set_value (AtkValue *obj, - const gdouble value) + const double value) { GtkWidget *widget; GtkAdjustment *adjustment; @@ -247,7 +247,7 @@ gtk_spin_button_accessible_set_value (AtkValue *obj, gtk_adjustment_set_value (adjustment, value); } -static gdouble +static double gtk_spin_button_accessible_get_increment (AtkValue *obj) { GtkWidget *widget; diff --git a/gtk/a11y/gtktextcellaccessible.c b/gtk/a11y/gtktextcellaccessible.c index 369da981b9..7af56d9696 100644 --- a/gtk/a11y/gtktextcellaccessible.c +++ b/gtk/a11y/gtktextcellaccessible.c @@ -377,7 +377,7 @@ create_pango_layout (GtkTextCellAccessible *text) gboolean foreground_set, strikethrough_set, strikethrough; gboolean scale_set, underline_set, rise_set; char *renderer_text; - gdouble scale; + double scale; int rise; GtkRendererCellAccessible *gail_renderer; GtkCellRendererText *gtk_renderer; diff --git a/gtk/a11y/gtktextviewaccessible.c b/gtk/a11y/gtktextviewaccessible.c index f6cf38fc48..3de00eec92 100644 --- a/gtk/a11y/gtktextviewaccessible.c +++ b/gtk/a11y/gtktextviewaccessible.c @@ -557,7 +557,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, GtkTextIter iter; AtkAttributeSet *attrib_set = NULL; GSList *tags, *temp_tags; - gdouble scale = 1; + double scale = 1; gboolean val_set = FALSE; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text)); @@ -788,7 +788,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, g_object_get (tag, "scale-set", &scale_set, NULL); if (scale_set) { - gdouble font_scale; + double font_scale; g_object_get (tag, "scale", &font_scale, NULL); val_set = TRUE; scale *= font_scale; diff --git a/gtk/gen-paper-names.c b/gtk/gen-paper-names.c index 8d9ea390b5..3f23c87d34 100644 --- a/gtk/gen-paper-names.c +++ b/gtk/gen-paper-names.c @@ -71,12 +71,12 @@ find_name (const char *name) static gboolean parse_media_size (const char *size, - gdouble *width_mm, - gdouble *height_mm) + double *width_mm, + double *height_mm) { const char *p; char *e; - gdouble short_dim, long_dim; + double short_dim, long_dim; p = size; @@ -114,7 +114,7 @@ int main (int argc, char *argv[]) { int i, j, offset; - gdouble width, height; + double width, height; names = (NameInfo *) malloc (sizeof (NameInfo) * (4 + n_infos + 2 * n_extra)); n_names = 0; diff --git a/gtk/gsettings-mapping.c b/gtk/gsettings-mapping.c index 7eadca3d27..8e22e1397f 100644 --- a/gtk/gsettings-mapping.c +++ b/gtk/gsettings-mapping.c @@ -71,7 +71,7 @@ g_settings_set_mapping_int (const GValue *value, variant = g_variant_new_handle ((guint) l); } else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_DOUBLE)) - variant = g_variant_new_double ((gdouble) l); + variant = g_variant_new_double ((double) l); return variant; } @@ -81,7 +81,7 @@ g_settings_set_mapping_float (const GValue *value, const GVariantType *expected_type) { GVariant *variant = NULL; - gdouble d; + double d; gint64 l; if (G_VALUE_HOLDS_DOUBLE (value)) @@ -126,7 +126,7 @@ g_settings_set_mapping_float (const GValue *value, variant = g_variant_new_handle ((guint) l); } else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_DOUBLE)) - variant = g_variant_new_double ((gdouble) d); + variant = g_variant_new_double ((double) d); return variant; } @@ -180,7 +180,7 @@ g_settings_set_mapping_unsigned_int (const GValue *value, variant = g_variant_new_handle ((guint) u); } else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_DOUBLE)) - variant = g_variant_new_double ((gdouble) u); + variant = g_variant_new_double ((double) u); return variant; } @@ -237,7 +237,7 @@ g_settings_get_mapping_float (GValue *value, GVariant *variant) { const GVariantType *type; - gdouble d; + double d; gint64 l; type = g_variant_get_type (variant); diff --git a/gtk/gskpango.c b/gtk/gskpango.c index 8f54c9cc94..1e1baee43c 100644 --- a/gtk/gskpango.c +++ b/gtk/gskpango.c @@ -140,7 +140,7 @@ gsk_pango_renderer_draw_trapezoid (PangoRenderer *renderer, { GskPangoRenderer *crenderer = (GskPangoRenderer *) (renderer); cairo_t *cr; - gdouble x, y; + double x, y; cr = gtk_snapshot_append_cairo (crenderer->snapshot, &crenderer->bounds); diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c index 097a7bac14..d4bf1ca8a1 100644 --- a/gtk/gtkadjustment.c +++ b/gtk/gtkadjustment.c @@ -46,15 +46,15 @@ struct _GtkAdjustmentPrivate { - gdouble lower; - gdouble upper; - gdouble value; - gdouble step_increment; - gdouble page_increment; - gdouble page_size; + double lower; + double upper; + double value; + double step_increment; + double page_increment; + double page_size; - gdouble source; - gdouble target; + double source; + double target; guint duration; gint64 start_time; @@ -294,7 +294,7 @@ gtk_adjustment_set_property (GObject *object, GParamSpec *pspec) { GtkAdjustment *adjustment = GTK_ADJUSTMENT (object); - gdouble double_value = g_value_get_double (value); + double double_value = g_value_get_double (value); switch (prop_id) { @@ -373,12 +373,12 @@ gtk_adjustment_dispatch_properties_changed (GObject *object, * Returns: a new #GtkAdjustment */ GtkAdjustment * -gtk_adjustment_new (gdouble value, - gdouble lower, - gdouble upper, - gdouble step_increment, - gdouble page_increment, - gdouble page_size) +gtk_adjustment_new (double value, + double lower, + double upper, + double step_increment, + double page_increment, + double page_size) { return g_object_new (GTK_TYPE_ADJUSTMENT, "lower", lower, @@ -399,7 +399,7 @@ gtk_adjustment_new (gdouble value, * * Returns: The current value of the adjustment **/ -gdouble +double gtk_adjustment_get_value (GtkAdjustment *adjustment) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); @@ -408,7 +408,7 @@ gtk_adjustment_get_value (GtkAdjustment *adjustment) return priv->value; } -gdouble +double gtk_adjustment_get_target_value (GtkAdjustment *adjustment) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); @@ -423,7 +423,7 @@ gtk_adjustment_get_target_value (GtkAdjustment *adjustment) static void adjustment_set_value (GtkAdjustment *adjustment, - gdouble value) + double value) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); @@ -466,10 +466,10 @@ gtk_adjustment_end_updating (GtkAdjustment *adjustment) /* From clutter-easing.c, based on Robert Penner's * infamous easing equations, MIT license. */ -static gdouble -ease_out_cubic (gdouble t) +static double +ease_out_cubic (double t) { - gdouble p = t - 1; + double p = t - 1; return p * p * p + 1; } @@ -485,9 +485,9 @@ gtk_adjustment_on_frame_clock_update (GdkFrameClock *clock, if (now < priv->end_time) { - gdouble t; + double t; - t = (now - priv->start_time) / (gdouble) (priv->end_time - priv->start_time); + t = (now - priv->start_time) / (double) (priv->end_time - priv->start_time); t = ease_out_cubic (t); adjustment_set_value (adjustment, priv->source + t * (priv->target - priv->source)); } @@ -500,7 +500,7 @@ gtk_adjustment_on_frame_clock_update (GdkFrameClock *clock, static void gtk_adjustment_set_value_internal (GtkAdjustment *adjustment, - gdouble value, + double value, gboolean animate) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); @@ -543,7 +543,7 @@ gtk_adjustment_set_value_internal (GtkAdjustment *adjustment, */ void gtk_adjustment_set_value (GtkAdjustment *adjustment, - gdouble value) + double value) { g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); @@ -552,7 +552,7 @@ gtk_adjustment_set_value (GtkAdjustment *adjustment, void gtk_adjustment_animate_to_value (GtkAdjustment *adjustment, - gdouble value) + double value) { g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); @@ -567,7 +567,7 @@ gtk_adjustment_animate_to_value (GtkAdjustment *adjustment, * * Returns: The current minimum value of the adjustment **/ -gdouble +double gtk_adjustment_get_lower (GtkAdjustment *adjustment) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); @@ -598,7 +598,7 @@ gtk_adjustment_get_lower (GtkAdjustment *adjustment) **/ void gtk_adjustment_set_lower (GtkAdjustment *adjustment, - gdouble lower) + double lower) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); @@ -619,7 +619,7 @@ gtk_adjustment_set_lower (GtkAdjustment *adjustment, * * Returns: The current maximum value of the adjustment **/ -gdouble +double gtk_adjustment_get_upper (GtkAdjustment *adjustment) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); @@ -645,7 +645,7 @@ gtk_adjustment_get_upper (GtkAdjustment *adjustment) **/ void gtk_adjustment_set_upper (GtkAdjustment *adjustment, - gdouble upper) + double upper) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); @@ -666,7 +666,7 @@ gtk_adjustment_set_upper (GtkAdjustment *adjustment, * * Returns: The current step increment of the adjustment. **/ -gdouble +double gtk_adjustment_get_step_increment (GtkAdjustment *adjustment) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); @@ -689,7 +689,7 @@ gtk_adjustment_get_step_increment (GtkAdjustment *adjustment) **/ void gtk_adjustment_set_step_increment (GtkAdjustment *adjustment, - gdouble step_increment) + double step_increment) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); @@ -710,7 +710,7 @@ gtk_adjustment_set_step_increment (GtkAdjustment *adjustment, * * Returns: The current page increment of the adjustment **/ -gdouble +double gtk_adjustment_get_page_increment (GtkAdjustment *adjustment) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); @@ -733,7 +733,7 @@ gtk_adjustment_get_page_increment (GtkAdjustment *adjustment) **/ void gtk_adjustment_set_page_increment (GtkAdjustment *adjustment, - gdouble page_increment) + double page_increment) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); @@ -754,7 +754,7 @@ gtk_adjustment_set_page_increment (GtkAdjustment *adjustment, * * Returns: The current page size of the adjustment **/ -gdouble +double gtk_adjustment_get_page_size (GtkAdjustment *adjustment) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); @@ -777,7 +777,7 @@ gtk_adjustment_get_page_size (GtkAdjustment *adjustment) **/ void gtk_adjustment_set_page_size (GtkAdjustment *adjustment, - gdouble page_size) + double page_size) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); @@ -809,12 +809,12 @@ gtk_adjustment_set_page_size (GtkAdjustment *adjustment, **/ void gtk_adjustment_configure (GtkAdjustment *adjustment, - gdouble value, - gdouble lower, - gdouble upper, - gdouble step_increment, - gdouble page_increment, - gdouble page_size) + double value, + double lower, + double upper, + double step_increment, + double page_increment, + double page_size) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); gboolean value_changed = FALSE; @@ -867,8 +867,8 @@ gtk_adjustment_configure (GtkAdjustment *adjustment, */ void gtk_adjustment_clamp_page (GtkAdjustment *adjustment, - gdouble lower, - gdouble upper) + double lower, + double upper) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); gboolean need_emission; @@ -903,11 +903,11 @@ gtk_adjustment_clamp_page (GtkAdjustment *adjustment, * * Returns: the minimum increment of @adjustment */ -gdouble +double gtk_adjustment_get_minimum_increment (GtkAdjustment *adjustment) { GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment); - gdouble minimum_increment; + double minimum_increment; g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), 0); diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h index 3c4bf7c6d6..997c2b4df4 100644 --- a/gtk/gtkadjustment.h +++ b/gtk/gtkadjustment.h @@ -73,59 +73,59 @@ struct _GtkAdjustmentClass GDK_AVAILABLE_IN_ALL GType gtk_adjustment_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkAdjustment* gtk_adjustment_new (gdouble value, - gdouble lower, - gdouble upper, - gdouble step_increment, - gdouble page_increment, - gdouble page_size); +GtkAdjustment* gtk_adjustment_new (double value, + double lower, + double upper, + double step_increment, + double page_increment, + double page_size); GDK_AVAILABLE_IN_ALL void gtk_adjustment_clamp_page (GtkAdjustment *adjustment, - gdouble lower, - gdouble upper); + double lower, + double upper); GDK_AVAILABLE_IN_ALL -gdouble gtk_adjustment_get_value (GtkAdjustment *adjustment); +double gtk_adjustment_get_value (GtkAdjustment *adjustment); GDK_AVAILABLE_IN_ALL void gtk_adjustment_set_value (GtkAdjustment *adjustment, - gdouble value); + double value); GDK_AVAILABLE_IN_ALL -gdouble gtk_adjustment_get_lower (GtkAdjustment *adjustment); +double gtk_adjustment_get_lower (GtkAdjustment *adjustment); GDK_AVAILABLE_IN_ALL void gtk_adjustment_set_lower (GtkAdjustment *adjustment, - gdouble lower); + double lower); GDK_AVAILABLE_IN_ALL -gdouble gtk_adjustment_get_upper (GtkAdjustment *adjustment); +double gtk_adjustment_get_upper (GtkAdjustment *adjustment); GDK_AVAILABLE_IN_ALL void gtk_adjustment_set_upper (GtkAdjustment *adjustment, - gdouble upper); + double upper); GDK_AVAILABLE_IN_ALL -gdouble gtk_adjustment_get_step_increment (GtkAdjustment *adjustment); +double gtk_adjustment_get_step_increment (GtkAdjustment *adjustment); GDK_AVAILABLE_IN_ALL void gtk_adjustment_set_step_increment (GtkAdjustment *adjustment, - gdouble step_increment); + double step_increment); GDK_AVAILABLE_IN_ALL -gdouble gtk_adjustment_get_page_increment (GtkAdjustment *adjustment); +double gtk_adjustment_get_page_increment (GtkAdjustment *adjustment); GDK_AVAILABLE_IN_ALL void gtk_adjustment_set_page_increment (GtkAdjustment *adjustment, - gdouble page_increment); + double page_increment); GDK_AVAILABLE_IN_ALL -gdouble gtk_adjustment_get_page_size (GtkAdjustment *adjustment); +double gtk_adjustment_get_page_size (GtkAdjustment *adjustment); GDK_AVAILABLE_IN_ALL void gtk_adjustment_set_page_size (GtkAdjustment *adjustment, - gdouble page_size); + double page_size); GDK_AVAILABLE_IN_ALL void gtk_adjustment_configure (GtkAdjustment *adjustment, - gdouble value, - gdouble lower, - gdouble upper, - gdouble step_increment, - gdouble page_increment, - gdouble page_size); -GDK_AVAILABLE_IN_ALL -gdouble gtk_adjustment_get_minimum_increment (GtkAdjustment *adjustment); + double value, + double lower, + double upper, + double step_increment, + double page_increment, + double page_size); +GDK_AVAILABLE_IN_ALL +double gtk_adjustment_get_minimum_increment (GtkAdjustment *adjustment); G_END_DECLS diff --git a/gtk/gtkadjustmentprivate.h b/gtk/gtkadjustmentprivate.h index c0884448a7..2b42705f76 100644 --- a/gtk/gtkadjustmentprivate.h +++ b/gtk/gtkadjustmentprivate.h @@ -29,8 +29,8 @@ void gtk_adjustment_enable_animation (GtkAdjustment *adjustment, guint duration); guint gtk_adjustment_get_animation_duration (GtkAdjustment *adjustment); void gtk_adjustment_animate_to_value (GtkAdjustment *adjustment, - gdouble value); -gdouble gtk_adjustment_get_target_value (GtkAdjustment *adjustment); + double value); +double gtk_adjustment_get_target_value (GtkAdjustment *adjustment); gboolean gtk_adjustment_is_animating (GtkAdjustment *adjustment); diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c index 7dd1035442..a3ee15dfde 100644 --- a/gtk/gtkbuilder.c +++ b/gtk/gtkbuilder.c @@ -2132,7 +2132,7 @@ gtk_builder_value_from_string_type (GtkBuilder *builder, case G_TYPE_FLOAT: case G_TYPE_DOUBLE: { - gdouble d; + double d; char *endptr = NULL; errno = 0; d = g_ascii_strtod (string, &endptr); diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index a5c1700017..7ed25e1699 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -310,8 +310,8 @@ gtk_button_class_init (GtkButtonClass *klass) static void click_pressed_cb (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkWidget *widget) { GtkButton *button = GTK_BUTTON (widget); @@ -353,8 +353,8 @@ touch_release_in_button (GtkGestureClick *gesture, static void click_released_cb (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkWidget *widget) { GtkButton *button = GTK_BUTTON (widget); diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 353d8358f7..0decdf544d 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -270,8 +270,8 @@ static void calendar_invalidate_day_num (GtkCalendar *widget, int day); static gboolean gtk_calendar_scroll_controller_scroll (GtkEventControllerScroll *scroll, - gdouble dx, - gdouble dy, + double dx, + double dy, GtkWidget *widget); static void calendar_set_month_prev (GtkCalendar *calendar); @@ -1139,8 +1139,8 @@ gtk_calendar_button_press (GtkGestureClick *gesture, static gboolean gtk_calendar_scroll_controller_scroll (GtkEventControllerScroll *scroll, - gdouble dx, - gdouble dy, + double dx, + double dy, GtkWidget *widget) { GtkCalendar *calendar = GTK_CALENDAR (widget); diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c index 2c5caa0724..b8f0864263 100644 --- a/gtk/gtkcellrendererspin.c +++ b/gtk/gtkcellrendererspin.c @@ -68,7 +68,7 @@ struct _GtkCellRendererSpinPrivate { GtkWidget *spin; GtkAdjustment *adjustment; - gdouble climb_rate; + double climb_rate; guint digits; }; diff --git a/gtk/gtkcellrendererspinner.c b/gtk/gtkcellrendererspinner.c index eefb1f7093..2cacbf477e 100644 --- a/gtk/gtkcellrendererspinner.c +++ b/gtk/gtkcellrendererspinner.c @@ -288,7 +288,7 @@ gtk_cell_renderer_spinner_get_size (GtkCellRenderer *cellr, { GtkCellRendererSpinner *cell = GTK_CELL_RENDERER_SPINNER (cellr); GtkCellRendererSpinnerPrivate *priv = gtk_cell_renderer_spinner_get_instance_private (cell); - gdouble align; + double align; int w, h; int xpad, ypad; float xalign, yalign; @@ -346,9 +346,9 @@ gtk_paint_spinner (GtkStyleContext *context, { GdkRGBA color; guint num_steps; - gdouble dx, dy; - gdouble radius; - gdouble half; + double dx, dy; + double radius; + double half; int i; guint real_step; @@ -375,7 +375,7 @@ gtk_paint_spinner (GtkStyleContext *context, int inset = 0.7 * radius; /* transparency is a function of time and initial value */ - gdouble t = (gdouble) ((i + num_steps - real_step) + double t = (double) ((i + num_steps - real_step) % num_steps) / num_steps; cairo_save (cr); diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 5f1a2af590..e11e5c5fe6 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -181,7 +181,7 @@ struct _GtkCellRendererTextPrivate char *text; char *placeholder_text; - gdouble font_scale; + double font_scale; int rise; int fixed_height_rows; diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c index 0b7f36d0db..7727e40157 100644 --- a/gtk/gtkcolorchooserwidget.c +++ b/gtk/gtkcolorchooserwidget.c @@ -266,7 +266,7 @@ update_from_editor (GtkColorEditor *editor, /* UI construction {{{1 */ static guint -scale_round (gdouble value, gdouble scale) +scale_round (double value, double scale) { value = floor (value * scale + 0.5); value = MAX (value, 0); diff --git a/gtk/gtkcoloreditor.c b/gtk/gtkcoloreditor.c index 46c89ca4ef..85a0c3df0e 100644 --- a/gtk/gtkcoloreditor.c +++ b/gtk/gtkcoloreditor.c @@ -95,7 +95,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkColorEditor, gtk_color_editor, GTK_TYPE_BOX, gtk_color_editor_iface_init)) static guint -scale_round (gdouble value, gdouble scale) +scale_round (double value, double scale) { value = floor (value * scale + 0.5); value = MAX (value, 0); @@ -161,7 +161,7 @@ static void hsv_changed (GtkColorEditor *editor) { GdkRGBA color; - gdouble h, s, v, a; + double h, s, v, a; h = gtk_adjustment_get_value (editor->h_adj); s = gtk_adjustment_get_value (editor->s_adj); @@ -333,7 +333,7 @@ static void value_changed (GtkAdjustment *a, GtkAdjustment *as) { - gdouble scale; + double scale; scale = gtk_adjustment_get_upper (as) / gtk_adjustment_get_upper (a); g_signal_handlers_block_by_func (as, value_changed, a); @@ -343,7 +343,7 @@ value_changed (GtkAdjustment *a, static GtkAdjustment * scaled_adjustment (GtkAdjustment *a, - gdouble scale) + double scale) { GtkAdjustment *as; diff --git a/gtk/gtkcolorplane.c b/gtk/gtkcolorplane.c index 90ad66347d..8aefd66fb8 100644 --- a/gtk/gtkcolorplane.c +++ b/gtk/gtkcolorplane.c @@ -56,7 +56,7 @@ sv_to_xy (GtkColorPlane *plane, int *x, int *y) { - gdouble s, v; + double s, v; int width, height; width = gtk_widget_get_width (GTK_WIDGET (plane)); @@ -124,7 +124,7 @@ create_texture (GtkColorPlane *plane) guint32 *data, *p; float h, s, v; float r, g, b; - gdouble sf, vf; + double sf, vf; int x, y; if (!gtk_widget_get_realized (widget)) @@ -234,7 +234,7 @@ update_color (GtkColorPlane *plane, int y) { GtkWidget *widget = GTK_WIDGET (plane); - gdouble s, v; + double s, v; s = CLAMP (1 - y * (1.0 / gtk_widget_get_height (widget)), 0, 1); v = CLAMP (x * (1.0 / gtk_widget_get_width (widget)), 0, 1); @@ -246,8 +246,8 @@ update_color (GtkColorPlane *plane, static void hold_action (GtkGestureLongPress *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkWidget *plane) { gtk_widget_activate_action (plane, @@ -257,10 +257,10 @@ hold_action (GtkGestureLongPress *gesture, static void sv_move (GtkColorPlane *plane, - gdouble ds, - gdouble dv) + double ds, + double dv) { - gdouble s, v; + double s, v; s = gtk_adjustment_get_value (plane->priv->s_adj); v = gtk_adjustment_get_value (plane->priv->v_adj); @@ -319,7 +319,7 @@ key_controller_key_pressed (GtkEventControllerKey *controller, GtkWidget *widget) { GtkColorPlane *plane = GTK_COLOR_PLANE (widget); - gdouble step; + double step; if ((state & GDK_ALT_MASK) != 0) step = 0.1; @@ -346,8 +346,8 @@ key_controller_key_pressed (GtkEventControllerKey *controller, static void plane_drag_gesture_begin (GtkGestureDrag *gesture, - gdouble start_x, - gdouble start_y, + double start_x, + double start_y, GtkWidget *plane) { guint button; @@ -375,11 +375,11 @@ plane_drag_gesture_begin (GtkGestureDrag *gesture, static void plane_drag_gesture_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkColorPlane *plane) { - gdouble start_x, start_y; + double start_x, start_y; gtk_gesture_drag_get_start_point (GTK_GESTURE_DRAG (gesture), &start_x, &start_y); @@ -388,8 +388,8 @@ plane_drag_gesture_update (GtkGestureDrag *gesture, static void plane_drag_gesture_end (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkColorPlane *plane) { set_cross_cursor (GTK_WIDGET (plane), FALSE); diff --git a/gtk/gtkcolorscale.c b/gtk/gtkcolorscale.c index 496a96a3ce..ec5d2c5367 100644 --- a/gtk/gtkcolorscale.c +++ b/gtk/gtkcolorscale.c @@ -50,8 +50,8 @@ enum }; static void hold_action (GtkGestureLongPress *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkWidget *scale); static void click_action (GtkGestureClick *gesture, @@ -87,9 +87,9 @@ gtk_color_scale_snapshot_trough (GtkColorScale *scale, int stride; GBytes *bytes; guchar *data, *p; - gdouble h; + double h; float r, g, b; - gdouble f; + double f; int hue_x, hue_y; stride = width * 3; @@ -260,8 +260,8 @@ scale_set_property (GObject *object, static void hold_action (GtkGestureLongPress *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkWidget *scale) { gtk_widget_activate_action (scale, diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c index ad6ef4deb6..475067a6b9 100644 --- a/gtk/gtkcolorswatch.c +++ b/gtk/gtkcolorswatch.c @@ -59,7 +59,7 @@ struct _GtkColorSwatch GtkWidget parent_instance; GdkRGBA color; - gdouble radius[4]; + double radius[4]; char *icon; guint has_color : 1; guint use_alpha : 1; @@ -270,8 +270,8 @@ swatch_primary_action (GtkColorSwatch *swatch) static void hold_action (GtkGestureLongPress *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkColorSwatch *swatch) { do_popup (swatch); @@ -281,8 +281,8 @@ hold_action (GtkGestureLongPress *gesture, static void tap_action (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkColorSwatch *swatch) { guint button; diff --git a/gtk/gtkcolorswatchprivate.h b/gtk/gtkcolorswatchprivate.h index fa8bac76f6..87031a6b32 100644 --- a/gtk/gtkcolorswatchprivate.h +++ b/gtk/gtkcolorswatchprivate.h @@ -36,10 +36,10 @@ void gtk_color_swatch_set_rgba (GtkColorSwatch *swatch, gboolean gtk_color_swatch_get_rgba (GtkColorSwatch *swatch, GdkRGBA *color); void gtk_color_swatch_set_hsva (GtkColorSwatch *swatch, - gdouble h, - gdouble s, - gdouble v, - gdouble a); + double h, + double s, + double v, + double a); void gtk_color_swatch_set_can_drop (GtkColorSwatch *swatch, gboolean can_drop); void gtk_color_swatch_set_icon (GtkColorSwatch *swatch, diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 0874726b17..6c66f0a521 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -235,8 +235,8 @@ static void gtk_combo_box_real_popup (GtkComboBox *combo_box) static gboolean gtk_combo_box_real_popdown (GtkComboBox *combo_box); static gboolean gtk_combo_box_scroll_controller_scroll (GtkEventControllerScroll *scroll, - gdouble dx, - gdouble dy, + double dx, + double dy, GtkComboBox *combo_box); /* listening to the model */ @@ -522,7 +522,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass) * { * GtkTreeIter iter; * GtkTreeModel model; - * gdouble value; + * double value; * * model = gtk_combo_box_get_model (combo); * @@ -1664,8 +1664,8 @@ tree_first (GtkComboBox *combo, static gboolean gtk_combo_box_scroll_controller_scroll (GtkEventControllerScroll *scroll, - gdouble dx, - gdouble dy, + double dx, + double dy, GtkComboBox *combo_box) { GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box); diff --git a/gtk/gtkcssboxesimplprivate.h b/gtk/gtkcssboxesimplprivate.h index a250de6212..01b046ee4e 100644 --- a/gtk/gtkcssboxesimplprivate.h +++ b/gtk/gtkcssboxesimplprivate.h @@ -311,8 +311,8 @@ gtk_css_boxes_get_outline_rect (GtkCssBoxes *boxes) static inline void gtk_css_boxes_clamp_border_radius (GskRoundedRect *box) { - gdouble factor = 1.0; - gdouble corners; + double factor = 1.0; + double corners; corners = box->corner[GSK_CORNER_TOP_LEFT].width + box->corner[GSK_CORNER_TOP_RIGHT].width; if (corners != 0) diff --git a/gtk/gtkcsscolorvalue.c b/gtk/gtkcsscolorvalue.c index cf38ca11fd..cbd8988c01 100644 --- a/gtk/gtkcsscolorvalue.c +++ b/gtk/gtkcsscolorvalue.c @@ -49,14 +49,14 @@ struct _GtkCssValue struct { GtkCssValue *color; - gdouble factor; + double factor; } shade, alpha; struct { GtkCssValue *color1; GtkCssValue *color2; - gdouble factor; + double factor; } mix; } sym_col; }; @@ -537,7 +537,7 @@ _gtk_css_color_value_new_name (const char *name) GtkCssValue * _gtk_css_color_value_new_shade (GtkCssValue *color, - gdouble factor) + double factor) { GtkCssValue *value; @@ -562,7 +562,7 @@ _gtk_css_color_value_new_shade (GtkCssValue *color, GtkCssValue * _gtk_css_color_value_new_alpha (GtkCssValue *color, - gdouble factor) + double factor) { GtkCssValue *value; @@ -588,7 +588,7 @@ _gtk_css_color_value_new_alpha (GtkCssValue *color, GtkCssValue * _gtk_css_color_value_new_mix (GtkCssValue *color1, GtkCssValue *color2, - gdouble factor) + double factor) { GtkCssValue *value; diff --git a/gtk/gtkcsscolorvalueprivate.h b/gtk/gtkcsscolorvalueprivate.h index 793b3d8978..49387d2c43 100644 --- a/gtk/gtkcsscolorvalueprivate.h +++ b/gtk/gtkcsscolorvalueprivate.h @@ -29,12 +29,12 @@ GtkCssValue * gtk_css_color_value_new_white (void) G_GNUC_PURE; GtkCssValue * _gtk_css_color_value_new_literal (const GdkRGBA *color) G_GNUC_PURE; GtkCssValue * _gtk_css_color_value_new_name (const char *name) G_GNUC_PURE; GtkCssValue * _gtk_css_color_value_new_shade (GtkCssValue *color, - gdouble factor) G_GNUC_PURE; + double factor) G_GNUC_PURE; GtkCssValue * _gtk_css_color_value_new_alpha (GtkCssValue *color, - gdouble factor) G_GNUC_PURE; + double factor) G_GNUC_PURE; GtkCssValue * _gtk_css_color_value_new_mix (GtkCssValue *color1, GtkCssValue *color2, - gdouble factor) G_GNUC_PURE; + double factor) G_GNUC_PURE; GtkCssValue * _gtk_css_color_value_new_current_color (void) G_GNUC_PURE; gboolean gtk_css_color_value_can_parse (GtkCssParser *parser); diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c index 4bd995546f..6940fdf12a 100644 --- a/gtk/gtkcustompaperunixdialog.c +++ b/gtk/gtkcustompaperunixdialog.c @@ -490,7 +490,7 @@ unit_widget_get (GtkWidget *unit_widget) static void unit_widget_set (GtkWidget *unit_widget, - gdouble value) + double value) { UnitWidget *data; diff --git a/gtk/gtkdragsource.c b/gtk/gtkdragsource.c index 73787607f4..35d107d996 100644 --- a/gtk/gtkdragsource.c +++ b/gtk/gtkdragsource.c @@ -86,8 +86,8 @@ struct _GtkDragSource int hot_x; int hot_y; - gdouble start_x; - gdouble start_y; + double start_x; + double start_y; GdkDrag *drag; }; diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 2f228182dd..d95c5f3b72 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -1504,8 +1504,8 @@ get_icon_position_from_controller (GtkEntry *entry, static void icon_pressed_cb (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkEntry *entry) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); @@ -1524,8 +1524,8 @@ icon_pressed_cb (GtkGestureClick *gesture, static void icon_released_cb (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkEntry *entry) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); @@ -1541,12 +1541,12 @@ icon_released_cb (GtkGestureClick *gesture, static void icon_drag_update_cb (GtkGestureDrag *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkEntry *entry) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); - gdouble start_x, start_y; + double start_x, start_y; GtkEntryIconPosition pos; EntryIconInfo *icon_info; @@ -3254,10 +3254,10 @@ gtk_entry_ensure_progress_widget (GtkEntry *entry) */ void gtk_entry_set_progress_fraction (GtkEntry *entry, - gdouble fraction) + double fraction) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); - gdouble old_fraction; + double old_fraction; g_return_if_fail (GTK_IS_ENTRY (entry)); @@ -3283,7 +3283,7 @@ gtk_entry_set_progress_fraction (GtkEntry *entry, * * Returns: a fraction from 0.0 to 1.0 */ -gdouble +double gtk_entry_get_progress_fraction (GtkEntry *entry) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); @@ -3306,7 +3306,7 @@ gtk_entry_get_progress_fraction (GtkEntry *entry) */ void gtk_entry_set_progress_pulse_step (GtkEntry *entry, - gdouble fraction) + double fraction) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); @@ -3331,7 +3331,7 @@ gtk_entry_set_progress_pulse_step (GtkEntry *entry, * * Returns: a fraction from 0.0 to 1.0 */ -gdouble +double gtk_entry_get_progress_pulse_step (GtkEntry *entry) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h index 66f8c67f00..c256fb24bf 100644 --- a/gtk/gtkentry.h +++ b/gtk/gtkentry.h @@ -167,15 +167,15 @@ GtkEntryCompletion *gtk_entry_get_completion (GtkEntry *entry); */ GDK_AVAILABLE_IN_ALL void gtk_entry_set_progress_fraction (GtkEntry *entry, - gdouble fraction); + double fraction); GDK_AVAILABLE_IN_ALL -gdouble gtk_entry_get_progress_fraction (GtkEntry *entry); +double gtk_entry_get_progress_fraction (GtkEntry *entry); GDK_AVAILABLE_IN_ALL void gtk_entry_set_progress_pulse_step (GtkEntry *entry, - gdouble fraction); + double fraction); GDK_AVAILABLE_IN_ALL -gdouble gtk_entry_get_progress_pulse_step (GtkEntry *entry); +double gtk_entry_get_progress_pulse_step (GtkEntry *entry); GDK_AVAILABLE_IN_ALL void gtk_entry_progress_pulse (GtkEntry *entry); diff --git a/gtk/gtkeventcontrollerscroll.c b/gtk/gtkeventcontrollerscroll.c index 5f4084a38f..b466bb74ee 100644 --- a/gtk/gtkeventcontrollerscroll.c +++ b/gtk/gtkeventcontrollerscroll.c @@ -70,8 +70,8 @@ typedef struct { - gdouble dx; - gdouble dy; + double dx; + double dy; guint32 evtime; } ScrollHistoryElem; @@ -82,8 +82,8 @@ struct _GtkEventControllerScroll GArray *scroll_history; /* For discrete event coalescing */ - gdouble cur_dx; - gdouble cur_dy; + double cur_dx; + double cur_dy; guint active : 1; }; @@ -115,8 +115,8 @@ G_DEFINE_TYPE (GtkEventControllerScroll, gtk_event_controller_scroll, static void scroll_history_push (GtkEventControllerScroll *scroll, - gdouble delta_x, - gdouble delta_y, + double delta_x, + double delta_y, guint32 evtime) { ScrollHistoryElem new_item; @@ -153,10 +153,10 @@ scroll_history_reset (GtkEventControllerScroll *scroll) static void scroll_history_finish (GtkEventControllerScroll *scroll, - gdouble *velocity_x, - gdouble *velocity_y) + double *velocity_x, + double *velocity_y) { - gdouble accum_dx = 0, accum_dy = 0; + double accum_dx = 0, accum_dy = 0; guint32 first = 0, last = 0; guint i; @@ -244,7 +244,7 @@ gtk_event_controller_scroll_handle_event (GtkEventController *controller, { GtkEventControllerScroll *scroll = GTK_EVENT_CONTROLLER_SCROLL (controller); GdkScrollDirection direction = GDK_SCROLL_SMOOTH; - gdouble dx = 0, dy = 0; + double dx = 0, dy = 0; gboolean handled = GDK_EVENT_PROPAGATE; if (gdk_event_get_event_type (event) != GDK_SCROLL) @@ -342,7 +342,7 @@ gtk_event_controller_scroll_handle_event (GtkEventController *controller, if (scroll->flags & GTK_EVENT_CONTROLLER_SCROLL_KINETIC) { - gdouble vel_x, vel_y; + double vel_x, vel_y; scroll_history_finish (scroll, &vel_x, &vel_y); g_signal_emit (controller, signals[DECELERATE], 0, vel_x, vel_y); diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index b50f0a477d..a5864d5f47 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -212,8 +212,8 @@ static void gtk_expander_measure (GtkWidget *widget, /* Gestures */ static void gesture_click_released_cb (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkExpander *expander); G_DEFINE_TYPE_WITH_CODE (GtkExpander, gtk_expander, GTK_TYPE_WIDGET, @@ -566,8 +566,8 @@ gtk_expander_size_allocate (GtkWidget *widget, static void gesture_click_released_cb (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkExpander *expander) { gtk_widget_activate (GTK_WIDGET (expander)); diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index e0c817f820..44d6e85653 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -1914,8 +1914,8 @@ file_list_update_popover (GtkFileChooserWidget *impl) static void file_list_show_popover (GtkFileChooserWidget *impl, - gdouble x, - gdouble y) + double x, + double y) { GdkRectangle rect; GtkTreeSelection *selection; @@ -2062,8 +2062,8 @@ click_cb (GtkGesture *gesture, static void long_press_cb (GtkGesture *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkFileChooserWidget *impl) { file_list_show_popover (impl, x, y); diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c index 75df8e2a0f..169e18d4a7 100644 --- a/gtk/gtkflowbox.c +++ b/gtk/gtkflowbox.c @@ -2600,9 +2600,9 @@ autoscroll_cb (GtkWidget *widget, GtkFlowBox *box = GTK_FLOW_BOX (data); GtkFlowBoxPrivate *priv = BOX_PRIV (box); GtkAdjustment *adjustment; - gdouble factor; - gdouble increment; - gdouble value; + double factor; + double increment; + double value; if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) adjustment = priv->vadjustment; @@ -2649,7 +2649,7 @@ autoscroll_cb (GtkWidget *widget, if (priv->rubberband_select) { GdkEventSequence *sequence; - gdouble x, y; + double x, y; GtkFlowBoxChild *child; sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (priv->drag_gesture)); @@ -2744,12 +2744,12 @@ update_autoscroll_mode (GtkFlowBox *box, static void gtk_flow_box_drag_gesture_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkFlowBox *box) { GtkFlowBoxPrivate *priv = BOX_PRIV (box); - gdouble start_x, start_y; + double start_x, start_y; GtkFlowBoxChild *child; GtkCssNode *widget_node; @@ -2796,8 +2796,8 @@ gtk_flow_box_drag_gesture_update (GtkGestureDrag *gesture, static void gtk_flow_box_click_gesture_pressed (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkFlowBox *box) { GtkFlowBoxPrivate *priv = BOX_PRIV (box); @@ -2825,8 +2825,8 @@ gtk_flow_box_click_gesture_pressed (GtkGestureClick *gesture, static void gtk_flow_box_click_unpaired_release (GtkGestureClick *gesture, - gdouble x, - gdouble y, + double x, + double y, guint button, GdkEventSequence *sequence, GtkFlowBox *box) @@ -2846,8 +2846,8 @@ gtk_flow_box_click_unpaired_release (GtkGestureClick *gesture, static void gtk_flow_box_click_gesture_released (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkFlowBox *box) { GtkFlowBoxPrivate *priv = BOX_PRIV (box); @@ -2902,8 +2902,8 @@ gtk_flow_box_click_gesture_stopped (GtkGestureClick *gesture, static void gtk_flow_box_drag_gesture_begin (GtkGestureDrag *gesture, - gdouble start_x, - gdouble start_y, + double start_x, + double start_y, GtkWidget *widget) { GtkFlowBoxPrivate *priv = BOX_PRIV (widget); @@ -2943,8 +2943,8 @@ gtk_flow_box_stop_rubberband (GtkFlowBox *box) static void gtk_flow_box_drag_gesture_end (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkFlowBox *box) { GtkFlowBoxPrivate *priv = BOX_PRIV (box); diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c index f255849f77..e56b13ad42 100644 --- a/gtk/gtkfontchooserwidget.c +++ b/gtk/gtkfontchooserwidget.c @@ -293,7 +293,7 @@ size_change_cb (GtkAdjustment *adjustment, { GtkFontChooserWidget *fontchooser = user_data; PangoFontDescription *font_desc; - gdouble size = gtk_adjustment_get_value (adjustment); + double size = gtk_adjustment_get_value (adjustment); font_desc = pango_font_description_new (); if (pango_font_description_get_size_is_absolute (fontchooser->font_desc)) @@ -310,7 +310,7 @@ output_cb (GtkSpinButton *spin, { GtkAdjustment *adjustment; char *text; - gdouble value; + double value; adjustment = gtk_spin_button_get_adjustment (spin); value = gtk_adjustment_get_value (adjustment); @@ -328,7 +328,7 @@ gtk_font_chooser_widget_update_marks (GtkFontChooserWidget *self) const int *sizes; int *font_sizes; int i, n_sizes; - gdouble value, spin_value; + double value, spin_value; gpointer item; item = gtk_single_selection_get_selected_item (self->selection); @@ -376,11 +376,11 @@ gtk_font_chooser_widget_update_marks (GtkFontChooserWidget *self) spin_value = gtk_adjustment_get_value (spin_adj); if (spin_value < sizes[0]) - value = (gdouble) sizes[0]; + value = (double) sizes[0]; else if (spin_value > sizes[n_sizes - 1]) - value = (gdouble)sizes[n_sizes - 1]; + value = (double)sizes[n_sizes - 1]; else - value = (gdouble)spin_value; + value = (double)spin_value; /* ensure clamping doesn't callback into font resizing code */ g_signal_handlers_block_by_func (adj, size_change_cb, self); @@ -812,9 +812,9 @@ gtk_font_chooser_widget_init (GtkFontChooserWidget *self) /* Set the upper values of the spin/scale with G_MAXINT / PANGO_SCALE */ gtk_spin_button_set_range (GTK_SPIN_BUTTON (self->size_spin), - 1.0, (gdouble)(G_MAXINT / PANGO_SCALE)); + 1.0, (double)(G_MAXINT / PANGO_SCALE)); gtk_adjustment_set_upper (gtk_range_get_adjustment (GTK_RANGE (self->size_slider)), - (gdouble)(G_MAXINT / PANGO_SCALE)); + (double)(G_MAXINT / PANGO_SCALE)); self->tweak_action = G_ACTION (g_simple_action_new_stateful ("tweak", NULL, g_variant_new_boolean (FALSE))); g_signal_connect (self->tweak_action, "change-state", G_CALLBACK (change_tweak), self); diff --git a/gtk/gtkgesture.c b/gtk/gtkgesture.c index a30365d15b..84944da8e3 100644 --- a/gtk/gtkgesture.c +++ b/gtk/gtkgesture.c @@ -146,12 +146,12 @@ struct _PointData { GdkEvent *event; GtkWidget *target; - gdouble widget_x; - gdouble widget_y; + double widget_x; + double widget_y; /* Acummulators for touchpad events */ - gdouble accum_dx; - gdouble accum_dy; + double accum_dx; + double accum_dy; guint press_handled : 1; guint state : 2; @@ -1209,8 +1209,8 @@ gtk_gesture_get_last_target (GtkGesture *gesture, gboolean gtk_gesture_get_point (GtkGesture *gesture, GdkEventSequence *sequence, - gdouble *x, - gdouble *y) + double *x, + double *y) { GtkGesturePrivate *priv; PointData *data; @@ -1276,7 +1276,7 @@ gtk_gesture_get_bounding_box (GtkGesture *gesture, GdkRectangle *rect) { GtkGesturePrivate *priv; - gdouble x1, y1, x2, y2; + double x1, y1, x2, y2; GHashTableIter iter; guint n_points = 0; PointData *data; @@ -1336,8 +1336,8 @@ gtk_gesture_get_bounding_box (GtkGesture *gesture, **/ gboolean gtk_gesture_get_bounding_box_center (GtkGesture *gesture, - gdouble *x, - gdouble *y) + double *x, + double *y) { GdkEvent *last_event; GdkRectangle rect; diff --git a/gtk/gtkgesture.h b/gtk/gtkgesture.h index 026d37023f..9f7f454e6e 100644 --- a/gtk/gtkgesture.h +++ b/gtk/gtkgesture.h @@ -73,16 +73,16 @@ GdkEvent * GDK_AVAILABLE_IN_ALL gboolean gtk_gesture_get_point (GtkGesture *gesture, GdkEventSequence *sequence, - gdouble *x, - gdouble *y); + double *x, + double *y); GDK_AVAILABLE_IN_ALL gboolean gtk_gesture_get_bounding_box (GtkGesture *gesture, GdkRectangle *rect); GDK_AVAILABLE_IN_ALL gboolean gtk_gesture_get_bounding_box_center (GtkGesture *gesture, - gdouble *x, - gdouble *y); + double *x, + double *y); GDK_AVAILABLE_IN_ALL gboolean gtk_gesture_is_active (GtkGesture *gesture); diff --git a/gtk/gtkgestureclick.c b/gtk/gtkgestureclick.c index 48968e4ab8..15039ab767 100644 --- a/gtk/gtkgestureclick.c +++ b/gtk/gtkgestureclick.c @@ -47,8 +47,8 @@ typedef struct _GtkGestureClickPrivate GtkGestureClickPrivate; struct _GtkGestureClickPrivate { GdkDevice *current_device; - gdouble initial_press_x; - gdouble initial_press_y; + double initial_press_x; + double initial_press_y; guint double_click_timeout_id; guint n_presses; guint n_release; @@ -193,7 +193,7 @@ gtk_gesture_click_begin (GtkGesture *gesture, GdkEvent *event; GdkEventType event_type; GdkDevice *device; - gdouble x, y; + double x, y; if (!gtk_gesture_handles_sequence (gesture, sequence)) return; @@ -250,7 +250,7 @@ gtk_gesture_click_update (GtkGesture *gesture, { GtkGestureClick *click; GdkEventSequence *current; - gdouble x, y; + double x, y; click = GTK_GESTURE_CLICK (gesture); current = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture)); @@ -267,7 +267,7 @@ gtk_gesture_click_end (GtkGesture *gesture, GtkGestureClick *click; GtkGestureClickPrivate *priv; GdkEventSequence *current; - gdouble x, y; + double x, y; gboolean interpreted; GtkEventSequenceState state; diff --git a/gtk/gtkgestureclickprivate.h b/gtk/gtkgestureclickprivate.h index 64d04f780f..87d7da635e 100644 --- a/gtk/gtkgestureclickprivate.h +++ b/gtk/gtkgestureclickprivate.h @@ -33,12 +33,12 @@ struct _GtkGestureClickClass void (* pressed) (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y); + double x, + double y); void (* released) (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y); + double x, + double y); void (* stopped) (GtkGestureClick *gesture); /*<private>*/ diff --git a/gtk/gtkgesturedrag.c b/gtk/gtkgesturedrag.c index be03a7a291..f0939136bb 100644 --- a/gtk/gtkgesturedrag.c +++ b/gtk/gtkgesturedrag.c @@ -41,10 +41,10 @@ typedef struct _EventData EventData; struct _GtkGestureDragPrivate { - gdouble start_x; - gdouble start_y; - gdouble last_x; - gdouble last_y; + double start_x; + double start_y; + double last_x; + double last_y; }; enum { @@ -102,7 +102,7 @@ gtk_gesture_drag_update (GtkGesture *gesture, GdkEventSequence *sequence) { GtkGestureDragPrivate *priv; - gdouble x, y; + double x, y; priv = gtk_gesture_drag_get_instance_private (GTK_GESTURE_DRAG (gesture)); gtk_gesture_get_point (gesture, sequence, &priv->last_x, &priv->last_y); @@ -118,7 +118,7 @@ gtk_gesture_drag_end (GtkGesture *gesture, { GtkGestureDragPrivate *priv; GdkEventSequence *current; - gdouble x, y; + double x, y; current = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture)); @@ -234,8 +234,8 @@ gtk_gesture_drag_new (void) **/ gboolean gtk_gesture_drag_get_start_point (GtkGestureDrag *gesture, - gdouble *x, - gdouble *y) + double *x, + double *y) { GtkGestureDragPrivate *priv; GdkEventSequence *sequence; @@ -272,8 +272,8 @@ gtk_gesture_drag_get_start_point (GtkGestureDrag *gesture, **/ gboolean gtk_gesture_drag_get_offset (GtkGestureDrag *gesture, - gdouble *x, - gdouble *y) + double *x, + double *y) { GtkGestureDragPrivate *priv; GdkEventSequence *sequence; diff --git a/gtk/gtkgesturedrag.h b/gtk/gtkgesturedrag.h index 2493e65de4..fca25d1802 100644 --- a/gtk/gtkgesturedrag.h +++ b/gtk/gtkgesturedrag.h @@ -46,12 +46,12 @@ GtkGesture * gtk_gesture_drag_new (void); GDK_AVAILABLE_IN_ALL gboolean gtk_gesture_drag_get_start_point (GtkGestureDrag *gesture, - gdouble *x, - gdouble *y); + double *x, + double *y); GDK_AVAILABLE_IN_ALL gboolean gtk_gesture_drag_get_offset (GtkGestureDrag *gesture, - gdouble *x, - gdouble *y); + double *x, + double *y); G_END_DECLS diff --git a/gtk/gtkgesturedragprivate.h b/gtk/gtkgesturedragprivate.h index 63edc7e265..f29eaeb78b 100644 --- a/gtk/gtkgesturedragprivate.h +++ b/gtk/gtkgesturedragprivate.h @@ -32,14 +32,14 @@ struct _GtkGestureDragClass GtkGestureSingleClass parent_class; void (* drag_begin) (GtkGestureDrag *gesture, - gdouble start_x, - gdouble start_y); + double start_x, + double start_y); void (* drag_update) (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y); + double offset_x, + double offset_y); void (* drag_end) (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y); + double offset_x, + double offset_y); /*<private>*/ gpointer padding[10]; }; diff --git a/gtk/gtkgesturelongpress.c b/gtk/gtkgesturelongpress.c index 777debc9aa..06e254417b 100644 --- a/gtk/gtkgesturelongpress.c +++ b/gtk/gtkgesturelongpress.c @@ -56,10 +56,10 @@ enum { struct _GtkGestureLongPressPrivate { - gdouble initial_x; - gdouble initial_y; + double initial_x; + double initial_y; - gdouble delay_factor; + double delay_factor; guint timeout_id; guint delay; guint cancelled : 1; @@ -98,7 +98,7 @@ _gtk_gesture_long_press_timeout (gpointer user_data) GtkGestureLongPress *gesture = user_data; GtkGestureLongPressPrivate *priv; GdkEventSequence *sequence; - gdouble x, y; + double x, y; priv = gtk_gesture_long_press_get_instance_private (gesture); sequence = gtk_gesture_get_last_updated_sequence (GTK_GESTURE (gesture)); @@ -153,7 +153,7 @@ gtk_gesture_long_press_update (GtkGesture *gesture, { GtkGestureLongPressPrivate *priv; GtkWidget *widget; - gdouble x, y; + double x, y; widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)); priv = gtk_gesture_long_press_get_instance_private (GTK_GESTURE_LONG_PRESS (gesture)); diff --git a/gtk/gtkgesturelongpressprivate.h b/gtk/gtkgesturelongpressprivate.h index 5b9aa88f4c..67dc4ef985 100644 --- a/gtk/gtkgesturelongpressprivate.h +++ b/gtk/gtkgesturelongpressprivate.h @@ -33,8 +33,8 @@ struct _GtkGestureLongPressClass GtkGestureSingleClass parent_class; void (* pressed) (GtkGestureLongPress *gesture, - gdouble x, - gdouble y); + double x, + double y); void (* cancelled) (GtkGestureLongPress *gesture); /*< private >*/ diff --git a/gtk/gtkgesturepan.c b/gtk/gtkgesturepan.c index fa656084c1..32c223fee5 100644 --- a/gtk/gtkgesturepan.c +++ b/gtk/gtkgesturepan.c @@ -105,8 +105,8 @@ gtk_gesture_pan_set_property (GObject *object, } static void -direction_from_offset (gdouble offset_x, - gdouble offset_y, +direction_from_offset (double offset_x, + double offset_y, GtkOrientation orientation, GtkPanDirection *direction) { @@ -130,11 +130,11 @@ direction_from_offset (gdouble offset_x, static gboolean guess_direction (GtkGesturePan *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkPanDirection *direction) { - gdouble abs_x, abs_y; + double abs_x, abs_y; abs_x = ABS (offset_x); abs_y = ABS (offset_y); @@ -169,13 +169,13 @@ check_orientation_matches (GtkGesturePan *gesture, static void gtk_gesture_pan_drag_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y) + double offset_x, + double offset_y) { GtkGesturePanPrivate *priv; GtkPanDirection direction; GtkGesturePan *pan; - gdouble offset; + double offset; pan = GTK_GESTURE_PAN (gesture); priv = gtk_gesture_pan_get_instance_private (pan); @@ -204,8 +204,8 @@ gtk_gesture_pan_drag_update (GtkGestureDrag *gesture, static void gtk_gesture_pan_drag_end (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y) + double offset_x, + double offset_y) { GtkGesturePanPrivate *priv; diff --git a/gtk/gtkgesturepanprivate.h b/gtk/gtkgesturepanprivate.h index 7090caa4f2..723c3f2696 100644 --- a/gtk/gtkgesturepanprivate.h +++ b/gtk/gtkgesturepanprivate.h @@ -33,7 +33,7 @@ struct _GtkGesturePanClass void (* pan) (GtkGesturePan *gesture, GtkPanDirection direction, - gdouble offset); + double offset); /*< private >*/ gpointer padding[10]; diff --git a/gtk/gtkgesturerotate.c b/gtk/gtkgesturerotate.c index 5498244d77..0ee3dd15a1 100644 --- a/gtk/gtkgesturerotate.c +++ b/gtk/gtkgesturerotate.c @@ -45,8 +45,8 @@ enum { struct _GtkGestureRotatePrivate { - gdouble initial_angle; - gdouble accum_touchpad_angle; + double initial_angle; + double accum_touchpad_angle; }; static guint signals[LAST_SIGNAL] = { 0 }; @@ -75,13 +75,13 @@ gtk_gesture_rotate_constructor (GType type, static gboolean _gtk_gesture_rotate_get_angle (GtkGestureRotate *rotate, - gdouble *angle) + double *angle) { GtkGestureRotatePrivate *priv; GdkEvent *last_event; - gdouble x1, y1, x2, y2; + double x1, y1, x2, y2; GtkGesture *gesture; - gdouble dx, dy; + double dx, dy; GList *sequences = NULL; GdkTouchpadGesturePhase phase; gboolean retval = FALSE; @@ -137,7 +137,7 @@ static gboolean _gtk_gesture_rotate_check_emit (GtkGestureRotate *gesture) { GtkGestureRotatePrivate *priv; - gdouble angle, delta; + double angle, delta; if (!_gtk_gesture_rotate_get_angle (gesture, &angle)) return FALSE; @@ -279,11 +279,11 @@ gtk_gesture_rotate_new (void) * * Returns: the angle delta in radians **/ -gdouble +double gtk_gesture_rotate_get_angle_delta (GtkGestureRotate *gesture) { GtkGestureRotatePrivate *priv; - gdouble angle; + double angle; g_return_val_if_fail (GTK_IS_GESTURE_ROTATE (gesture), 0.0); diff --git a/gtk/gtkgesturerotate.h b/gtk/gtkgesturerotate.h index 1c7529bd4a..248eb07893 100644 --- a/gtk/gtkgesturerotate.h +++ b/gtk/gtkgesturerotate.h @@ -46,7 +46,7 @@ GDK_AVAILABLE_IN_ALL GtkGesture * gtk_gesture_rotate_new (void); GDK_AVAILABLE_IN_ALL -gdouble gtk_gesture_rotate_get_angle_delta (GtkGestureRotate *gesture); +double gtk_gesture_rotate_get_angle_delta (GtkGestureRotate *gesture); G_END_DECLS diff --git a/gtk/gtkgesturerotateprivate.h b/gtk/gtkgesturerotateprivate.h index 12c98705ad..c3805a43b1 100644 --- a/gtk/gtkgesturerotateprivate.h +++ b/gtk/gtkgesturerotateprivate.h @@ -33,8 +33,8 @@ struct _GtkGestureRotateClass GtkGestureClass parent_class; void (* angle_changed) (GtkGestureRotate *gesture, - gdouble angle, - gdouble delta); + double angle, + double delta); /*< private >*/ gpointer padding[10]; }; diff --git a/gtk/gtkgesturestylus.c b/gtk/gtkgesturestylus.c index 0db2bb7837..2341fb5a9a 100644 --- a/gtk/gtkgesturestylus.c +++ b/gtk/gtkgesturestylus.c @@ -188,7 +188,7 @@ gesture_get_current_event (GtkGestureStylus *gesture) gboolean gtk_gesture_stylus_get_axis (GtkGestureStylus *gesture, GdkAxisUse axis, - gdouble *value) + double *value) { GdkEvent *event; @@ -219,7 +219,7 @@ gtk_gesture_stylus_get_axis (GtkGestureStylus *gesture, gboolean gtk_gesture_stylus_get_axes (GtkGestureStylus *gesture, GdkAxisUse axes[], - gdouble **values) + double **values) { GdkEvent *event; GArray *array; @@ -232,11 +232,11 @@ gtk_gesture_stylus_get_axes (GtkGestureStylus *gesture, if (!event) return FALSE; - array = g_array_new (TRUE, FALSE, sizeof (gdouble)); + array = g_array_new (TRUE, FALSE, sizeof (double)); while (axes[i] != GDK_AXIS_IGNORE) { - gdouble value; + double value; if (axes[i] >= GDK_AXIS_LAST) { @@ -252,7 +252,7 @@ gtk_gesture_stylus_get_axes (GtkGestureStylus *gesture, i++; } - *values = (gdouble *) g_array_free (array, FALSE); + *values = (double *) g_array_free (array, FALSE); return TRUE; } diff --git a/gtk/gtkgesturestylus.h b/gtk/gtkgesturestylus.h index cb4c13efb6..df31f5277a 100644 --- a/gtk/gtkgesturestylus.h +++ b/gtk/gtkgesturestylus.h @@ -46,11 +46,11 @@ GtkGesture * gtk_gesture_stylus_new (void); GDK_AVAILABLE_IN_ALL gboolean gtk_gesture_stylus_get_axis (GtkGestureStylus *gesture, GdkAxisUse axis, - gdouble *value); + double *value); GDK_AVAILABLE_IN_ALL gboolean gtk_gesture_stylus_get_axes (GtkGestureStylus *gesture, GdkAxisUse axes[], - gdouble **values); + double **values); GDK_AVAILABLE_IN_ALL gboolean gtk_gesture_stylus_get_backlog (GtkGestureStylus *gesture, GdkTimeCoord **backlog, diff --git a/gtk/gtkgesturestylusprivate.h b/gtk/gtkgesturestylusprivate.h index 9869b528a5..c37e638339 100644 --- a/gtk/gtkgesturestylusprivate.h +++ b/gtk/gtkgesturestylusprivate.h @@ -32,17 +32,17 @@ struct _GtkGestureStylusClass GtkGestureSingleClass parent_class; void (*proximity) (GtkGestureStylus *gesture, - gdouble x, - gdouble y); + double x, + double y); void (*down) (GtkGestureStylus *gesture, - gdouble x, - gdouble y); + double x, + double y); void (*motion) (GtkGestureStylus *gesture, - gdouble x, - gdouble y); + double x, + double y); void (*up) (GtkGestureStylus *gesture, - gdouble x, - gdouble y); + double x, + double y); /*< private >*/ gpointer padding[10]; diff --git a/gtk/gtkgestureswipe.c b/gtk/gtkgestureswipe.c index 4105384004..59c7aba807 100644 --- a/gtk/gtkgestureswipe.c +++ b/gtk/gtkgestureswipe.c @@ -136,7 +136,7 @@ gtk_gesture_swipe_update (GtkGesture *gesture, GtkGestureSwipe *swipe = GTK_GESTURE_SWIPE (gesture); GtkGestureSwipePrivate *priv; EventData new; - gdouble x, y; + double x, y; priv = gtk_gesture_swipe_get_instance_private (swipe); _gtk_gesture_get_last_update_time (gesture, sequence, &new.evtime); @@ -151,14 +151,14 @@ gtk_gesture_swipe_update (GtkGesture *gesture, static void _gtk_gesture_swipe_calculate_velocity (GtkGestureSwipe *gesture, - gdouble *velocity_x, - gdouble *velocity_y) + double *velocity_x, + double *velocity_y) { GtkGestureSwipePrivate *priv; GdkEventSequence *sequence; guint32 evtime, diff_time; EventData *start, *end; - gdouble diff_x, diff_y; + double diff_x, diff_y; priv = gtk_gesture_swipe_get_instance_private (gesture); *velocity_x = *velocity_y = 0; @@ -191,7 +191,7 @@ gtk_gesture_swipe_end (GtkGesture *gesture, { GtkGestureSwipe *swipe = GTK_GESTURE_SWIPE (gesture); GtkGestureSwipePrivate *priv; - gdouble velocity_x, velocity_y; + double velocity_x, velocity_y; GdkEventSequence *seq; seq = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture)); @@ -283,10 +283,10 @@ gtk_gesture_swipe_new (void) **/ gboolean gtk_gesture_swipe_get_velocity (GtkGestureSwipe *gesture, - gdouble *velocity_x, - gdouble *velocity_y) + double *velocity_x, + double *velocity_y) { - gdouble vel_x, vel_y; + double vel_x, vel_y; g_return_val_if_fail (GTK_IS_GESTURE (gesture), FALSE); diff --git a/gtk/gtkgestureswipe.h b/gtk/gtkgestureswipe.h index 330ae7eb69..a85df6c3fc 100644 --- a/gtk/gtkgestureswipe.h +++ b/gtk/gtkgestureswipe.h @@ -47,8 +47,8 @@ GtkGesture * gtk_gesture_swipe_new (void); GDK_AVAILABLE_IN_ALL gboolean gtk_gesture_swipe_get_velocity (GtkGestureSwipe *gesture, - gdouble *velocity_x, - gdouble *velocity_y); + double *velocity_x, + double *velocity_y); G_END_DECLS diff --git a/gtk/gtkgestureswipeprivate.h b/gtk/gtkgestureswipeprivate.h index 660ee3a3a0..6e41f2a691 100644 --- a/gtk/gtkgestureswipeprivate.h +++ b/gtk/gtkgestureswipeprivate.h @@ -33,8 +33,8 @@ struct _GtkGestureSwipeClass GtkGestureSingleClass parent_class; void (* swipe) (GtkGestureSwipe *gesture, - gdouble velocity_x, - gdouble velocity_y); + double velocity_x, + double velocity_y); /*< private >*/ gpointer padding[10]; diff --git a/gtk/gtkgesturezoom.c b/gtk/gtkgesturezoom.c index d706b502f3..20b67c237b 100644 --- a/gtk/gtkgesturezoom.c +++ b/gtk/gtkgesturezoom.c @@ -45,7 +45,7 @@ enum { struct _GtkGestureZoomPrivate { - gdouble initial_distance; + double initial_distance; }; static guint signals[LAST_SIGNAL] = { 0 }; @@ -74,13 +74,13 @@ gtk_gesture_zoom_constructor (GType type, static gboolean _gtk_gesture_zoom_get_distance (GtkGestureZoom *zoom, - gdouble *distance) + double *distance) { GdkEvent *last_event; - gdouble x1, y1, x2, y2; + double x1, y1, x2, y2; GtkGesture *gesture; GList *sequences = NULL; - gdouble dx, dy; + double dx, dy; GdkTouchpadGesturePhase phase; gboolean retval = FALSE; @@ -131,7 +131,7 @@ static gboolean _gtk_gesture_zoom_check_emit (GtkGestureZoom *gesture) { GtkGestureZoomPrivate *priv; - gdouble distance, zoom; + double distance, zoom; if (!_gtk_gesture_zoom_get_distance (gesture, &distance)) return FALSE; @@ -241,11 +241,11 @@ gtk_gesture_zoom_new (void) * * Returns: the scale delta **/ -gdouble +double gtk_gesture_zoom_get_scale_delta (GtkGestureZoom *gesture) { GtkGestureZoomPrivate *priv; - gdouble distance; + double distance; g_return_val_if_fail (GTK_IS_GESTURE_ZOOM (gesture), 1.0); diff --git a/gtk/gtkgesturezoom.h b/gtk/gtkgesturezoom.h index 0a02852c58..8c01affe6d 100644 --- a/gtk/gtkgesturezoom.h +++ b/gtk/gtkgesturezoom.h @@ -46,7 +46,7 @@ GDK_AVAILABLE_IN_ALL GtkGesture * gtk_gesture_zoom_new (void); GDK_AVAILABLE_IN_ALL -gdouble gtk_gesture_zoom_get_scale_delta (GtkGestureZoom *gesture); +double gtk_gesture_zoom_get_scale_delta (GtkGestureZoom *gesture); G_END_DECLS diff --git a/gtk/gtkgesturezoomprivate.h b/gtk/gtkgesturezoomprivate.h index 9935c097a7..3c7e9da331 100644 --- a/gtk/gtkgesturezoomprivate.h +++ b/gtk/gtkgesturezoomprivate.h @@ -33,7 +33,7 @@ struct _GtkGestureZoomClass GtkGestureClass parent_class; void (* scale_changed) (GtkGestureZoom *gesture, - gdouble scale); + double scale); /*< private >*/ gpointer padding[10]; }; diff --git a/gtk/gtkhsla.c b/gtk/gtkhsla.c index 78ccaec19f..abb4aaf689 100644 --- a/gtk/gtkhsla.c +++ b/gtk/gtkhsla.c @@ -43,12 +43,12 @@ void _gtk_hsla_init_from_rgba (GtkHSLA *hsla, const GdkRGBA *rgba) { - gdouble min; - gdouble max; - gdouble red; - gdouble green; - gdouble blue; - gdouble delta; + double min; + double max; + double red; + double green; + double blue; + double delta; g_return_if_fail (hsla != NULL); g_return_if_fail (rgba != NULL); @@ -112,10 +112,10 @@ void _gdk_rgba_init_from_hsla (GdkRGBA *rgba, const GtkHSLA *hsla) { - gdouble hue; - gdouble lightness; - gdouble saturation; - gdouble m1, m2; + double hue; + double lightness; + double saturation; + double m1, m2; lightness = hsla->lightness; saturation = hsla->saturation; diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 58993600c9..c80c43fe22 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -2562,11 +2562,11 @@ gtk_icon_view_set_hadjustment_values (GtkIconView *icon_view) { int width; GtkAdjustment *adj = icon_view->priv->hadjustment; - gdouble old_page_size; - gdouble old_upper; - gdouble old_value; - gdouble new_value; - gdouble new_upper; + double old_page_size; + double old_upper; + double old_value; + double new_value; + double new_upper; width = gtk_widget_get_width (GTK_WIDGET (icon_view)); diff --git a/gtk/gtkimcontextwayland.c b/gtk/gtkimcontextwayland.c index 9b0b48898c..70b46e317f 100644 --- a/gtk/gtkimcontextwayland.c +++ b/gtk/gtkimcontextwayland.c @@ -71,8 +71,8 @@ struct _GtkIMContextWayland GtkWidget *widget; GtkGesture *gesture; - gdouble press_x; - gdouble press_y; + double press_x; + double press_y; struct { char *text; @@ -493,8 +493,8 @@ gtk_im_context_wayland_finalize (GObject *object) static void pressed_cb (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkIMContextWayland *context) { if (n_press == 1) @@ -507,8 +507,8 @@ pressed_cb (GtkGestureClick *gesture, static void released_cb (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkIMContextWayland *context) { GtkIMContextWaylandGlobal *global; diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c index db65bd0926..aa4f6f0726 100644 --- a/gtk/gtkinfobar.c +++ b/gtk/gtkinfobar.c @@ -439,8 +439,8 @@ close_button_clicked_cb (GtkWidget *button, static void click_released_cb (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkInfoBar *info_bar) { if (info_bar->default_response && info_bar->default_response_sensitive) diff --git a/gtk/gtkkineticscrolling.c b/gtk/gtkkineticscrolling.c index 212319b933..830fbe7dae 100644 --- a/gtk/gtkkineticscrolling.c +++ b/gtk/gtkkineticscrolling.c @@ -60,34 +60,34 @@ typedef enum { struct _GtkKineticScrolling { GtkKineticScrollingPhase phase; - gdouble lower; - gdouble upper; - gdouble overshoot_width; - gdouble decel_friction; - gdouble overshoot_friction; - - gdouble c1; - gdouble c2; - gdouble equilibrium_position; - - gdouble t; - gdouble position; - gdouble velocity; + double lower; + double upper; + double overshoot_width; + double decel_friction; + double overshoot_friction; + + double c1; + double c2; + double equilibrium_position; + + double t; + double position; + double velocity; }; static void gtk_kinetic_scrolling_init_overshoot (GtkKineticScrolling *data, - gdouble equilibrium_position, - gdouble initial_position, - gdouble initial_velocity); + double equilibrium_position, + double initial_position, + double initial_velocity); GtkKineticScrolling * -gtk_kinetic_scrolling_new (gdouble lower, - gdouble upper, - gdouble overshoot_width, - gdouble decel_friction, - gdouble overshoot_friction, - gdouble initial_position, - gdouble initial_velocity) +gtk_kinetic_scrolling_new (double lower, + double upper, + double overshoot_width, + double decel_friction, + double overshoot_friction, + double initial_position, + double initial_velocity) { GtkKineticScrolling *data; @@ -131,9 +131,9 @@ gtk_kinetic_scrolling_free (GtkKineticScrolling *kinetic) static void gtk_kinetic_scrolling_init_overshoot (GtkKineticScrolling *data, - gdouble equilibrium_position, - gdouble initial_position, - gdouble initial_velocity) + double equilibrium_position, + double initial_position, + double initial_velocity) { data->phase = GTK_KINETIC_SCROLLING_PHASE_OVERSHOOTING; data->equilibrium_position = equilibrium_position; @@ -144,16 +144,16 @@ gtk_kinetic_scrolling_init_overshoot (GtkKineticScrolling *data, gboolean gtk_kinetic_scrolling_tick (GtkKineticScrolling *data, - gdouble time_delta, - gdouble *position) + double time_delta, + double *position) { switch(data->phase) { case GTK_KINETIC_SCROLLING_PHASE_DECELERATING: { - gdouble last_position = data->position; - gdouble last_time = data->t; - gdouble exp_part; + double last_position = data->position; + double last_time = data->t; + double exp_part; data->t += time_delta; @@ -181,7 +181,7 @@ gtk_kinetic_scrolling_tick (GtkKineticScrolling *data, case GTK_KINETIC_SCROLLING_PHASE_OVERSHOOTING: { - gdouble exp_part, pos; + double exp_part, pos; data->t += time_delta; exp_part = exp(-data->overshoot_friction / 2 * data->t); diff --git a/gtk/gtkkineticscrollingprivate.h b/gtk/gtkkineticscrollingprivate.h index 92883b8c1c..29f3eae228 100644 --- a/gtk/gtkkineticscrollingprivate.h +++ b/gtk/gtkkineticscrollingprivate.h @@ -25,18 +25,18 @@ G_BEGIN_DECLS typedef struct _GtkKineticScrolling GtkKineticScrolling; -GtkKineticScrolling * gtk_kinetic_scrolling_new (gdouble lower, - gdouble upper, - gdouble overshoot_width, - gdouble decel_friction, - gdouble overshoot_friction, - gdouble initial_position, - gdouble initial_velocity); +GtkKineticScrolling * gtk_kinetic_scrolling_new (double lower, + double upper, + double overshoot_width, + double decel_friction, + double overshoot_friction, + double initial_position, + double initial_velocity); void gtk_kinetic_scrolling_free (GtkKineticScrolling *kinetic); gboolean gtk_kinetic_scrolling_tick (GtkKineticScrolling *data, - gdouble time_delta, - gdouble *position); + double time_delta, + double *position); G_END_DECLS diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 2d353ee681..b1926f45c6 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -475,8 +475,8 @@ static void gtk_label_select_region_index (GtkLabel *self, int end_index); static void gtk_label_update_active_link (GtkWidget *widget, - gdouble x, - gdouble y); + double x, + double y); static gboolean gtk_label_mnemonic_activate (GtkWidget *widget, gboolean group_cycling); @@ -519,21 +519,21 @@ static void emit_activate_link (GtkLabel *self, /* Event controller callbacks */ static void gtk_label_click_gesture_pressed (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkLabel *self); static void gtk_label_click_gesture_released (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkLabel *self); static void gtk_label_drag_gesture_begin (GtkGestureDrag *gesture, - gdouble start_x, - gdouble start_y, + double start_x, + double start_y, GtkLabel *self); static void gtk_label_drag_gesture_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkLabel *self); /* Actions */ @@ -3912,8 +3912,8 @@ out: static void gtk_label_click_gesture_pressed (GtkGestureClick *gesture, int n_press, - gdouble widget_x, - gdouble widget_y, + double widget_x, + double widget_y, GtkLabel *self) { GtkLabelSelectionInfo *info = self->select_info; @@ -3989,8 +3989,8 @@ gtk_label_click_gesture_pressed (GtkGestureClick *gesture, static void gtk_label_click_gesture_released (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkLabel *self) { GtkLabelSelectionInfo *info = self->select_info; @@ -4054,8 +4054,8 @@ get_selection_paintable (GtkLabel *self) static void gtk_label_drag_gesture_begin (GtkGestureDrag *gesture, - gdouble start_x, - gdouble start_y, + double start_x, + double start_y, GtkLabel *self) { GtkLabelSelectionInfo *info = self->select_info; @@ -4122,14 +4122,14 @@ gtk_label_drag_gesture_begin (GtkGestureDrag *gesture, static void gtk_label_drag_gesture_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkLabel *self) { GtkLabelSelectionInfo *info = self->select_info; GtkWidget *widget = GTK_WIDGET (self); GdkEventSequence *sequence; - gdouble x, y; + double x, y; int index; if (info == NULL || !info->selectable) @@ -4215,8 +4215,8 @@ gtk_label_drag_gesture_update (GtkGestureDrag *gesture, static void gtk_label_update_active_link (GtkWidget *widget, - gdouble x, - gdouble y) + double x, + double y) { GtkLabel *self = GTK_LABEL (widget); GtkLabelSelectionInfo *info = self->select_info; diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c index 19942b55e8..ace50c2202 100644 --- a/gtk/gtklevelbar.c +++ b/gtk/gtklevelbar.c @@ -160,7 +160,7 @@ typedef struct _GtkLevelBarClass GtkLevelBarClass; typedef struct { char *name; - gdouble value; + double value; } GtkLevelBarOffset; struct _GtkLevelBar { @@ -170,9 +170,9 @@ struct _GtkLevelBar { GtkLevelBarMode bar_mode; - gdouble min_value; - gdouble max_value; - gdouble cur_value; + double min_value; + double max_value; + double cur_value; GList *offsets; @@ -191,7 +191,7 @@ struct _GtkLevelBarClass { }; static void gtk_level_bar_set_value_internal (GtkLevelBar *self, - gdouble value); + double value); static void gtk_level_bar_buildable_init (GtkBuildableIface *iface); @@ -202,7 +202,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkLevelBar, gtk_level_bar, GTK_TYPE_WIDGET, static GtkLevelBarOffset * gtk_level_bar_offset_new (const char *name, - gdouble value) + double value) { GtkLevelBarOffset *offset = g_slice_new0 (GtkLevelBarOffset); @@ -242,7 +242,7 @@ offset_sort_func (gconstpointer a, static gboolean gtk_level_bar_ensure_offset (GtkLevelBar *self, const char *name, - gdouble value) + double value) { GList *existing; GtkLevelBarOffset *offset = NULL; @@ -271,7 +271,7 @@ gtk_level_bar_ensure_offset (GtkLevelBar *self, #ifndef G_DISABLE_CHECKS static gboolean gtk_level_bar_value_in_interval (GtkLevelBar *self, - gdouble value) + double value) { return ((value >= self->min_value) && (value <= self->max_value)); @@ -411,7 +411,7 @@ gtk_level_bar_allocate_trough_continuous (GtkLevelBar *self, int baseline) { GtkAllocation block_area; - gdouble fill_percentage; + double fill_percentage; gboolean inverted; int block_min; @@ -569,7 +569,7 @@ update_mode_style_classes (GtkLevelBar *self) static void update_level_style_classes (GtkLevelBar *self) { - gdouble value; + double value; const char *value_class = NULL; GtkLevelBarOffset *offset, *prev_offset; GList *l; @@ -1070,8 +1070,8 @@ gtk_level_bar_new (void) * Returns: a #GtkLevelBar */ GtkWidget * -gtk_level_bar_new_for_interval (gdouble min_value, - gdouble max_value) +gtk_level_bar_new_for_interval (double min_value, + double max_value) { return g_object_new (GTK_TYPE_LEVEL_BAR, "min-value", min_value, @@ -1087,7 +1087,7 @@ gtk_level_bar_new_for_interval (gdouble min_value, * * Returns: a positive value */ -gdouble +double gtk_level_bar_get_min_value (GtkLevelBar *self) { g_return_val_if_fail (GTK_IS_LEVEL_BAR (self), 0.0); @@ -1103,7 +1103,7 @@ gtk_level_bar_get_min_value (GtkLevelBar *self) * * Returns: a positive value */ -gdouble +double gtk_level_bar_get_max_value (GtkLevelBar *self) { g_return_val_if_fail (GTK_IS_LEVEL_BAR (self), 0.0); @@ -1120,7 +1120,7 @@ gtk_level_bar_get_max_value (GtkLevelBar *self) * Returns: a value in the interval between * #GtkLevelBar:min-value and #GtkLevelBar:max-value */ -gdouble +double gtk_level_bar_get_value (GtkLevelBar *self) { g_return_val_if_fail (GTK_IS_LEVEL_BAR (self), 0.0); @@ -1130,7 +1130,7 @@ gtk_level_bar_get_value (GtkLevelBar *self) static void gtk_level_bar_set_value_internal (GtkLevelBar *self, - gdouble value) + double value) { self->cur_value = value; @@ -1151,7 +1151,7 @@ gtk_level_bar_set_value_internal (GtkLevelBar *self, */ void gtk_level_bar_set_min_value (GtkLevelBar *self, - gdouble value) + double value) { g_return_if_fail (GTK_IS_LEVEL_BAR (self)); g_return_if_fail (value >= 0.0); @@ -1181,7 +1181,7 @@ gtk_level_bar_set_min_value (GtkLevelBar *self, */ void gtk_level_bar_set_max_value (GtkLevelBar *self, - gdouble value) + double value) { g_return_if_fail (GTK_IS_LEVEL_BAR (self)); g_return_if_fail (value >= 0.0); @@ -1210,7 +1210,7 @@ gtk_level_bar_set_max_value (GtkLevelBar *self, */ void gtk_level_bar_set_value (GtkLevelBar *self, - gdouble value) + double value) { g_return_if_fail (GTK_IS_LEVEL_BAR (self)); @@ -1344,7 +1344,7 @@ gtk_level_bar_remove_offset_value (GtkLevelBar *self, void gtk_level_bar_add_offset_value (GtkLevelBar *self, const char *name, - gdouble value) + double value) { GQuark name_quark; @@ -1373,7 +1373,7 @@ gtk_level_bar_add_offset_value (GtkLevelBar *self, gboolean gtk_level_bar_get_offset_value (GtkLevelBar *self, const char *name, - gdouble *value) + double *value) { GList *existing; GtkLevelBarOffset *offset = NULL; diff --git a/gtk/gtklevelbar.h b/gtk/gtklevelbar.h index 33a03c4c7c..4444eadfb5 100644 --- a/gtk/gtklevelbar.h +++ b/gtk/gtklevelbar.h @@ -64,8 +64,8 @@ GDK_AVAILABLE_IN_ALL GtkWidget *gtk_level_bar_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_level_bar_new_for_interval (gdouble min_value, - gdouble max_value); +GtkWidget *gtk_level_bar_new_for_interval (double min_value, + double max_value); GDK_AVAILABLE_IN_ALL void gtk_level_bar_set_mode (GtkLevelBar *self, @@ -75,21 +75,21 @@ GtkLevelBarMode gtk_level_bar_get_mode (GtkLevelBar *self); GDK_AVAILABLE_IN_ALL void gtk_level_bar_set_value (GtkLevelBar *self, - gdouble value); + double value); GDK_AVAILABLE_IN_ALL -gdouble gtk_level_bar_get_value (GtkLevelBar *self); +double gtk_level_bar_get_value (GtkLevelBar *self); GDK_AVAILABLE_IN_ALL void gtk_level_bar_set_min_value (GtkLevelBar *self, - gdouble value); + double value); GDK_AVAILABLE_IN_ALL -gdouble gtk_level_bar_get_min_value (GtkLevelBar *self); +double gtk_level_bar_get_min_value (GtkLevelBar *self); GDK_AVAILABLE_IN_ALL void gtk_level_bar_set_max_value (GtkLevelBar *self, - gdouble value); + double value); GDK_AVAILABLE_IN_ALL -gdouble gtk_level_bar_get_max_value (GtkLevelBar *self); +double gtk_level_bar_get_max_value (GtkLevelBar *self); GDK_AVAILABLE_IN_ALL void gtk_level_bar_set_inverted (GtkLevelBar *self, @@ -101,14 +101,14 @@ gboolean gtk_level_bar_get_inverted (GtkLevelBar *self); GDK_AVAILABLE_IN_ALL void gtk_level_bar_add_offset_value (GtkLevelBar *self, const char *name, - gdouble value); + double value); GDK_AVAILABLE_IN_ALL void gtk_level_bar_remove_offset_value (GtkLevelBar *self, const char *name); GDK_AVAILABLE_IN_ALL gboolean gtk_level_bar_get_offset_value (GtkLevelBar *self, const char *name, - gdouble *value); + double *value); G_END_DECLS diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c index 7b9affd94e..3d3a1a720a 100644 --- a/gtk/gtklistbox.c +++ b/gtk/gtklistbox.c @@ -281,17 +281,17 @@ static void gtk_list_box_set_accept_unpaired_release (GtkList static void gtk_list_box_click_gesture_pressed (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkListBox *box); static void gtk_list_box_click_gesture_released (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkListBox *box); static void gtk_list_box_click_unpaired_release (GtkGestureClick *gesture, - gdouble x, - gdouble y, + double x, + double y, guint button, GdkEventSequence *sequence, GtkListBox *box); @@ -1782,8 +1782,8 @@ gtk_list_box_select_and_activate_full (GtkListBox *box, static void gtk_list_box_click_gesture_pressed (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkListBox *box) { GtkListBoxRow *row; @@ -1802,8 +1802,8 @@ gtk_list_box_click_gesture_pressed (GtkGestureClick *gesture, static void gtk_list_box_click_unpaired_release (GtkGestureClick *gesture, - gdouble x, - gdouble y, + double x, + double y, guint button, GdkEventSequence *sequence, GtkListBox *box) @@ -1822,8 +1822,8 @@ gtk_list_box_click_unpaired_release (GtkGestureClick *gesture, static void gtk_list_box_click_gesture_released (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkListBox *box) { /* Take a ref to protect against reentrancy diff --git a/gtk/gtkmagnifier.c b/gtk/gtkmagnifier.c index 358690fea8..d38a82ff57 100644 --- a/gtk/gtkmagnifier.c +++ b/gtk/gtkmagnifier.c @@ -33,7 +33,7 @@ typedef struct _GtkMagnifierPrivate GtkMagnifierPrivate; struct _GtkMagnifierPrivate { GdkPaintable *paintable; - gdouble magnification; + double magnification; int x; int y; gboolean resize; @@ -253,8 +253,8 @@ _gtk_magnifier_set_inspected (GtkMagnifier *magnifier, void _gtk_magnifier_set_coords (GtkMagnifier *magnifier, - gdouble x, - gdouble y) + double x, + double y) { GtkMagnifierPrivate *priv; @@ -274,8 +274,8 @@ _gtk_magnifier_set_coords (GtkMagnifier *magnifier, void _gtk_magnifier_get_coords (GtkMagnifier *magnifier, - gdouble *x, - gdouble *y) + double *x, + double *y) { GtkMagnifierPrivate *priv; @@ -292,7 +292,7 @@ _gtk_magnifier_get_coords (GtkMagnifier *magnifier, void _gtk_magnifier_set_magnification (GtkMagnifier *magnifier, - gdouble magnification) + double magnification) { GtkMagnifierPrivate *priv; @@ -313,7 +313,7 @@ _gtk_magnifier_set_magnification (GtkMagnifier *magnifier, gtk_widget_queue_draw (GTK_WIDGET (magnifier)); } -gdouble +double _gtk_magnifier_get_magnification (GtkMagnifier *magnifier) { GtkMagnifierPrivate *priv; diff --git a/gtk/gtkmagnifierprivate.h b/gtk/gtkmagnifierprivate.h index 7ce84cc1a4..8d46cdcdd8 100644 --- a/gtk/gtkmagnifierprivate.h +++ b/gtk/gtkmagnifierprivate.h @@ -49,15 +49,15 @@ void _gtk_magnifier_set_inspected (GtkMagnifier *magnifier, GtkWidget *inspected); void _gtk_magnifier_set_coords (GtkMagnifier *magnifier, - gdouble x, - gdouble y); + double x, + double y); void _gtk_magnifier_get_coords (GtkMagnifier *magnifier, - gdouble *x, - gdouble *y); + double *x, + double *y); void _gtk_magnifier_set_magnification (GtkMagnifier *magnifier, - gdouble magnification); -gdouble _gtk_magnifier_get_magnification (GtkMagnifier *magnifier); + double magnification); +double _gtk_magnifier_get_magnification (GtkMagnifier *magnifier); void _gtk_magnifier_set_resize (GtkMagnifier *magnifier, gboolean resize); diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list index 7334e54a71..899d1fd688 100644 --- a/gtk/gtkmarshalers.list +++ b/gtk/gtkmarshalers.list @@ -13,7 +13,7 @@ # ENUM for enumeration types (int) # FLAGS for flag enumeration types (guint) # FLOAT for single-precision float types (float) -# DOUBLE for double-precision float types (gdouble) +# DOUBLE for double-precision float types (double) # STRING for string types (char *) # BOXED for boxed (anonymous but reference counted) types (GBoxed*) # POINTER for anonymous pointer types (gpointer) diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index a96e704475..fea2d3064d 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -2430,8 +2430,8 @@ gtk_notebook_page_tab_label_is_visible (GtkNotebookPage *page) static gboolean in_tabs (GtkNotebook *notebook, - gdouble x, - gdouble y) + double x, + double y) { graphene_rect_t tabs_bounds; @@ -2444,8 +2444,8 @@ in_tabs (GtkNotebook *notebook, static GList* get_tab_at_pos (GtkNotebook *notebook, - gdouble x, - gdouble y) + double x, + double y) { GtkNotebookPage *page; GList *children; diff --git a/gtk/gtkpadcontroller.c b/gtk/gtkpadcontroller.c index 8fe2b39108..df589682ad 100644 --- a/gtk/gtkpadcontroller.c +++ b/gtk/gtkpadcontroller.c @@ -150,7 +150,7 @@ gtk_pad_controller_activate_action (GtkPadController *controller, static void gtk_pad_controller_activate_action_with_axis (GtkPadController *controller, const ActionEntryData *entry, - gdouble value) + double value) { g_action_group_activate_action (controller->action_group, entry->action_name, @@ -227,7 +227,7 @@ gtk_pad_controller_handle_event (GtkEventController *controller, const ActionEntryData *entry; GtkPadActionType type; guint index, mode, group; - gdouble value = 0; + double value = 0; gdk_pad_event_get_group_mode (event, &group, &mode); if (event_type == GDK_PAD_GROUP_MODE) diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c index 94f7748785..0bebbab543 100644 --- a/gtk/gtkpagesetup.c +++ b/gtk/gtkpagesetup.c @@ -264,7 +264,7 @@ gtk_page_setup_set_paper_size_and_default_margins (GtkPageSetup *setup, * * Returns: the top margin */ -gdouble +double gtk_page_setup_get_top_margin (GtkPageSetup *setup, GtkUnit unit) { @@ -281,7 +281,7 @@ gtk_page_setup_get_top_margin (GtkPageSetup *setup, */ void gtk_page_setup_set_top_margin (GtkPageSetup *setup, - gdouble margin, + double margin, GtkUnit unit) { setup->top_margin = _gtk_print_convert_to_mm (margin, unit); @@ -296,7 +296,7 @@ gtk_page_setup_set_top_margin (GtkPageSetup *setup, * * Returns: the bottom margin */ -gdouble +double gtk_page_setup_get_bottom_margin (GtkPageSetup *setup, GtkUnit unit) { @@ -313,7 +313,7 @@ gtk_page_setup_get_bottom_margin (GtkPageSetup *setup, */ void gtk_page_setup_set_bottom_margin (GtkPageSetup *setup, - gdouble margin, + double margin, GtkUnit unit) { setup->bottom_margin = _gtk_print_convert_to_mm (margin, unit); @@ -328,7 +328,7 @@ gtk_page_setup_set_bottom_margin (GtkPageSetup *setup, * * Returns: the left margin */ -gdouble +double gtk_page_setup_get_left_margin (GtkPageSetup *setup, GtkUnit unit) { @@ -345,7 +345,7 @@ gtk_page_setup_get_left_margin (GtkPageSetup *setup, */ void gtk_page_setup_set_left_margin (GtkPageSetup *setup, - gdouble margin, + double margin, GtkUnit unit) { setup->left_margin = _gtk_print_convert_to_mm (margin, unit); @@ -360,7 +360,7 @@ gtk_page_setup_set_left_margin (GtkPageSetup *setup, * * Returns: the right margin */ -gdouble +double gtk_page_setup_get_right_margin (GtkPageSetup *setup, GtkUnit unit) { @@ -377,7 +377,7 @@ gtk_page_setup_get_right_margin (GtkPageSetup *setup, */ void gtk_page_setup_set_right_margin (GtkPageSetup *setup, - gdouble margin, + double margin, GtkUnit unit) { setup->right_margin = _gtk_print_convert_to_mm (margin, unit); @@ -396,7 +396,7 @@ gtk_page_setup_set_right_margin (GtkPageSetup *setup, * * Returns: the paper width. */ -gdouble +double gtk_page_setup_get_paper_width (GtkPageSetup *setup, GtkUnit unit) { @@ -420,7 +420,7 @@ gtk_page_setup_get_paper_width (GtkPageSetup *setup, * * Returns: the paper height. */ -gdouble +double gtk_page_setup_get_paper_height (GtkPageSetup *setup, GtkUnit unit) { @@ -444,11 +444,11 @@ gtk_page_setup_get_paper_height (GtkPageSetup *setup, * * Returns: the page width. */ -gdouble +double gtk_page_setup_get_page_width (GtkPageSetup *setup, GtkUnit unit) { - gdouble width; + double width; width = gtk_page_setup_get_paper_width (setup, GTK_UNIT_MM); if (setup->orientation == GTK_PAGE_ORIENTATION_PORTRAIT || @@ -473,11 +473,11 @@ gtk_page_setup_get_page_width (GtkPageSetup *setup, * * Returns: the page height. */ -gdouble +double gtk_page_setup_get_page_height (GtkPageSetup *setup, GtkUnit unit) { - gdouble height; + double height; height = gtk_page_setup_get_paper_height (setup, GTK_UNIT_MM); if (setup->orientation == GTK_PAGE_ORIENTATION_PORTRAIT || @@ -589,7 +589,7 @@ gtk_page_setup_load_key_file (GtkPageSetup *setup, GError **error) { GtkPaperSize *paper_size; - gdouble top, bottom, left, right; + double top, bottom, left, right; char *orientation = NULL, *freeme = NULL; gboolean retval = FALSE; GError *err = NULL; @@ -840,7 +840,7 @@ gtk_page_setup_new_from_gvariant (GVariant *variant) { GtkPageSetup *setup; const char *orientation; - gdouble margin; + double margin; GtkPaperSize *paper_size; g_return_val_if_fail (g_variant_is_of_type (variant, G_VARIANT_TYPE_VARDICT), NULL); diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h index 7c081e1cd2..461861e8c9 100644 --- a/gtk/gtkpagesetup.h +++ b/gtk/gtkpagesetup.h @@ -52,32 +52,32 @@ GDK_AVAILABLE_IN_ALL void gtk_page_setup_set_paper_size (GtkPageSetup *setup, GtkPaperSize *size); GDK_AVAILABLE_IN_ALL -gdouble gtk_page_setup_get_top_margin (GtkPageSetup *setup, +double gtk_page_setup_get_top_margin (GtkPageSetup *setup, GtkUnit unit); GDK_AVAILABLE_IN_ALL void gtk_page_setup_set_top_margin (GtkPageSetup *setup, - gdouble margin, + double margin, GtkUnit unit); GDK_AVAILABLE_IN_ALL -gdouble gtk_page_setup_get_bottom_margin (GtkPageSetup *setup, +double gtk_page_setup_get_bottom_margin (GtkPageSetup *setup, GtkUnit unit); GDK_AVAILABLE_IN_ALL void gtk_page_setup_set_bottom_margin (GtkPageSetup *setup, - gdouble margin, + double margin, GtkUnit unit); GDK_AVAILABLE_IN_ALL -gdouble gtk_page_setup_get_left_margin (GtkPageSetup *setup, +double gtk_page_setup_get_left_margin (GtkPageSetup *setup, GtkUnit unit); GDK_AVAILABLE_IN_ALL void gtk_page_setup_set_left_margin (GtkPageSetup *setup, - gdouble margin, + double margin, GtkUnit unit); GDK_AVAILABLE_IN_ALL -gdouble gtk_page_setup_get_right_margin (GtkPageSetup *setup, +double gtk_page_setup_get_right_margin (GtkPageSetup *setup, GtkUnit unit); GDK_AVAILABLE_IN_ALL void gtk_page_setup_set_right_margin (GtkPageSetup *setup, - gdouble margin, + double margin, GtkUnit unit); GDK_AVAILABLE_IN_ALL @@ -86,19 +86,19 @@ void gtk_page_setup_set_paper_size_and_default_margins (GtkPageSetup *setup, /* These take orientation, but not margins into consideration */ GDK_AVAILABLE_IN_ALL -gdouble gtk_page_setup_get_paper_width (GtkPageSetup *setup, +double gtk_page_setup_get_paper_width (GtkPageSetup *setup, GtkUnit unit); GDK_AVAILABLE_IN_ALL -gdouble gtk_page_setup_get_paper_height (GtkPageSetup *setup, +double gtk_page_setup_get_paper_height (GtkPageSetup *setup, GtkUnit unit); /* These take orientation, and margins into consideration */ GDK_AVAILABLE_IN_ALL -gdouble gtk_page_setup_get_page_width (GtkPageSetup *setup, +double gtk_page_setup_get_page_width (GtkPageSetup *setup, GtkUnit unit); GDK_AVAILABLE_IN_ALL -gdouble gtk_page_setup_get_page_height (GtkPageSetup *setup, +double gtk_page_setup_get_page_height (GtkPageSetup *setup, GtkUnit unit); /* Saving and restoring page setup */ diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c index d641151b95..c0743deaee 100644 --- a/gtk/gtkpagesetupunixdialog.c +++ b/gtk/gtkpagesetupunixdialog.c @@ -602,7 +602,7 @@ printer_changed_callback (GtkDropDown *combo_box, after the decimal point, and not to many such digits if they are nonzero. I wish printf let you specify max precision for %f... */ static char * -double_to_string (gdouble d, +double_to_string (double d, GtkUnit unit) { char *val, *p; diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index a930450e64..a8873a6293 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -831,8 +831,8 @@ gtk_paned_buildable_iface_init (GtkBuildableIface *iface) static gboolean initiates_touch_drag (GtkPaned *paned, - gdouble start_x, - gdouble start_y) + double start_x, + double start_y) { int handle_size, handle_pos, drag_pos; graphene_rect_t handle_area; @@ -864,8 +864,8 @@ initiates_touch_drag (GtkPaned *paned, static void gesture_drag_begin_cb (GtkGestureDrag *gesture, - gdouble start_x, - gdouble start_y, + double start_x, + double start_y, GtkPaned *paned) { GdkEventSequence *sequence; @@ -914,11 +914,11 @@ gesture_drag_begin_cb (GtkGestureDrag *gesture, static void gesture_drag_update_cb (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkPaned *paned) { - gdouble start_x, start_y; + double start_x, start_y; gtk_gesture_drag_get_start_point (GTK_GESTURE_DRAG (gesture), &start_x, &start_y); @@ -927,8 +927,8 @@ gesture_drag_update_cb (GtkGestureDrag *gesture, static void gesture_drag_end_cb (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkPaned *paned) { if (!paned->panning) @@ -1080,7 +1080,7 @@ gtk_paned_compute_position (GtkPaned *paned, else if (!paned->resize_start_child && paned->resize_end_child) pos = start_child_req; else if (start_child_req + end_child_req != 0) - pos = allocation * ((gdouble)start_child_req / (start_child_req + end_child_req)) + 0.5; + pos = allocation * ((double)start_child_req / (start_child_req + end_child_req)) + 0.5; else pos = allocation * 0.5 + 0.5; } @@ -1094,7 +1094,7 @@ gtk_paned_compute_position (GtkPaned *paned, if (paned->resize_start_child && !paned->resize_end_child) pos = paned->start_child_size + allocation - paned->last_allocation; else if (!(!paned->resize_start_child && paned->resize_end_child)) - pos = allocation * ((gdouble) paned->start_child_size / (paned->last_allocation)) + 0.5; + pos = allocation * ((double) paned->start_child_size / (paned->last_allocation)) + 0.5; else pos = paned->start_child_size; } diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c index 7dbddd65af..d076f3059c 100644 --- a/gtk/gtkpapersize.c +++ b/gtk/gtkpapersize.c @@ -68,7 +68,7 @@ struct _GtkPaperSize char *display_name; char *ppd_name; - gdouble width, height; /* Stored in mm */ + double width, height; /* Stored in mm */ gboolean is_custom; gboolean is_ipp; }; @@ -103,8 +103,8 @@ lookup_paper_info (const char *name) static gboolean parse_media_size (const char *size, - gdouble *width_mm, - gdouble *height_mm) + double *width_mm, + double *height_mm) { const char *p; char *e; @@ -145,8 +145,8 @@ parse_media_size (const char *size, static gboolean parse_full_media_size_name (const char *full_name, char **name, - gdouble *width_mm, - gdouble *height_mm) + double *width_mm, + double *height_mm) { const char *p; const char *end_of_name; @@ -313,8 +313,8 @@ improve_displayname (const char *name) GtkPaperSize * gtk_paper_size_new_from_ppd (const char *ppd_name, const char *ppd_display_name, - gdouble width, - gdouble height) + double width, + double height) { char *name; const char *lookup_ppd_name; @@ -391,8 +391,8 @@ gtk_paper_size_new_from_ppd (const char *ppd_name, */ GtkPaperSize * gtk_paper_size_new_from_ipp (const char *ipp_name, - gdouble width, - gdouble height) + double width, + double height) { GtkPaperSize *size; const char *name = NULL; @@ -479,8 +479,8 @@ gtk_paper_size_new_from_ipp (const char *ipp_name, GtkPaperSize * gtk_paper_size_new_custom (const char *name, const char *display_name, - gdouble width, - gdouble height, + double width, + double height, GtkUnit unit) { GtkPaperSize *size; @@ -681,7 +681,7 @@ gtk_paper_size_get_ppd_name (GtkPaperSize *size) * * Returns: the paper width */ -gdouble +double gtk_paper_size_get_width (GtkPaperSize *size, GtkUnit unit) { @@ -698,7 +698,7 @@ gtk_paper_size_get_width (GtkPaperSize *size, * * Returns: the paper height */ -gdouble +double gtk_paper_size_get_height (GtkPaperSize *size, GtkUnit unit) { @@ -744,8 +744,8 @@ gtk_paper_size_is_ipp (GtkPaperSize *size) */ void gtk_paper_size_set_size (GtkPaperSize *size, - gdouble width, - gdouble height, + double width, + double height, GtkUnit unit) { g_return_if_fail (size != NULL); @@ -833,11 +833,11 @@ gtk_paper_size_get_default (void) * * Returns: the default top margin */ -gdouble +double gtk_paper_size_get_default_top_margin (GtkPaperSize *size, GtkUnit unit) { - gdouble margin; + double margin; margin = _gtk_print_convert_to_mm (0.25, GTK_UNIT_INCH); return _gtk_print_convert_from_mm (margin, unit); @@ -852,11 +852,11 @@ gtk_paper_size_get_default_top_margin (GtkPaperSize *size, * * Returns: the default bottom margin */ -gdouble +double gtk_paper_size_get_default_bottom_margin (GtkPaperSize *size, GtkUnit unit) { - gdouble margin; + double margin; const char *name; margin = _gtk_print_convert_to_mm (0.25, GTK_UNIT_INCH); @@ -879,11 +879,11 @@ gtk_paper_size_get_default_bottom_margin (GtkPaperSize *size, * * Returns: the default left margin */ -gdouble +double gtk_paper_size_get_default_left_margin (GtkPaperSize *size, GtkUnit unit) { - gdouble margin; + double margin; margin = _gtk_print_convert_to_mm (0.25, GTK_UNIT_INCH); return _gtk_print_convert_from_mm (margin, unit); @@ -898,11 +898,11 @@ gtk_paper_size_get_default_left_margin (GtkPaperSize *size, * * Returns: the default right margin */ -gdouble +double gtk_paper_size_get_default_right_margin (GtkPaperSize *size, GtkUnit unit) { - gdouble margin; + double margin; margin = _gtk_print_convert_to_mm (0.25, GTK_UNIT_INCH); return _gtk_print_convert_from_mm (margin, unit); @@ -931,7 +931,7 @@ gtk_paper_size_new_from_key_file (GKeyFile *key_file, char *ppd_name = NULL; char *display_name = NULL; char *freeme = NULL; - gdouble width, height; + double width, height; GError *err = NULL; g_return_val_if_fail (key_file != NULL, NULL); @@ -1089,7 +1089,7 @@ gtk_paper_size_new_from_gvariant (GVariant *variant) const char *name; const char *ppd_name; const char *display_name; - gdouble width, height; + double width, height; g_return_val_if_fail (g_variant_is_of_type (variant, G_VARIANT_TYPE_VARDICT), NULL); diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h index 04e7389fab..20e4239e8e 100644 --- a/gtk/gtkpapersize.h +++ b/gtk/gtkpapersize.h @@ -92,17 +92,17 @@ GtkPaperSize *gtk_paper_size_new (const char *name); GDK_AVAILABLE_IN_ALL GtkPaperSize *gtk_paper_size_new_from_ppd (const char *ppd_name, const char *ppd_display_name, - gdouble width, - gdouble height); + double width, + double height); GDK_AVAILABLE_IN_ALL GtkPaperSize *gtk_paper_size_new_from_ipp (const char *ipp_name, - gdouble width, - gdouble height); + double width, + double height); GDK_AVAILABLE_IN_ALL GtkPaperSize *gtk_paper_size_new_custom (const char *name, const char *display_name, - gdouble width, - gdouble height, + double width, + double height, GtkUnit unit); GDK_AVAILABLE_IN_ALL GtkPaperSize *gtk_paper_size_copy (GtkPaperSize *other); @@ -124,9 +124,9 @@ GDK_AVAILABLE_IN_ALL const char *gtk_paper_size_get_ppd_name (GtkPaperSize *size); GDK_AVAILABLE_IN_ALL -gdouble gtk_paper_size_get_width (GtkPaperSize *size, GtkUnit unit); +double gtk_paper_size_get_width (GtkPaperSize *size, GtkUnit unit); GDK_AVAILABLE_IN_ALL -gdouble gtk_paper_size_get_height (GtkPaperSize *size, GtkUnit unit); +double gtk_paper_size_get_height (GtkPaperSize *size, GtkUnit unit); GDK_AVAILABLE_IN_ALL gboolean gtk_paper_size_is_custom (GtkPaperSize *size); GDK_AVAILABLE_IN_ALL @@ -135,21 +135,21 @@ gboolean gtk_paper_size_is_ipp (GtkPaperSize *size); /* Only for custom sizes: */ GDK_AVAILABLE_IN_ALL void gtk_paper_size_set_size (GtkPaperSize *size, - gdouble width, - gdouble height, + double width, + double height, GtkUnit unit); GDK_AVAILABLE_IN_ALL -gdouble gtk_paper_size_get_default_top_margin (GtkPaperSize *size, +double gtk_paper_size_get_default_top_margin (GtkPaperSize *size, GtkUnit unit); GDK_AVAILABLE_IN_ALL -gdouble gtk_paper_size_get_default_bottom_margin (GtkPaperSize *size, +double gtk_paper_size_get_default_bottom_margin (GtkPaperSize *size, GtkUnit unit); GDK_AVAILABLE_IN_ALL -gdouble gtk_paper_size_get_default_left_margin (GtkPaperSize *size, +double gtk_paper_size_get_default_left_margin (GtkPaperSize *size, GtkUnit unit); GDK_AVAILABLE_IN_ALL -gdouble gtk_paper_size_get_default_right_margin (GtkPaperSize *size, +double gtk_paper_size_get_default_right_margin (GtkPaperSize *size, GtkUnit unit); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index c24b931e02..e3e0b284b4 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -153,8 +153,8 @@ static void gtk_path_bar_update_button_appearance (GtkPathBar *path_bar, gboolean current_dir); static gboolean gtk_path_bar_scroll_controller_scroll (GtkEventControllerScroll *scroll, - gdouble dx, - gdouble dy, + double dx, + double dy, GtkPathBar *path_bar); static void @@ -671,8 +671,8 @@ gtk_path_bar_size_allocate (GtkWidget *widget, static gboolean gtk_path_bar_scroll_controller_scroll (GtkEventControllerScroll *scroll, - gdouble dx, - gdouble dy, + double dx, + double dy, GtkPathBar *path_bar) { if (dy > 0) diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c index a0f3a9c070..f66bb0a265 100644 --- a/gtk/gtkplacessidebar.c +++ b/gtk/gtkplacessidebar.c @@ -271,23 +271,23 @@ static void check_unmount_and_eject (GMount *mount, gboolean *show_eject); static void on_row_pressed (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkSidebarRow *row); static void on_row_released (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkSidebarRow *row); static void on_row_dragged (GtkGestureDrag *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkSidebarRow *row); static void popup_menu_cb (GtkSidebarRow *row); static void long_press_cb (GtkGesture *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkPlacesSidebar *sidebar); static void stop_drop_feedback (GtkPlacesSidebar *sidebar); static GMountOperation * get_mount_operation (GtkPlacesSidebar *sidebar); @@ -3383,8 +3383,8 @@ on_row_activated (GtkListBox *list_box, static void on_row_pressed (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkSidebarRow *row) { GtkPlacesSidebar *sidebar; @@ -3410,8 +3410,8 @@ on_row_pressed (GtkGestureClick *gesture, static void on_row_released (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkSidebarRow *row) { GtkPlacesSidebar *sidebar; @@ -3452,8 +3452,8 @@ on_row_released (GtkGestureClick *gesture, static void on_row_dragged (GtkGestureDrag *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkSidebarRow *row) { GtkPlacesSidebar *sidebar; @@ -3532,8 +3532,8 @@ popup_menu_cb (GtkSidebarRow *row) static void long_press_cb (GtkGesture *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkPlacesSidebar *sidebar) { GtkWidget *row; diff --git a/gtk/gtkpointerfocus.c b/gtk/gtkpointerfocus.c index c24243d718..3ad4418bdd 100644 --- a/gtk/gtkpointerfocus.c +++ b/gtk/gtkpointerfocus.c @@ -35,8 +35,8 @@ gtk_pointer_focus_new (GtkWindow *toplevel, GtkWidget *widget, GdkDevice *device, GdkEventSequence *sequence, - gdouble x, - gdouble y) + double x, + double y) { GtkPointerFocus *focus; @@ -108,8 +108,8 @@ gtk_pointer_focus_get_implicit_grab (GtkPointerFocus *focus) void gtk_pointer_focus_set_coordinates (GtkPointerFocus *focus, - gdouble x, - gdouble y) + double x, + double y) { focus->x = x; focus->y = y; diff --git a/gtk/gtkpointerfocusprivate.h b/gtk/gtkpointerfocusprivate.h index afbf55bedd..7cd192902a 100644 --- a/gtk/gtkpointerfocusprivate.h +++ b/gtk/gtkpointerfocusprivate.h @@ -30,21 +30,21 @@ struct _GtkPointerFocus GtkWindow *toplevel; GtkWidget *target; /* Unaffected by the implicit grab */ GtkWidget *grab_widget; - gdouble x, y; /* In toplevel coordinates */ + double x, y; /* In toplevel coordinates */ }; GtkPointerFocus * gtk_pointer_focus_new (GtkWindow *toplevel, GtkWidget *widget, GdkDevice *device, GdkEventSequence *sequence, - gdouble x, - gdouble y); + double x, + double y); GtkPointerFocus * gtk_pointer_focus_ref (GtkPointerFocus *focus); void gtk_pointer_focus_unref (GtkPointerFocus *focus); void gtk_pointer_focus_set_coordinates (GtkPointerFocus *focus, - gdouble x, - gdouble y); + double x, + double y); void gtk_pointer_focus_set_target (GtkPointerFocus *focus, GtkWidget *target); GtkWidget * gtk_pointer_focus_get_target (GtkPointerFocus *focus); diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c index 0dd6d5ddc7..5cab6e6998 100644 --- a/gtk/gtkprintbackend.c +++ b/gtk/gtkprintbackend.c @@ -183,16 +183,16 @@ static void fallback_printer_request_details (GtkPrinter static gboolean fallback_printer_mark_conflicts (GtkPrinter *printer, GtkPrinterOptionSet *options); static gboolean fallback_printer_get_hard_margins (GtkPrinter *printer, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right); + double *top, + double *bottom, + double *left, + double *right); static gboolean fallback_printer_get_hard_margins_for_paper_size (GtkPrinter *printer, GtkPaperSize *paper_size, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right); + double *top, + double *bottom, + double *left, + double *right); static GList * fallback_printer_list_papers (GtkPrinter *printer); static GtkPageSetup * fallback_printer_get_default_page_size (GtkPrinter *printer); static GtkPrintCapabilities fallback_printer_get_capabilities (GtkPrinter *printer); @@ -380,10 +380,10 @@ fallback_printer_mark_conflicts (GtkPrinter *printer, static gboolean fallback_printer_get_hard_margins (GtkPrinter *printer, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right) + double *top, + double *bottom, + double *left, + double *right) { return FALSE; } @@ -391,10 +391,10 @@ fallback_printer_get_hard_margins (GtkPrinter *printer, static gboolean fallback_printer_get_hard_margins_for_paper_size (GtkPrinter *printer, GtkPaperSize *paper_size, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right) + double *top, + double *bottom, + double *left, + double *right) { return FALSE; } diff --git a/gtk/gtkprintbackendprivate.h b/gtk/gtkprintbackendprivate.h index 60bf250949..c31a693482 100644 --- a/gtk/gtkprintbackendprivate.h +++ b/gtk/gtkprintbackendprivate.h @@ -85,8 +85,8 @@ struct _GtkPrintBackendClass void (*printer_request_details) (GtkPrinter *printer); cairo_surface_t * (*printer_create_cairo_surface) (GtkPrinter *printer, GtkPrintSettings *settings, - gdouble height, - gdouble width, + double height, + double width, GIOChannel *cache_io); GtkPrinterOptionSet * (*printer_get_options) (GtkPrinter *printer, GtkPrintSettings *settings, @@ -104,10 +104,10 @@ struct _GtkPrintBackendClass GList * (*printer_list_papers) (GtkPrinter *printer); GtkPageSetup * (*printer_get_default_page_size) (GtkPrinter *printer); gboolean (*printer_get_hard_margins) (GtkPrinter *printer, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right); + double *top, + double *bottom, + double *left, + double *right); GtkPrintCapabilities (*printer_get_capabilities) (GtkPrinter *printer); /* Signals */ @@ -135,10 +135,10 @@ struct _GtkPrintBackendClass gboolean (*printer_get_hard_margins_for_paper_size) (GtkPrinter *printer, GtkPaperSize *paper_size, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right); + double *top, + double *bottom, + double *left, + double *right); }; #define GTK_PRINT_BACKEND_EXTENSION_POINT_NAME "gtk-print-backend" diff --git a/gtk/gtkprintcontext.c b/gtk/gtkprintcontext.c index f01b9648bc..d3c730d707 100644 --- a/gtk/gtkprintcontext.c +++ b/gtk/gtkprintcontext.c @@ -112,17 +112,17 @@ struct _GtkPrintContext cairo_t *cr; GtkPageSetup *page_setup; - gdouble surface_dpi_x; - gdouble surface_dpi_y; + double surface_dpi_x; + double surface_dpi_y; - gdouble pixels_per_unit_x; - gdouble pixels_per_unit_y; + double pixels_per_unit_x; + double pixels_per_unit_y; gboolean has_hard_margins; - gdouble hard_margin_top; - gdouble hard_margin_bottom; - gdouble hard_margin_left; - gdouble hard_margin_right; + double hard_margin_top; + double hard_margin_bottom; + double hard_margin_left; + double hard_margin_right; }; @@ -241,7 +241,7 @@ _gtk_print_context_rotate_according_to_orientation (GtkPrintContext *context) cairo_t *cr = context->cr; cairo_matrix_t matrix; GtkPaperSize *paper_size; - gdouble width, height; + double width, height; paper_size = gtk_page_setup_get_paper_size (context->page_setup); @@ -287,7 +287,7 @@ _gtk_print_context_reverse_according_to_orientation (GtkPrintContext *context) { cairo_t *cr = context->cr; cairo_matrix_t matrix; - gdouble width, height; + double width, height; width = gtk_page_setup_get_paper_width (context->page_setup, GTK_UNIT_INCH); width = width * context->surface_dpi_x / context->pixels_per_unit_x; @@ -315,7 +315,7 @@ _gtk_print_context_reverse_according_to_orientation (GtkPrintContext *context) void _gtk_print_context_translate_into_margin (GtkPrintContext *context) { - gdouble dx, dy; + double dx, dy; g_return_if_fail (GTK_IS_PRINT_CONTEXT (context)); @@ -405,11 +405,11 @@ gtk_print_context_get_page_setup (GtkPrintContext *context) * * Returns: the width of @context */ -gdouble +double gtk_print_context_get_width (GtkPrintContext *context) { GtkPrintOperationPrivate *priv; - gdouble width; + double width; g_return_val_if_fail (GTK_IS_PRINT_CONTEXT (context), 0); @@ -432,11 +432,11 @@ gtk_print_context_get_width (GtkPrintContext *context) * * Returns: the height of @context */ -gdouble +double gtk_print_context_get_height (GtkPrintContext *context) { GtkPrintOperationPrivate *priv; - gdouble height; + double height; g_return_val_if_fail (GTK_IS_PRINT_CONTEXT (context), 0); @@ -460,7 +460,7 @@ gtk_print_context_get_height (GtkPrintContext *context) * * Returns: the horizontal resolution of @context */ -gdouble +double gtk_print_context_get_dpi_x (GtkPrintContext *context) { g_return_val_if_fail (GTK_IS_PRINT_CONTEXT (context), 0); @@ -477,7 +477,7 @@ gtk_print_context_get_dpi_x (GtkPrintContext *context) * * Returns: the vertical resolution of @context */ -gdouble +double gtk_print_context_get_dpi_y (GtkPrintContext *context) { g_return_val_if_fail (GTK_IS_PRINT_CONTEXT (context), 0); @@ -499,10 +499,10 @@ gtk_print_context_get_dpi_y (GtkPrintContext *context) */ gboolean gtk_print_context_get_hard_margins (GtkPrintContext *context, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right) + double *top, + double *bottom, + double *left, + double *right) { if (context->has_hard_margins) { @@ -527,10 +527,10 @@ gtk_print_context_get_hard_margins (GtkPrintContext *context, */ void _gtk_print_context_set_hard_margins (GtkPrintContext *context, - gdouble top, - gdouble bottom, - gdouble left, - gdouble right) + double top, + double bottom, + double left, + double right) { context->hard_margin_top = top; context->hard_margin_bottom = bottom; diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h index c78be90c90..3c4ede2bbf 100644 --- a/gtk/gtkprintcontext.h +++ b/gtk/gtkprintcontext.h @@ -47,19 +47,19 @@ cairo_t *gtk_print_context_get_cairo_context (GtkPrintContext *context); GDK_AVAILABLE_IN_ALL GtkPageSetup *gtk_print_context_get_page_setup (GtkPrintContext *context); GDK_AVAILABLE_IN_ALL -gdouble gtk_print_context_get_width (GtkPrintContext *context); +double gtk_print_context_get_width (GtkPrintContext *context); GDK_AVAILABLE_IN_ALL -gdouble gtk_print_context_get_height (GtkPrintContext *context); +double gtk_print_context_get_height (GtkPrintContext *context); GDK_AVAILABLE_IN_ALL -gdouble gtk_print_context_get_dpi_x (GtkPrintContext *context); +double gtk_print_context_get_dpi_x (GtkPrintContext *context); GDK_AVAILABLE_IN_ALL -gdouble gtk_print_context_get_dpi_y (GtkPrintContext *context); +double gtk_print_context_get_dpi_y (GtkPrintContext *context); GDK_AVAILABLE_IN_ALL gboolean gtk_print_context_get_hard_margins (GtkPrintContext *context, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right); + double *top, + double *bottom, + double *left, + double *right); /* Fonts */ GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c index f10b3f7043..76f2a83818 100644 --- a/gtk/gtkprinter.c +++ b/gtk/gtkprinter.c @@ -928,8 +928,8 @@ _gtk_printer_prepare_for_print (GtkPrinter *printer, cairo_surface_t * _gtk_printer_create_cairo_surface (GtkPrinter *printer, GtkPrintSettings *settings, - gdouble width, - gdouble height, + double width, + double height, GIOChannel *cache_io) { GtkPrinterPrivate *priv = gtk_printer_get_instance_private (printer); @@ -999,10 +999,10 @@ gtk_printer_get_default_page_size (GtkPrinter *printer) */ gboolean gtk_printer_get_hard_margins (GtkPrinter *printer, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right) + double *top, + double *bottom, + double *left, + double *right) { GtkPrinterPrivate *priv = gtk_printer_get_instance_private (printer); GtkPrintBackendClass *backend_class = GTK_PRINT_BACKEND_GET_CLASS (priv->backend); @@ -1031,10 +1031,10 @@ gtk_printer_get_hard_margins (GtkPrinter *printer, gboolean gtk_printer_get_hard_margins_for_paper_size (GtkPrinter *printer, GtkPaperSize *paper_size, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right) + double *top, + double *bottom, + double *left, + double *right) { GtkPrinterPrivate *priv = gtk_printer_get_instance_private (printer); GtkPrintBackendClass *backend_class = GTK_PRINT_BACKEND_GET_CLASS (priv->backend); diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h index 71a55bab46..0a259d9b16 100644 --- a/gtk/gtkprinter.h +++ b/gtk/gtkprinter.h @@ -127,17 +127,17 @@ GDK_AVAILABLE_IN_ALL GtkPrintCapabilities gtk_printer_get_capabilities (GtkPrinter *printer); GDK_AVAILABLE_IN_ALL gboolean gtk_printer_get_hard_margins (GtkPrinter *printer, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right); + double *top, + double *bottom, + double *left, + double *right); GDK_AVAILABLE_IN_ALL gboolean gtk_printer_get_hard_margins_for_paper_size (GtkPrinter *printer, GtkPaperSize *paper_size, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right); + double *top, + double *bottom, + double *left, + double *right); /** * GtkPrinterFunc: diff --git a/gtk/gtkprinterprivate.h b/gtk/gtkprinterprivate.h index ed4ecc526d..a3a11b4acc 100644 --- a/gtk/gtkprinterprivate.h +++ b/gtk/gtkprinterprivate.h @@ -60,8 +60,8 @@ void _gtk_printer_prepare_for_print (GtkPrinter GtkPageSetup *page_setup); cairo_surface_t * _gtk_printer_create_cairo_surface (GtkPrinter *printer, GtkPrintSettings *settings, - gdouble width, - gdouble height, + double width, + double height, GIOChannel *cache_io); GHashTable * _gtk_printer_get_custom_widgets (GtkPrinter *printer); diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c index 50f3d68db8..554036bbcc 100644 --- a/gtk/gtkprintjob.c +++ b/gtk/gtkprintjob.c @@ -78,7 +78,7 @@ struct _GtkPrintJob int num_page_ranges; GtkPageSet page_set; int num_copies; - gdouble scale; + double scale; guint number_up; GtkNumberUpLayout number_up_layout; @@ -476,7 +476,7 @@ gtk_print_job_get_surface (GtkPrintJob *job, GError **error) { char *filename = NULL; - gdouble width, height; + double width, height; GtkPaperSize *paper_size; int fd; GError *tmp_error; @@ -813,7 +813,7 @@ gtk_print_job_set_num_copies (GtkPrintJob *job, * * Returns: the scale */ -gdouble +double gtk_print_job_get_scale (GtkPrintJob *job) { @@ -829,7 +829,7 @@ gtk_print_job_get_scale (GtkPrintJob *job) */ void gtk_print_job_set_scale (GtkPrintJob *job, - gdouble scale) + double scale) { job->scale = scale; } diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h index cc300aa10e..54617ee6dc 100644 --- a/gtk/gtkprintjob.h +++ b/gtk/gtkprintjob.h @@ -110,10 +110,10 @@ GDK_AVAILABLE_IN_ALL void gtk_print_job_set_num_copies (GtkPrintJob *job, int num_copies); GDK_AVAILABLE_IN_ALL -gdouble gtk_print_job_get_scale (GtkPrintJob *job); +double gtk_print_job_get_scale (GtkPrintJob *job); GDK_AVAILABLE_IN_ALL void gtk_print_job_set_scale (GtkPrintJob *job, - gdouble scale); + double scale); GDK_AVAILABLE_IN_ALL guint gtk_print_job_get_n_up (GtkPrintJob *job); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkprintoperation-portal.c b/gtk/gtkprintoperation-portal.c index 15bf35c7bc..2ec934dcc3 100644 --- a/gtk/gtkprintoperation-portal.c +++ b/gtk/gtkprintoperation-portal.c @@ -105,7 +105,7 @@ portal_start_page (GtkPrintOperation *op, GtkPrintOperationPortal *op_portal = op->priv->platform_data; GtkPaperSize *paper_size; cairo_surface_type_t type; - gdouble w, h; + double w, h; paper_size = gtk_page_setup_get_paper_size (page_setup); diff --git a/gtk/gtkprintoperation-private.h b/gtk/gtkprintoperation-private.h index 5f178fc4dc..0ac7d19e18 100644 --- a/gtk/gtkprintoperation-private.h +++ b/gtk/gtkprintoperation-private.h @@ -114,8 +114,8 @@ void _gtk_print_operation_platform_backend_launch_preview const char *filename); cairo_surface_t * _gtk_print_operation_platform_backend_create_preview_surface (GtkPrintOperation *op, GtkPageSetup *page_setup, - gdouble *dpi_x, - gdouble *dpi_y, + double *dpi_x, + double *dpi_y, char **target); void _gtk_print_operation_platform_backend_resize_preview_surface (GtkPrintOperation *op, GtkPageSetup *page_setup, @@ -140,10 +140,10 @@ void _gtk_print_context_translate_into_margin (GtkPrintCon void _gtk_print_context_rotate_according_to_orientation (GtkPrintContext *context); void _gtk_print_context_reverse_according_to_orientation (GtkPrintContext *context); void _gtk_print_context_set_hard_margins (GtkPrintContext *context, - gdouble top, - gdouble bottom, - gdouble left, - gdouble right); + double top, + double bottom, + double left, + double right); G_END_DECLS diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c index 61391de98a..6760aafcf9 100644 --- a/gtk/gtkprintoperation-unix.c +++ b/gtk/gtkprintoperation-unix.c @@ -74,7 +74,7 @@ unix_start_page (GtkPrintOperation *op, GtkPrintOperationUnix *op_unix; GtkPaperSize *paper_size; cairo_surface_type_t type; - gdouble w, h; + double w, h; op_unix = op->priv->platform_data; @@ -522,7 +522,7 @@ finish_print (PrintResponseData *rdata, GtkPrintOperation *op = rdata->op; GtkPrintOperationPrivate *priv = op->priv; GtkPrintJob *job; - gdouble top, bottom, left, right; + double top, bottom, left, right; if (rdata->do_print) { @@ -782,14 +782,14 @@ close_preview (void *data) static cairo_surface_t * gtk_print_operation_unix_create_preview_surface (GtkPrintOperation *op, GtkPageSetup *page_setup, - gdouble *dpi_x, - gdouble *dpi_y, + double *dpi_x, + double *dpi_y, char **target) { char *filename; int fd; GtkPaperSize *paper_size; - gdouble w, h; + double w, h; cairo_surface_t *surface; static cairo_user_data_key_t key; @@ -836,7 +836,7 @@ gtk_print_operation_unix_resize_preview_surface (GtkPrintOperation *op, GtkPageSetup *page_setup, cairo_surface_t *surface) { - gdouble w, h; + double w, h; w = gtk_page_setup_get_paper_width (page_setup, GTK_UNIT_POINTS); h = gtk_page_setup_get_paper_height (page_setup, GTK_UNIT_POINTS); @@ -1271,8 +1271,8 @@ _gtk_print_operation_platform_backend_launch_preview (GtkPrintOperation *op, cairo_surface_t * _gtk_print_operation_platform_backend_create_preview_surface (GtkPrintOperation *op, GtkPageSetup *page_setup, - gdouble *dpi_x, - gdouble *dpi_y, + double *dpi_x, + double *dpi_y, char **target) { return gtk_print_operation_unix_create_preview_surface (op, page_setup, dpi_x, dpi_y, target); diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c index 55c0a554fd..00f1a6c381 100644 --- a/gtk/gtkprintoperation-win32.c +++ b/gtk/gtkprintoperation-win32.c @@ -2010,8 +2010,8 @@ _gtk_print_operation_platform_backend_preview_end_page (GtkPrintOperation *op, cairo_surface_t * _gtk_print_operation_platform_backend_create_preview_surface (GtkPrintOperation *op, GtkPageSetup *page_setup, - gdouble *dpi_x, - gdouble *dpi_y, + double *dpi_x, + double *dpi_y, char **target) { GtkPaperSize *paper_size; diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index 5a43683afb..56547c2403 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -643,7 +643,7 @@ gtk_print_operation_preview_handler (GtkPrintOperation *op, GtkPrintContext *context, GtkWindow *parent) { - gdouble dpi_x, dpi_y; + double dpi_x, dpi_y; PreviewOp *pop; GtkPageSetup *page_setup; cairo_t *cr; @@ -870,7 +870,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class) * { * cairo_t *cr; * PangoLayout *layout; - * gdouble width, text_height; + * double width, text_height; * int layout_height; * PangoFontDescription *desc; * @@ -893,7 +893,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class) * pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER); * * pango_layout_get_size (layout, NULL, &layout_height); - * text_height = (gdouble)layout_height / PANGO_SCALE; + * text_height = (double)layout_height / PANGO_SCALE; * * cairo_move_to (cr, width / 2, (HEADER_HEIGHT - text_height) / 2); * pango_cairo_show_layout (cr, layout); @@ -1948,7 +1948,7 @@ pdf_start_page (GtkPrintOperation *op, GtkPageSetup *page_setup) { cairo_surface_t *surface = op->priv->platform_data; - gdouble w, h; + double w, h; w = gtk_page_setup_get_paper_width (page_setup, GTK_UNIT_POINTS); h = gtk_page_setup_get_paper_height (page_setup, GTK_UNIT_POINTS); @@ -1994,7 +1994,7 @@ run_pdf (GtkPrintOperation *op, GtkPageSetup *page_setup; cairo_surface_t *surface; cairo_t *cr; - gdouble width, height; + double width, height; priv->print_context = _gtk_print_context_new (op); @@ -2390,13 +2390,13 @@ common_render_page (GtkPrintOperation *op, else { GtkPageOrientation orientation; - gdouble paper_width, paper_height; - gdouble page_width, page_height; - gdouble context_width, context_height; - gdouble bottom_margin, top_margin, left_margin, right_margin; - gdouble x_step, y_step; - gdouble x_scale, y_scale, scale; - gdouble horizontal_offset = 0.0, vertical_offset = 0.0; + double paper_width, paper_height; + double page_width, page_height; + double context_width, context_height; + double bottom_margin, top_margin, left_margin, right_margin; + double x_step, y_step; + double x_scale, y_scale, scale; + double horizontal_offset = 0.0, vertical_offset = 0.0; int columns, rows, x, y, tmp_length; page_setup = gtk_print_context_get_page_setup (print_context); diff --git a/gtk/gtkprintsettings.c b/gtk/gtkprintsettings.c index 261e2c74e2..0df67a23e6 100644 --- a/gtk/gtkprintsettings.c +++ b/gtk/gtkprintsettings.c @@ -309,10 +309,10 @@ gtk_print_settings_set_bool (GtkPrintSettings *settings, * * Returns: the floating point number associated with @key */ -gdouble +double gtk_print_settings_get_double_with_default (GtkPrintSettings *settings, const char *key, - gdouble def) + double def) { const char *val; @@ -332,7 +332,7 @@ gtk_print_settings_get_double_with_default (GtkPrintSettings *settings, * * Returns: the double value of @key */ -gdouble +double gtk_print_settings_get_double (GtkPrintSettings *settings, const char *key) { @@ -350,7 +350,7 @@ gtk_print_settings_get_double (GtkPrintSettings *settings, void gtk_print_settings_set_double (GtkPrintSettings *settings, const char *key, - gdouble value) + double value) { char buf[G_ASCII_DTOSTR_BUF_SIZE]; @@ -369,12 +369,12 @@ gtk_print_settings_set_double (GtkPrintSettings *settings, * * Returns: the length value of @key, converted to @unit */ -gdouble +double gtk_print_settings_get_length (GtkPrintSettings *settings, const char *key, GtkUnit unit) { - gdouble length = gtk_print_settings_get_double (settings, key); + double length = gtk_print_settings_get_double (settings, key); return _gtk_print_convert_from_mm (length, unit); } @@ -390,7 +390,7 @@ gtk_print_settings_get_length (GtkPrintSettings *settings, void gtk_print_settings_set_length (GtkPrintSettings *settings, const char *key, - gdouble value, + double value, GtkUnit unit) { gtk_print_settings_set_double (settings, key, @@ -580,7 +580,7 @@ gtk_print_settings_get_paper_size (GtkPrintSettings *settings) { const char *val; const char *name; - gdouble w, h; + double w, h; val = gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_PAPER_FORMAT); if (val == NULL) @@ -648,7 +648,7 @@ gtk_print_settings_set_paper_size (GtkPrintSettings *settings, * * Returns: the paper width, in units of @unit */ -gdouble +double gtk_print_settings_get_paper_width (GtkPrintSettings *settings, GtkUnit unit) { @@ -665,7 +665,7 @@ gtk_print_settings_get_paper_width (GtkPrintSettings *settings, */ void gtk_print_settings_set_paper_width (GtkPrintSettings *settings, - gdouble width, + double width, GtkUnit unit) { gtk_print_settings_set_length (settings, GTK_PRINT_SETTINGS_PAPER_WIDTH, width, unit); @@ -681,7 +681,7 @@ gtk_print_settings_set_paper_width (GtkPrintSettings *settings, * * Returns: the paper height, in units of @unit */ -gdouble +double gtk_print_settings_get_paper_height (GtkPrintSettings *settings, GtkUnit unit) { @@ -700,7 +700,7 @@ gtk_print_settings_get_paper_height (GtkPrintSettings *settings, */ void gtk_print_settings_set_paper_height (GtkPrintSettings *settings, - gdouble height, + double height, GtkUnit unit) { gtk_print_settings_set_length (settings, @@ -1195,7 +1195,7 @@ gtk_print_settings_set_resolution_xy (GtkPrintSettings *settings, * * Returns: the resolution in lpi (lines per inch) */ -gdouble +double gtk_print_settings_get_printer_lpi (GtkPrintSettings *settings) { return gtk_print_settings_get_double_with_default (settings, GTK_PRINT_SETTINGS_PRINTER_LPI, 150.0); @@ -1210,7 +1210,7 @@ gtk_print_settings_get_printer_lpi (GtkPrintSettings *settings) */ void gtk_print_settings_set_printer_lpi (GtkPrintSettings *settings, - gdouble lpi) + double lpi) { gtk_print_settings_set_double (settings, GTK_PRINT_SETTINGS_PRINTER_LPI, lpi); @@ -1224,7 +1224,7 @@ gtk_print_settings_set_printer_lpi (GtkPrintSettings *settings, * * Returns: the scale in percent */ -gdouble +double gtk_print_settings_get_scale (GtkPrintSettings *settings) { return gtk_print_settings_get_double_with_default (settings, @@ -1241,7 +1241,7 @@ gtk_print_settings_get_scale (GtkPrintSettings *settings) */ void gtk_print_settings_set_scale (GtkPrintSettings *settings, - gdouble scale) + double scale) { gtk_print_settings_set_double (settings, GTK_PRINT_SETTINGS_SCALE, scale); diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h index 2b624c06ef..3c8363d27e 100644 --- a/gtk/gtkprintsettings.h +++ b/gtk/gtkprintsettings.h @@ -108,24 +108,24 @@ void gtk_print_settings_set_bool (GtkPrintSettings const char *key, gboolean value); GDK_AVAILABLE_IN_ALL -gdouble gtk_print_settings_get_double (GtkPrintSettings *settings, +double gtk_print_settings_get_double (GtkPrintSettings *settings, const char *key); GDK_AVAILABLE_IN_ALL -gdouble gtk_print_settings_get_double_with_default (GtkPrintSettings *settings, +double gtk_print_settings_get_double_with_default (GtkPrintSettings *settings, const char *key, - gdouble def); + double def); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_double (GtkPrintSettings *settings, const char *key, - gdouble value); + double value); GDK_AVAILABLE_IN_ALL -gdouble gtk_print_settings_get_length (GtkPrintSettings *settings, +double gtk_print_settings_get_length (GtkPrintSettings *settings, const char *key, GtkUnit unit); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_length (GtkPrintSettings *settings, const char *key, - gdouble value, + double value, GtkUnit unit); GDK_AVAILABLE_IN_ALL int gtk_print_settings_get_int (GtkPrintSettings *settings, @@ -221,18 +221,18 @@ GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_paper_size (GtkPrintSettings *settings, GtkPaperSize *paper_size); GDK_AVAILABLE_IN_ALL -gdouble gtk_print_settings_get_paper_width (GtkPrintSettings *settings, +double gtk_print_settings_get_paper_width (GtkPrintSettings *settings, GtkUnit unit); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_paper_width (GtkPrintSettings *settings, - gdouble width, + double width, GtkUnit unit); GDK_AVAILABLE_IN_ALL -gdouble gtk_print_settings_get_paper_height (GtkPrintSettings *settings, +double gtk_print_settings_get_paper_height (GtkPrintSettings *settings, GtkUnit unit); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_paper_height (GtkPrintSettings *settings, - gdouble height, + double height, GtkUnit unit); GDK_AVAILABLE_IN_ALL gboolean gtk_print_settings_get_use_color (GtkPrintSettings *settings); @@ -288,15 +288,15 @@ void gtk_print_settings_set_resolution_xy (GtkPrintSettings int resolution_x, int resolution_y); GDK_AVAILABLE_IN_ALL -gdouble gtk_print_settings_get_printer_lpi (GtkPrintSettings *settings); +double gtk_print_settings_get_printer_lpi (GtkPrintSettings *settings); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_printer_lpi (GtkPrintSettings *settings, - gdouble lpi); + double lpi); GDK_AVAILABLE_IN_ALL -gdouble gtk_print_settings_get_scale (GtkPrintSettings *settings); +double gtk_print_settings_get_scale (GtkPrintSettings *settings); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_scale (GtkPrintSettings *settings, - gdouble scale); + double scale); GDK_AVAILABLE_IN_ALL GtkPrintPages gtk_print_settings_get_print_pages (GtkPrintSettings *settings); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index 2b1c89e346..26a25a6cfc 100644 --- a/gtk/gtkprintunixdialog.c +++ b/gtk/gtkprintunixdialog.c @@ -2192,7 +2192,7 @@ dialog_set_print_pages (GtkPrintUnixDialog *dialog, gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->all_pages_radio), TRUE); } -static gdouble +static double dialog_get_scale (GtkPrintUnixDialog *dialog) { if (gtk_widget_is_sensitive (dialog->scale_spin)) @@ -2203,7 +2203,7 @@ dialog_get_scale (GtkPrintUnixDialog *dialog) static void dialog_set_scale (GtkPrintUnixDialog *dialog, - gdouble val) + double val) { gtk_spin_button_set_value (GTK_SPIN_BUTTON (dialog->scale_spin), val); } @@ -2359,10 +2359,10 @@ draw_page (GtkDrawingArea *da, GtkWidget *widget = GTK_WIDGET (da); GtkPrintUnixDialog *dialog = GTK_PRINT_UNIX_DIALOG (data); GtkStyleContext *context; - gdouble ratio; + double ratio; int w, h, tmp; int pages_x, pages_y, i, x, y, layout_w, layout_h; - gdouble page_width, page_height; + double page_width, page_height; GtkPageOrientation orientation; gboolean landscape; PangoLayout *layout; @@ -2374,8 +2374,8 @@ draw_page (GtkDrawingArea *da, int dx, dy; gboolean horizontal; GtkPageSetup *page_setup; - gdouble paper_width, paper_height; - gdouble pos_x, pos_y; + double paper_width, paper_height; + double pos_x, pos_y; int pages_per_sheet; gboolean ltr = TRUE; @@ -2479,8 +2479,8 @@ draw_page (GtkDrawingArea *da, i = 1; - page_width = (gdouble)w / pages_x; - page_height = (gdouble)h / pages_y; + page_width = (double)w / pages_x; + page_height = (double)h / pages_y; layout = pango_cairo_create_layout (cr); diff --git a/gtk/gtkprintutils.c b/gtk/gtkprintutils.c index a8b1d835cc..a8e2095b2b 100644 --- a/gtk/gtkprintutils.c +++ b/gtk/gtkprintutils.c @@ -19,8 +19,8 @@ #include "config.h" #include "gtkprintutils.h" -gdouble -_gtk_print_convert_to_mm (gdouble len, +double +_gtk_print_convert_to_mm (double len, GtkUnit unit) { switch (unit) @@ -39,8 +39,8 @@ _gtk_print_convert_to_mm (gdouble len, } } -gdouble -_gtk_print_convert_from_mm (gdouble len, +double +_gtk_print_convert_from_mm (double len, GtkUnit unit) { switch (unit) diff --git a/gtk/gtkprintutils.h b/gtk/gtkprintutils.h index 47678b37fd..7b4596a568 100644 --- a/gtk/gtkprintutils.h +++ b/gtk/gtkprintutils.h @@ -27,8 +27,8 @@ G_BEGIN_DECLS #define MM_PER_INCH 25.4 #define POINTS_PER_INCH 72 -gdouble _gtk_print_convert_to_mm (gdouble len, GtkUnit unit); -gdouble _gtk_print_convert_from_mm (gdouble len, GtkUnit unit); +double _gtk_print_convert_to_mm (double len, GtkUnit unit); +double _gtk_print_convert_from_mm (double len, GtkUnit unit); G_END_DECLS diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h index f3c7148b2e..9a128c3c03 100644 --- a/gtk/gtkprivate.h +++ b/gtk/gtkprivate.h @@ -96,8 +96,8 @@ guint32 gtk_get_current_event_time (void); void check_crossing_invariants (GtkWidget *widget, GtkCrossingData *crossing); -gdouble _gtk_get_slowdown (void); -void _gtk_set_slowdown (gdouble slowdown_factor); +double _gtk_get_slowdown (void); +void _gtk_set_slowdown (double slowdown_factor); char *gtk_get_portal_request_path (GDBusConnection *connection, char **token); diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 7f020026ed..3a1fecf23c 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -101,8 +101,8 @@ struct _GtkProgressBar GtkWidget *trough_widget; GtkWidget *progress_widget; - gdouble fraction; - gdouble pulse_fraction; + double fraction; + double pulse_fraction; double activity_pos; guint activity_blocks; @@ -113,7 +113,7 @@ struct _GtkProgressBar GtkProgressTracker tracker; gint64 pulse1; gint64 pulse2; - gdouble last_iteration; + double last_iteration; guint activity_dir : 1; guint activity_mode : 1; @@ -587,7 +587,7 @@ tick_cb (GtkWidget *widget, { GtkProgressBar *pbar = GTK_PROGRESS_BAR (widget); gint64 frame_time; - gdouble iteration, pulse_iterations, current_iterations, fraction; + double iteration, pulse_iterations, current_iterations, fraction; if (pbar->pulse2 == 0 && pbar->pulse1 == 0) return G_SOURCE_CONTINUE; @@ -714,7 +714,7 @@ gtk_progress_bar_set_activity_mode (GtkProgressBar *pbar, */ void gtk_progress_bar_set_fraction (GtkProgressBar *pbar, - gdouble fraction) + double fraction) { g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar)); @@ -884,7 +884,7 @@ gtk_progress_bar_get_show_text (GtkProgressBar *pbar) */ void gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar, - gdouble fraction) + double fraction) { g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar)); @@ -991,7 +991,7 @@ gtk_progress_bar_get_text (GtkProgressBar *pbar) * * Returns: a fraction from 0.0 to 1.0 */ -gdouble +double gtk_progress_bar_get_fraction (GtkProgressBar *pbar) { g_return_val_if_fail (GTK_IS_PROGRESS_BAR (pbar), 0); @@ -1007,7 +1007,7 @@ gtk_progress_bar_get_fraction (GtkProgressBar *pbar) * * Returns: a fraction from 0.0 to 1.0 */ -gdouble +double gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar) { g_return_val_if_fail (GTK_IS_PROGRESS_BAR (pbar), 0); diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h index dcacd26b8a..75dc092d07 100644 --- a/gtk/gtkprogressbar.h +++ b/gtk/gtkprogressbar.h @@ -53,11 +53,11 @@ void gtk_progress_bar_set_text (GtkProgressBar *pbar, const char *text); GDK_AVAILABLE_IN_ALL void gtk_progress_bar_set_fraction (GtkProgressBar *pbar, - gdouble fraction); + double fraction); GDK_AVAILABLE_IN_ALL void gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar, - gdouble fraction); + double fraction); GDK_AVAILABLE_IN_ALL void gtk_progress_bar_set_inverted (GtkProgressBar *pbar, gboolean inverted); @@ -65,9 +65,9 @@ void gtk_progress_bar_set_inverted (GtkProgressBar *pbar, GDK_AVAILABLE_IN_ALL const char * gtk_progress_bar_get_text (GtkProgressBar *pbar); GDK_AVAILABLE_IN_ALL -gdouble gtk_progress_bar_get_fraction (GtkProgressBar *pbar); +double gtk_progress_bar_get_fraction (GtkProgressBar *pbar); GDK_AVAILABLE_IN_ALL -gdouble gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar); +double gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar); GDK_AVAILABLE_IN_ALL gboolean gtk_progress_bar_get_inverted (GtkProgressBar *pbar); diff --git a/gtk/gtkprogresstracker.c b/gtk/gtkprogresstracker.c index 0ddcbfbe4c..e39c26c7bf 100644 --- a/gtk/gtkprogresstracker.c +++ b/gtk/gtkprogresstracker.c @@ -36,15 +36,15 @@ * the speed of animations. This can be useful for debugging. */ -static gdouble gtk_slowdown = 1.0; +static double gtk_slowdown = 1.0; void -_gtk_set_slowdown (gdouble factor) +_gtk_set_slowdown (double factor) { gtk_slowdown = factor; } -gdouble +double _gtk_get_slowdown (void) { return gtk_slowdown; @@ -77,12 +77,12 @@ void gtk_progress_tracker_start (GtkProgressTracker *tracker, guint64 duration, gint64 delay, - gdouble iteration_count) + double iteration_count) { tracker->is_running = TRUE; tracker->last_frame_time = 0; tracker->duration = duration; - tracker->iteration = - delay / (gdouble) MAX (duration, 1); + tracker->iteration = - delay / (double) MAX (duration, 1); tracker->iteration_count = iteration_count; } @@ -110,7 +110,7 @@ void gtk_progress_tracker_advance_frame (GtkProgressTracker *tracker, guint64 frame_time) { - gdouble delta; + double delta; if (!tracker->is_running) return; @@ -182,7 +182,7 @@ gtk_progress_tracker_get_state (GtkProgressTracker *tracker) * * Returns: The current iteration. **/ -gdouble +double gtk_progress_tracker_get_iteration (GtkProgressTracker *tracker) { return tracker->is_running ? CLAMP (tracker->iteration, 0.0, tracker->iteration_count) : 1.0; @@ -202,7 +202,7 @@ gtk_progress_tracker_get_iteration (GtkProgressTracker *tracker) guint64 gtk_progress_tracker_get_iteration_cycle (GtkProgressTracker *tracker) { - gdouble iteration = gtk_progress_tracker_get_iteration (tracker); + double iteration = gtk_progress_tracker_get_iteration (tracker); /* Some complexity here. We want an iteration of 0.0 to always map to 0 (start * of the first iteration), but an iteration of 1.0 to also map to 0 (end of @@ -225,11 +225,11 @@ gtk_progress_tracker_get_iteration_cycle (GtkProgressTracker *tracker) * * Returns: The progress value. **/ -gdouble +double gtk_progress_tracker_get_progress (GtkProgressTracker *tracker, gboolean reversed) { - gdouble progress, iteration; + double progress, iteration; guint64 iteration_cycle; iteration = gtk_progress_tracker_get_iteration (tracker); @@ -242,10 +242,10 @@ gtk_progress_tracker_get_progress (GtkProgressTracker *tracker, /* From clutter-easing.c, based on Robert Penner's * infamous easing equations, MIT license. */ -static gdouble -ease_out_cubic (gdouble t) +static double +ease_out_cubic (double t) { - gdouble p = t - 1; + double p = t - 1; return p * p * p + 1; } @@ -259,10 +259,10 @@ ease_out_cubic (gdouble t) * * Returns: The eased progress value. **/ -gdouble +double gtk_progress_tracker_get_ease_out_cubic (GtkProgressTracker *tracker, gboolean reversed) { - gdouble progress = gtk_progress_tracker_get_progress (tracker, reversed); + double progress = gtk_progress_tracker_get_progress (tracker, reversed); return ease_out_cubic (progress); } diff --git a/gtk/gtkprogresstrackerprivate.h b/gtk/gtkprogresstrackerprivate.h index 1355dae95b..95adfe5f4d 100644 --- a/gtk/gtkprogresstrackerprivate.h +++ b/gtk/gtkprogresstrackerprivate.h @@ -38,8 +38,8 @@ struct _GtkProgressTracker gboolean is_running; guint64 last_frame_time; guint64 duration; - gdouble iteration; - gdouble iteration_count; + double iteration; + double iteration_count; }; void gtk_progress_tracker_init_copy (GtkProgressTracker *source, @@ -48,7 +48,7 @@ void gtk_progress_tracker_init_copy (GtkProgressTracke void gtk_progress_tracker_start (GtkProgressTracker *tracker, guint64 duration, gint64 delay, - gdouble iteration_count); + double iteration_count); void gtk_progress_tracker_finish (GtkProgressTracker *tracker); @@ -60,14 +60,14 @@ void gtk_progress_tracker_skip_frame (GtkProgressTracke GtkProgressState gtk_progress_tracker_get_state (GtkProgressTracker *tracker); -gdouble gtk_progress_tracker_get_iteration (GtkProgressTracker *tracker); +double gtk_progress_tracker_get_iteration (GtkProgressTracker *tracker); guint64 gtk_progress_tracker_get_iteration_cycle (GtkProgressTracker *tracker); -gdouble gtk_progress_tracker_get_progress (GtkProgressTracker *tracker, +double gtk_progress_tracker_get_progress (GtkProgressTracker *tracker, gboolean reverse); -gdouble gtk_progress_tracker_get_ease_out_cubic (GtkProgressTracker *tracker, +double gtk_progress_tracker_get_ease_out_cubic (GtkProgressTracker *tracker, gboolean reverse); G_END_DECLS diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index e8b87a1e88..cc963ed2bc 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -89,8 +89,8 @@ struct _GtkRangePrivate GtkOrientation orientation; - gdouble fill_level; - gdouble *marks; + double fill_level; + double *marks; int *mark_pos; int n_marks; @@ -165,25 +165,25 @@ static void gtk_range_unmap (GtkWidget *widget); static void gtk_range_click_gesture_pressed (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkRange *range); static void gtk_range_click_gesture_released (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkRange *range); static void gtk_range_drag_gesture_begin (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkRange *range); static void gtk_range_drag_gesture_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkRange *range); static void gtk_range_long_press_gesture_pressed (GtkGestureLongPress *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkRange *range); @@ -201,7 +201,7 @@ static void gtk_range_move_slider (GtkRange *range, /* Internals */ static void gtk_range_compute_slider_position (GtkRange *range, - gdouble adjustment_value, + double adjustment_value, GdkRectangle *slider_rect); static gboolean gtk_range_scroll (GtkRange *range, GtkScrollType scroll); @@ -215,7 +215,7 @@ static void gtk_range_add_step_timer (GtkRange *range, static void gtk_range_remove_step_timer (GtkRange *range); static gboolean gtk_range_real_change_value (GtkRange *range, GtkScrollType scroll, - gdouble value); + double value); static gboolean gtk_range_key_controller_key_pressed (GtkEventControllerKey *controller, guint keyval, guint keycode, @@ -238,8 +238,8 @@ static void gtk_range_render_trough (GtkGizmo *gizmo, GtkSnapshot *snapshot); static gboolean gtk_range_scroll_controller_scroll (GtkEventControllerScroll *scroll, - gdouble dx, - gdouble dy, + double dx, + double dy, GtkRange *range); G_DEFINE_TYPE_WITH_CODE (GtkRange, gtk_range, GTK_TYPE_WIDGET, @@ -989,8 +989,8 @@ gtk_range_get_slider_range (GtkRange *range, **/ void gtk_range_set_increments (GtkRange *range, - gdouble step, - gdouble page) + double step, + double page) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); GtkAdjustment *adjustment; @@ -1020,12 +1020,12 @@ gtk_range_set_increments (GtkRange *range, **/ void gtk_range_set_range (GtkRange *range, - gdouble min, - gdouble max) + double min, + double max) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); GtkAdjustment *adjustment; - gdouble value; + double value; g_return_if_fail (GTK_IS_RANGE (range)); g_return_if_fail (min <= max); @@ -1058,7 +1058,7 @@ gtk_range_set_range (GtkRange *range, **/ void gtk_range_set_value (GtkRange *range, - gdouble value) + double value) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); @@ -1079,7 +1079,7 @@ gtk_range_set_value (GtkRange *range, * * Returns: current value of the range. **/ -gdouble +double gtk_range_get_value (GtkRange *range) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); @@ -1217,7 +1217,7 @@ gtk_range_get_restrict_to_fill_level (GtkRange *range) **/ void gtk_range_set_fill_level (GtkRange *range, - gdouble fill_level) + double fill_level) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); @@ -1244,7 +1244,7 @@ gtk_range_set_fill_level (GtkRange *range, * * Returns: The current fill level **/ -gdouble +double gtk_range_get_fill_level (GtkRange *range) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); @@ -1713,13 +1713,13 @@ range_get_scroll_for_grab (GtkRange *range) return GTK_SCROLL_NONE; } -static gdouble +static double coord_to_value (GtkRange *range, - gdouble coord) + double coord) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); - gdouble frac; - gdouble value; + double frac; + double value; int trough_length; int slider_length; graphene_rect_t slider_bounds; @@ -1823,8 +1823,8 @@ update_initial_slider_position (GtkRange *range, static void gtk_range_long_press_gesture_pressed (GtkGestureLongPress *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkRange *range) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); @@ -1842,8 +1842,8 @@ gtk_range_long_press_gesture_pressed (GtkGestureLongPress *gesture, static void gtk_range_click_gesture_pressed (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkRange *range) { GtkWidget *widget = GTK_WIDGET (range); @@ -1925,7 +1925,7 @@ gtk_range_click_gesture_pressed (GtkGestureClick *gesture, { /* jump by pages */ GtkScrollType scroll; - gdouble click_value; + double click_value; click_value = coord_to_value (range, priv->orientation == GTK_ORIENTATION_VERTICAL ? @@ -1941,7 +1941,7 @@ gtk_range_click_gesture_pressed (GtkGestureClick *gesture, button == GDK_BUTTON_SECONDARY) { /* autoscroll */ - gdouble click_value; + double click_value; click_value = coord_to_value (range, priv->orientation == GTK_ORIENTATION_VERTICAL ? @@ -1964,8 +1964,8 @@ gtk_range_click_gesture_pressed (GtkGestureClick *gesture, static void gtk_range_click_gesture_released (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkRange *range) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); @@ -1982,14 +1982,14 @@ update_slider_position (GtkRange *range, { GtkRangePrivate *priv = gtk_range_get_instance_private (range); graphene_rect_t trough_bounds; - gdouble delta; - gdouble c; - gdouble new_value; + double delta; + double c; + double new_value; gboolean handled; - gdouble next_value; - gdouble mark_value; - gdouble mark_delta; - gdouble zoom; + double next_value; + double mark_value; + double mark_delta; + double zoom; int i; double x, y; @@ -2086,10 +2086,10 @@ autoscroll_cb (GtkWidget *widget, GtkRange *range = GTK_RANGE (data); GtkRangePrivate *priv = gtk_range_get_instance_private (range); GtkAdjustment *adj = priv->adjustment; - gdouble increment; - gdouble value; + double increment; + double value; gboolean handled; - gdouble step, page; + double step, page; step = gtk_adjustment_get_step_increment (adj); page = gtk_adjustment_get_page_increment (adj); @@ -2111,8 +2111,8 @@ autoscroll_cb (GtkWidget *widget, case GTK_SCROLL_START: case GTK_SCROLL_END: { - gdouble x, y; - gdouble distance, t; + double x, y; + double distance, t; /* Vary scrolling speed from slow (ie step) to fast (2 * page), * based on the distance of the pointer from the widget. We start @@ -2173,12 +2173,12 @@ stop_scrolling (GtkRange *range) static gboolean gtk_range_scroll_controller_scroll (GtkEventControllerScroll *scroll, - gdouble dx, - gdouble dy, + double dx, + double dy, GtkRange *range) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); - gdouble scroll_unit, delta; + double scroll_unit, delta; gboolean handled; GtkOrientation move_orientation; @@ -2252,12 +2252,12 @@ update_autoscroll_mode (GtkRange *range, static void gtk_range_drag_gesture_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkRange *range) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); - gdouble start_x, start_y; + double start_x, start_y; if (priv->grab_location == priv->slider_widget) { @@ -2276,8 +2276,8 @@ gtk_range_drag_gesture_update (GtkGestureDrag *gesture, static void gtk_range_drag_gesture_begin (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkRange *range) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); @@ -2332,12 +2332,12 @@ gtk_range_adjustment_value_changed (GtkAdjustment *adjustment, static void apply_marks (GtkRange *range, - gdouble oldval, - gdouble *newval) + double oldval, + double *newval) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); int i; - gdouble mark; + double mark; for (i = 0; i < priv->n_marks; i++) { @@ -2355,7 +2355,7 @@ static void step_back (GtkRange *range) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); - gdouble newval; + double newval; gboolean handled; newval = gtk_adjustment_get_value (priv->adjustment) - gtk_adjustment_get_step_increment (priv->adjustment); @@ -2368,7 +2368,7 @@ static void step_forward (GtkRange *range) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); - gdouble newval; + double newval; gboolean handled; newval = gtk_adjustment_get_value (priv->adjustment) + gtk_adjustment_get_step_increment (priv->adjustment); @@ -2382,7 +2382,7 @@ static void page_back (GtkRange *range) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); - gdouble newval; + double newval; gboolean handled; newval = gtk_adjustment_get_value (priv->adjustment) - gtk_adjustment_get_page_increment (priv->adjustment); @@ -2395,7 +2395,7 @@ static void page_forward (GtkRange *range) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); - gdouble newval; + double newval; gboolean handled; newval = gtk_adjustment_get_value (priv->adjustment) + gtk_adjustment_get_page_increment (priv->adjustment); @@ -2419,7 +2419,7 @@ static void scroll_end (GtkRange *range) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); - gdouble newval; + double newval; gboolean handled; newval = gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment); @@ -2432,7 +2432,7 @@ gtk_range_scroll (GtkRange *range, GtkScrollType scroll) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); - gdouble old_value = gtk_adjustment_get_value (priv->adjustment); + double old_value = gtk_adjustment_get_value (priv->adjustment); switch (scroll) { @@ -2535,7 +2535,7 @@ gtk_range_move_slider (GtkRange *range, static void gtk_range_compute_slider_position (GtkRange *range, - gdouble adjustment_value, + double adjustment_value, GdkRectangle *slider_rect) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); @@ -2653,7 +2653,7 @@ gtk_range_calc_marks (GtkRange *range) static gboolean gtk_range_real_change_value (GtkRange *range, GtkScrollType scroll, - gdouble value) + double value) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); @@ -2669,7 +2669,7 @@ gtk_range_real_change_value (GtkRange *range, if (priv->round_digits >= 0) { - gdouble power; + double power; int i; i = priv->round_digits; @@ -2779,14 +2779,14 @@ _gtk_range_get_has_origin (GtkRange *range) void _gtk_range_set_stop_values (GtkRange *range, - gdouble *values, + double *values, int n_values) { GtkRangePrivate *priv = gtk_range_get_instance_private (range); int i; g_free (priv->marks); - priv->marks = g_new (gdouble, n_values); + priv->marks = g_new (double, n_values); g_free (priv->mark_pos); priv->mark_pos = g_new (int, n_values); diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h index 2a256381b0..8d83a13f46 100644 --- a/gtk/gtkrange.h +++ b/gtk/gtkrange.h @@ -57,7 +57,7 @@ struct _GtkRangeClass void (* value_changed) (GtkRange *range); void (* adjust_bounds) (GtkRange *range, - gdouble new_value); + double new_value); /* action signals for keybindings */ void (* move_slider) (GtkRange *range, @@ -69,7 +69,7 @@ struct _GtkRangeClass gboolean (* change_value) (GtkRange *range, GtkScrollType scroll, - gdouble new_value); + double new_value); /*< private > */ @@ -114,17 +114,17 @@ void gtk_range_get_slider_range (GtkRange *range GDK_AVAILABLE_IN_ALL void gtk_range_set_increments (GtkRange *range, - gdouble step, - gdouble page); + double step, + double page); GDK_AVAILABLE_IN_ALL void gtk_range_set_range (GtkRange *range, - gdouble min, - gdouble max); + double min, + double max); GDK_AVAILABLE_IN_ALL void gtk_range_set_value (GtkRange *range, - gdouble value); + double value); GDK_AVAILABLE_IN_ALL -gdouble gtk_range_get_value (GtkRange *range); +double gtk_range_get_value (GtkRange *range); GDK_AVAILABLE_IN_ALL void gtk_range_set_show_fill_level (GtkRange *range, @@ -138,9 +138,9 @@ GDK_AVAILABLE_IN_ALL gboolean gtk_range_get_restrict_to_fill_level (GtkRange *range); GDK_AVAILABLE_IN_ALL void gtk_range_set_fill_level (GtkRange *range, - gdouble fill_level); + double fill_level); GDK_AVAILABLE_IN_ALL -gdouble gtk_range_get_fill_level (GtkRange *range); +double gtk_range_get_fill_level (GtkRange *range); GDK_AVAILABLE_IN_ALL void gtk_range_set_round_digits (GtkRange *range, int round_digits); diff --git a/gtk/gtkrangeprivate.h b/gtk/gtkrangeprivate.h index d50ed52d7f..f369fec4d0 100644 --- a/gtk/gtkrangeprivate.h +++ b/gtk/gtkrangeprivate.h @@ -36,7 +36,7 @@ void _gtk_range_set_has_origin (GtkRange *range gboolean has_origin); gboolean _gtk_range_get_has_origin (GtkRange *range); void _gtk_range_set_stop_values (GtkRange *range, - gdouble *values, + double *values, int n_values); int _gtk_range_get_stop_positions (GtkRange *range, int **values); diff --git a/gtk/gtkrender.c b/gtk/gtkrender.c index 6ddfa4998a..e095832cc3 100644 --- a/gtk/gtkrender.c +++ b/gtk/gtkrender.c @@ -37,10 +37,10 @@ static void gtk_do_render_icon (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height) + double x, + double y, + double width, + double height) { GtkSnapshot *snapshot; GskRenderNode *node; @@ -81,10 +81,10 @@ gtk_do_render_icon (GtkStyleContext *context, void gtk_render_check (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height) + double x, + double y, + double width, + double height) { g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); @@ -115,10 +115,10 @@ gtk_render_check (GtkStyleContext *context, void gtk_render_option (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height) + double x, + double y, + double width, + double height) { g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); @@ -147,10 +147,10 @@ gtk_render_option (GtkStyleContext *context, void gtk_render_arrow (GtkStyleContext *context, cairo_t *cr, - gdouble angle, - gdouble x, - gdouble y, - gdouble size) + double angle, + double x, + double y, + double size) { g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); @@ -180,10 +180,10 @@ gtk_render_arrow (GtkStyleContext *context, void gtk_render_background (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height) + double x, + double y, + double width, + double height) { GtkSnapshot *snapshot; GskRenderNode *node; @@ -226,10 +226,10 @@ gtk_render_background (GtkStyleContext *context, void gtk_render_frame (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height) + double x, + double y, + double width, + double height) { GtkSnapshot *snapshot; GskRenderNode *node; @@ -273,10 +273,10 @@ gtk_render_frame (GtkStyleContext *context, void gtk_render_expander (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height) + double x, + double y, + double width, + double height) { g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); @@ -305,10 +305,10 @@ gtk_render_expander (GtkStyleContext *context, void gtk_render_focus (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height) + double x, + double y, + double width, + double height) { GtkSnapshot *snapshot; GskRenderNode *node; @@ -345,8 +345,8 @@ gtk_render_focus (GtkStyleContext *context, void gtk_render_layout (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, + double x, + double y, PangoLayout *layout) { GtkSnapshot *snapshot; @@ -372,10 +372,10 @@ gtk_render_layout (GtkStyleContext *context, static void gtk_do_render_line (GtkStyleContext *context, cairo_t *cr, - gdouble x0, - gdouble y0, - gdouble x1, - gdouble y1) + double x0, + double y0, + double x1, + double y1) { const GdkRGBA *color; @@ -409,10 +409,10 @@ gtk_do_render_line (GtkStyleContext *context, void gtk_render_line (GtkStyleContext *context, cairo_t *cr, - gdouble x0, - gdouble y0, - gdouble x1, - gdouble y1) + double x0, + double y0, + double x1, + double y1) { g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); @@ -440,10 +440,10 @@ gtk_render_line (GtkStyleContext *context, void gtk_render_handle (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height) + double x, + double y, + double width, + double height) { g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); @@ -473,10 +473,10 @@ gtk_render_handle (GtkStyleContext *context, void gtk_render_activity (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height) + double x, + double y, + double width, + double height) { g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); @@ -506,8 +506,8 @@ void gtk_render_icon (GtkStyleContext *context, cairo_t *cr, GdkTexture *texture, - gdouble x, - gdouble y) + double x, + double y) { GtkSnapshot *snapshot; GskRenderNode *node; diff --git a/gtk/gtkrender.h b/gtk/gtkrender.h index 645e7d6c15..7e4b0b5f15 100644 --- a/gtk/gtkrender.h +++ b/gtk/gtkrender.h @@ -34,94 +34,94 @@ G_BEGIN_DECLS GDK_AVAILABLE_IN_ALL void gtk_render_check (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height); + double x, + double y, + double width, + double height); GDK_AVAILABLE_IN_ALL void gtk_render_option (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height); + double x, + double y, + double width, + double height); GDK_AVAILABLE_IN_ALL void gtk_render_arrow (GtkStyleContext *context, cairo_t *cr, - gdouble angle, - gdouble x, - gdouble y, - gdouble size); + double angle, + double x, + double y, + double size); GDK_AVAILABLE_IN_ALL void gtk_render_background (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height); + double x, + double y, + double width, + double height); GDK_AVAILABLE_IN_ALL void gtk_render_frame (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height); + double x, + double y, + double width, + double height); GDK_AVAILABLE_IN_ALL void gtk_render_expander (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height); + double x, + double y, + double width, + double height); GDK_AVAILABLE_IN_ALL void gtk_render_focus (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height); + double x, + double y, + double width, + double height); GDK_AVAILABLE_IN_ALL void gtk_render_layout (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, + double x, + double y, PangoLayout *layout); GDK_AVAILABLE_IN_ALL void gtk_render_line (GtkStyleContext *context, cairo_t *cr, - gdouble x0, - gdouble y0, - gdouble x1, - gdouble y1); + double x0, + double y0, + double x1, + double y1); GDK_AVAILABLE_IN_ALL void gtk_render_slider (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height, + double x, + double y, + double width, + double height, GtkOrientation orientation); GDK_AVAILABLE_IN_ALL void gtk_render_handle (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height); + double x, + double y, + double width, + double height); GDK_AVAILABLE_IN_ALL void gtk_render_activity (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height); + double x, + double y, + double width, + double height); GDK_AVAILABLE_IN_ALL void gtk_render_icon (GtkStyleContext *context, cairo_t *cr, GdkTexture *texture, - gdouble x, - gdouble y); + double x, + double y); G_END_DECLS #endif /* __GTK_RENDER_H__ */ diff --git a/gtk/gtkrenderborder.c b/gtk/gtkrenderborder.c index 1846ace0f9..41c063d503 100644 --- a/gtk/gtkrenderborder.c +++ b/gtk/gtkrenderborder.c @@ -510,7 +510,7 @@ snapshot_frame_stroke (GtkSnapshot *snapshot, static void color_shade (const GdkRGBA *color, - gdouble factor, + double factor, GdkRGBA *color_return) { GtkHSLA hsla; diff --git a/gtk/gtkrevealer.c b/gtk/gtkrevealer.c index f63bbf1e54..2571d82427 100644 --- a/gtk/gtkrevealer.c +++ b/gtk/gtkrevealer.c @@ -100,9 +100,9 @@ typedef struct { GtkRevealerTransitionType transition_type; guint transition_duration; - gdouble current_pos; - gdouble source_pos; - gdouble target_pos; + double current_pos; + double source_pos; + double target_pos; guint tick_id; GtkProgressTracker tracker; @@ -123,7 +123,7 @@ static void gtk_revealer_measure (GtkWidget *widget, int *natural_baseline); static void gtk_revealer_set_position (GtkRevealer *revealer, - gdouble pos); + double pos); static void gtk_revealer_buildable_iface_init (GtkBuildableIface *iface); @@ -552,7 +552,7 @@ gtk_revealer_size_allocate (GtkWidget *widget, static void gtk_revealer_set_position (GtkRevealer *revealer, - gdouble pos) + double pos) { GtkRevealerPrivate *priv = gtk_revealer_get_instance_private (revealer); gboolean new_visible; @@ -595,7 +595,7 @@ gtk_revealer_animate_cb (GtkWidget *widget, { GtkRevealer *revealer = GTK_REVEALER (widget); GtkRevealerPrivate *priv = gtk_revealer_get_instance_private (revealer); - gdouble ease; + double ease; gtk_progress_tracker_advance_frame (&priv->tracker, gdk_frame_clock_get_frame_time (frame_clock)); @@ -614,7 +614,7 @@ gtk_revealer_animate_cb (GtkWidget *widget, static void gtk_revealer_start_animation (GtkRevealer *revealer, - gdouble target) + double target) { GtkRevealerPrivate *priv = gtk_revealer_get_instance_private (revealer); GtkWidget *widget = GTK_WIDGET (revealer); diff --git a/gtk/gtkroundedbox.c b/gtk/gtkroundedbox.c index d022863557..c068c8587d 100644 --- a/gtk/gtkroundedbox.c +++ b/gtk/gtkroundedbox.c @@ -56,8 +56,8 @@ _gtk_rounded_box_init_rect (GskRoundedRect *box, static void gtk_rounded_box_clamp_border_radius (GskRoundedRect *box) { - gdouble factor = 1.0; - gdouble corners; + double factor = 1.0; + double corners; corners = box->corner[GSK_CORNER_TOP_LEFT].width + box->corner[GSK_CORNER_TOP_RIGHT].width; if (corners != 0) diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index 791cac94ed..5e649eeaa2 100644 --- a/gtk/gtkscale.c +++ b/gtk/gtkscale.c @@ -159,7 +159,7 @@ struct _GtkScalePrivate struct _GtkScaleMark { - gdouble value; + double value; int stop_position; char *markup; GtkWidget *label_widget; @@ -214,7 +214,7 @@ static void gtk_scale_buildable_custom_finished (GtkBuildable *builda const char *tagname, gpointer user_data); static char * gtk_scale_format_value (GtkScale *scale, - gdouble value); + double value); G_DEFINE_TYPE_WITH_CODE (GtkScale, gtk_scale, GTK_TYPE_RANGE, @@ -288,14 +288,14 @@ gtk_scale_notify (GObject *object, GtkScaleMark *mark; GSList *m; int i, n; - gdouble *values; + double *values; priv->marks = g_slist_sort_with_data (priv->marks, compare_marks, GINT_TO_POINTER (gtk_range_get_inverted (GTK_RANGE (scale)))); n = g_slist_length (priv->marks); - values = g_new (gdouble, n); + values = g_new (double, n); for (m = priv->marks, i = 0; m; m = m->next, i++) { mark = m->data; @@ -945,9 +945,9 @@ gtk_scale_new (GtkOrientation orientation, */ GtkWidget * gtk_scale_new_with_range (GtkOrientation orientation, - gdouble min, - gdouble max, - gdouble step) + double min, + double max, + double step) { GtkAdjustment *adj; int digits; @@ -1654,7 +1654,7 @@ gtk_scale_clear_marks (GtkScale *scale) */ void gtk_scale_add_mark (GtkScale *scale, - gdouble value, + double value, GtkPositionType position, const char *markup) { @@ -1662,7 +1662,7 @@ gtk_scale_add_mark (GtkScale *scale, GtkScalePrivate *priv = gtk_scale_get_instance_private (scale); GtkScaleMark *mark; GSList *m; - gdouble *values; + double *values; int n, i; GtkWidget *marks_widget; @@ -1758,7 +1758,7 @@ gtk_scale_add_mark (GtkScale *scale, } n = g_slist_length (priv->marks); - values = g_new (gdouble, n); + values = g_new (double, n); for (m = priv->marks, i = 0; m; m = m->next, i++) { mark = m->data; @@ -1797,7 +1797,7 @@ typedef struct typedef struct { - gdouble value; + double value; GtkPositionType position; GString *markup; char *context; @@ -1835,7 +1835,7 @@ marks_start_element (GtkBuildableParseContext *context, else if (strcmp (element_name, "mark") == 0) { const char *value_str; - gdouble value = 0; + double value = 0; const char *position_str = NULL; GtkPositionType position = GTK_POS_BOTTOM; const char *msg_context = NULL; diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h index 5dd9609bd5..3b650e0271 100644 --- a/gtk/gtkscale.h +++ b/gtk/gtkscale.h @@ -86,9 +86,9 @@ GtkWidget * gtk_scale_new (GtkOrientation orientation, GtkAdjustment *adjustment); GDK_AVAILABLE_IN_ALL GtkWidget * gtk_scale_new_with_range (GtkOrientation orientation, - gdouble min, - gdouble max, - gdouble step); + double min, + double max, + double step); GDK_AVAILABLE_IN_ALL void gtk_scale_set_digits (GtkScale *scale, int digits); @@ -119,7 +119,7 @@ void gtk_scale_get_layout_offsets (GtkScale *scale, GDK_AVAILABLE_IN_ALL void gtk_scale_add_mark (GtkScale *scale, - gdouble value, + double value, GtkPositionType position, const char *markup); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c index 1924f7e957..11ddc585e2 100644 --- a/gtk/gtkscalebutton.c +++ b/gtk/gtkscalebutton.c @@ -159,8 +159,8 @@ static void cb_popup_mapped (GtkWidget *popup, gpointer user_data); static gboolean gtk_scale_button_scroll_controller_scroll (GtkEventControllerScroll *scroll, - gdouble dx, - gdouble dy, + double dx, + double dy, GtkScaleButton *button); G_DEFINE_TYPE_WITH_CODE (GtkScaleButton, gtk_scale_button, GTK_TYPE_WIDGET, @@ -547,9 +547,9 @@ gtk_scale_button_dispose (GObject *object) * Returns: a new #GtkScaleButton */ GtkWidget * -gtk_scale_button_new (gdouble min, - gdouble max, - gdouble step, +gtk_scale_button_new (double min, + double max, + double step, const char **icons) { GtkScaleButton *button; @@ -573,7 +573,7 @@ gtk_scale_button_new (gdouble min, * * Returns: current value of the scale button */ -gdouble +double gtk_scale_button_get_value (GtkScaleButton * button) { GtkScaleButtonPrivate *priv = gtk_scale_button_get_instance_private (button); @@ -595,7 +595,7 @@ gtk_scale_button_get_value (GtkScaleButton * button) */ void gtk_scale_button_set_value (GtkScaleButton *button, - gdouble value) + double value) { GtkScaleButtonPrivate *priv = gtk_scale_button_get_instance_private (button); @@ -753,13 +753,13 @@ gtk_scale_button_set_orientation_private (GtkScaleButton *button, static gboolean gtk_scale_button_scroll_controller_scroll (GtkEventControllerScroll *scroll, - gdouble dx, - gdouble dy, + double dx, + double dy, GtkScaleButton *button) { GtkScaleButtonPrivate *priv = gtk_scale_button_get_instance_private (button); GtkAdjustment *adjustment; - gdouble d; + double d; adjustment = priv->adjustment; @@ -811,7 +811,7 @@ button_click (GtkScaleButton *button, GtkScaleButtonPrivate *priv = gtk_scale_button_get_instance_private (button); GtkAdjustment *adjustment = priv->adjustment; gboolean can_continue = TRUE; - gdouble val; + double val; val = gtk_scale_button_get_value (button); @@ -864,7 +864,7 @@ gtk_scale_button_update_icon (GtkScaleButton *button) { GtkScaleButtonPrivate *priv = gtk_scale_button_get_instance_private (button); GtkAdjustment *adjustment; - gdouble value; + double value; const char *name; guint num_icons; @@ -889,7 +889,7 @@ gtk_scale_button_update_icon (GtkScaleButton *button) /* The 2-icons special case */ if (num_icons == 2) { - gdouble limit; + double limit; limit = (gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_lower (adjustment)) / 2 + gtk_adjustment_get_lower (adjustment); if (value < limit) @@ -912,7 +912,7 @@ gtk_scale_button_update_icon (GtkScaleButton *button) } else { - gdouble step; + double step; guint i; step = (gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_lower (adjustment)) / (num_icons - 2); i = (guint) ((value - gtk_adjustment_get_lower (adjustment)) / step) + 2; @@ -929,8 +929,8 @@ cb_scale_value_changed (GtkRange *range, { GtkScaleButton *button = user_data; GtkScaleButtonPrivate *priv = gtk_scale_button_get_instance_private (button); - gdouble value; - gdouble upper, lower; + double value; + double upper, lower; value = gtk_range_get_value (range); upper = gtk_adjustment_get_upper (priv->adjustment); diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h index 7226d92ee5..309e75eb65 100644 --- a/gtk/gtkscalebutton.h +++ b/gtk/gtkscalebutton.h @@ -63,7 +63,7 @@ struct _GtkScaleButtonClass /* signals */ void (* value_changed) (GtkScaleButton *button, - gdouble value); + double value); /*< private >*/ @@ -73,18 +73,18 @@ struct _GtkScaleButtonClass GDK_AVAILABLE_IN_ALL GType gtk_scale_button_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_scale_button_new (gdouble min, - gdouble max, - gdouble step, +GtkWidget * gtk_scale_button_new (double min, + double max, + double step, const char **icons); GDK_AVAILABLE_IN_ALL void gtk_scale_button_set_icons (GtkScaleButton *button, const char **icons); GDK_AVAILABLE_IN_ALL -gdouble gtk_scale_button_get_value (GtkScaleButton *button); +double gtk_scale_button_get_value (GtkScaleButton *button); GDK_AVAILABLE_IN_ALL void gtk_scale_button_set_value (GtkScaleButton *button, - gdouble value); + double value); GDK_AVAILABLE_IN_ALL GtkAdjustment * gtk_scale_button_get_adjustment (GtkScaleButton *button); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index acc77cb8fd..91d6c2e91c 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -229,9 +229,9 @@ typedef struct gint64 last_scroll_time; guint conceil_timer; - gdouble current_pos; - gdouble source_pos; - gdouble target_pos; + double current_pos; + double source_pos; + double target_pos; GtkProgressTracker tracker; guint tick_id; guint over_timeout_id; @@ -280,8 +280,8 @@ typedef struct GtkGesture *drag_gesture; GtkGesture *pan_gesture; - gdouble drag_start_x; - gdouble drag_start_y; + double drag_start_x; + double drag_start_y; guint kinetic_scrolling : 1; guint capture_button_press : 1; @@ -289,11 +289,11 @@ typedef struct guint deceleration_id; - gdouble x_velocity; - gdouble y_velocity; + double x_velocity; + double y_velocity; - gdouble unclamped_hadj_value; - gdouble unclamped_vadj_value; + double unclamped_hadj_value; + double unclamped_vadj_value; } GtkScrolledWindowPrivate; typedef struct @@ -386,7 +386,7 @@ static void gtk_scrolled_window_unmap (GtkWidget *wid static void gtk_scrolled_window_realize (GtkWidget *widget); static void _gtk_scrolled_window_set_adjustment_value (GtkScrolledWindow *scrolled_window, GtkAdjustment *adjustment, - gdouble value); + double value); static void gtk_scrolled_window_cancel_deceleration (GtkScrolledWindow *scrolled_window); @@ -402,7 +402,7 @@ static void remove_indicator (GtkScrolledWindow *sw, static gboolean maybe_hide_indicator (gpointer data); static void indicator_start_fade (Indicator *indicator, - gdouble pos); + double pos); static void indicator_set_over (Indicator *indicator, gboolean over); @@ -900,8 +900,8 @@ policy_may_be_visible (GtkPolicyType policy) static void scrolled_window_drag_begin_cb (GtkScrolledWindow *scrolled_window, - gdouble start_x, - gdouble start_y, + double start_x, + double start_y, GtkGesture *gesture) { GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window); @@ -947,14 +947,14 @@ gtk_scrolled_window_invalidate_overshoot (GtkScrolledWindow *scrolled_window) static void scrolled_window_drag_update_cb (GtkScrolledWindow *scrolled_window, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkGesture *gesture) { GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window); GtkAdjustment *hadjustment; GtkAdjustment *vadjustment; - gdouble dx, dy; + double dx, dy; gtk_scrolled_window_invalidate_overshoot (scrolled_window); @@ -999,8 +999,8 @@ scrolled_window_drag_end_cb (GtkScrolledWindow *scrolled_window, static void gtk_scrolled_window_decelerate (GtkScrolledWindow *scrolled_window, - gdouble x_velocity, - gdouble y_velocity) + double x_velocity, + double y_velocity) { GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window); gboolean overshoot; @@ -1024,16 +1024,16 @@ gtk_scrolled_window_decelerate (GtkScrolledWindow *scrolled_window, static void scrolled_window_swipe_cb (GtkScrolledWindow *scrolled_window, - gdouble x_velocity, - gdouble y_velocity) + double x_velocity, + double y_velocity) { gtk_scrolled_window_decelerate (scrolled_window, -x_velocity, -y_velocity); } static void scrolled_window_long_press_cb (GtkScrolledWindow *scrolled_window, - gdouble x, - gdouble y, + double x, + double y, GtkGesture *gesture) { GdkEventSequence *sequence; @@ -1116,8 +1116,8 @@ indicator_set_over (Indicator *indicator, static gboolean coords_close_to_indicator (GtkScrolledWindow *sw, Indicator *indicator, - gdouble x, - gdouble y) + double x, + double y) { GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (sw); graphene_rect_t indicator_bounds; @@ -1162,8 +1162,8 @@ static gboolean check_update_scrollbar_proximity (GtkScrolledWindow *sw, Indicator *indicator, GtkWidget *target, - gdouble x, - gdouble y) + double x, + double y) { GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (sw); gboolean indicator_close, on_scrollbar, on_other_scrollbar; @@ -1196,17 +1196,17 @@ check_update_scrollbar_proximity (GtkScrolledWindow *sw, return indicator_close; } -static gdouble +static double get_scroll_unit (GtkScrolledWindow *sw, GtkOrientation orientation) { - gdouble scroll_unit; + double scroll_unit; #ifndef GDK_WINDOWING_QUARTZ GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (sw); GtkScrollbar *scrollbar; GtkAdjustment *adj; - gdouble page_size; + double page_size; if (orientation == GTK_ORIENTATION_HORIZONTAL) scrollbar = GTK_SCROLLBAR (priv->hscrollbar); @@ -1316,8 +1316,8 @@ scroll_controller_scroll_begin (GtkEventControllerScroll *scroll, static gboolean scroll_controller_scroll (GtkEventControllerScroll *scroll, - gdouble delta_x, - gdouble delta_y, + double delta_x, + double delta_y, GtkScrolledWindow *scrolled_window) { GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window); @@ -1331,7 +1331,7 @@ scroll_controller_scroll (GtkEventControllerScroll *scroll, if (shifted) { - gdouble delta; + double delta; delta = delta_x; delta_x = delta_y; @@ -1342,8 +1342,8 @@ scroll_controller_scroll (GtkEventControllerScroll *scroll, may_hscroll (scrolled_window)) { GtkAdjustment *adj; - gdouble new_value; - gdouble scroll_unit; + double new_value; + double scroll_unit; adj = gtk_scrollbar_get_adjustment (GTK_SCROLLBAR (priv->hscrollbar)); scroll_unit = get_scroll_unit (scrolled_window, GTK_ORIENTATION_HORIZONTAL); @@ -1357,8 +1357,8 @@ scroll_controller_scroll (GtkEventControllerScroll *scroll, may_vscroll (scrolled_window)) { GtkAdjustment *adj; - gdouble new_value; - gdouble scroll_unit; + double new_value; + double scroll_unit; adj = gtk_scrollbar_get_adjustment (GTK_SCROLLBAR (priv->vscrollbar)); scroll_unit = get_scroll_unit (scrolled_window, GTK_ORIENTATION_VERTICAL); @@ -1398,11 +1398,11 @@ scroll_controller_scroll_end (GtkEventControllerScroll *scroll, static void scroll_controller_decelerate (GtkEventControllerScroll *scroll, - gdouble initial_vel_x, - gdouble initial_vel_y, + double initial_vel_x, + double initial_vel_y, GtkScrolledWindow *scrolled_window) { - gdouble unit_x, unit_y; + double unit_x, unit_y; gboolean shifted; GdkModifierType state; @@ -2898,7 +2898,7 @@ gtk_scrolled_window_scroll_child (GtkScrolledWindow *scrolled_window, if (adjustment) { - gdouble value = gtk_adjustment_get_value (adjustment); + double value = gtk_adjustment_get_value (adjustment); switch (scroll) { @@ -3028,7 +3028,7 @@ _gtk_scrolled_window_get_overshoot (GtkScrolledWindow *scrolled_window, { GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window); GtkAdjustment *vadjustment, *hadjustment; - gdouble lower, upper, x, y; + double lower, upper, x, y; /* Vertical overshoot */ vadjustment = gtk_scrollbar_get_adjustment (GTK_SCROLLBAR (priv->vscrollbar)); @@ -3201,10 +3201,10 @@ uninstall_scroll_cursor (GtkScrolledWindow *scrolled_window) static void _gtk_scrolled_window_set_adjustment_value (GtkScrolledWindow *scrolled_window, GtkAdjustment *adjustment, - gdouble value) + double value) { GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window); - gdouble lower, upper, *prev_value; + double lower, upper, *prev_value; GtkPositionType edge_pos; gboolean vertical; @@ -3257,7 +3257,7 @@ scrolled_window_deceleration_cb (GtkWidget *widget, GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window); GtkAdjustment *hadjustment, *vadjustment; gint64 current_time; - gdouble position, elapsed; + double position, elapsed; current_time = gdk_frame_clock_get_frame_time (frame_clock); elapsed = (current_time - data->last_deceleration_time) / 1000000.0; @@ -3338,7 +3338,7 @@ gtk_scrolled_window_start_deceleration (GtkScrolledWindow *scrolled_window) if (may_hscroll (scrolled_window)) { - gdouble lower,upper; + double lower,upper; GtkAdjustment *hadjustment; hadjustment = gtk_scrollbar_get_adjustment (GTK_SCROLLBAR (priv->hscrollbar)); @@ -3357,7 +3357,7 @@ gtk_scrolled_window_start_deceleration (GtkScrolledWindow *scrolled_window) if (may_vscroll (scrolled_window)) { - gdouble lower,upper; + double lower,upper; GtkAdjustment *vadjustment; vadjustment = gtk_scrollbar_get_adjustment (GTK_SCROLLBAR (priv->vscrollbar)); @@ -3456,7 +3456,7 @@ maybe_emit_edge_reached (GtkScrolledWindow *scrolled_window, GtkAdjustment *adjustment) { GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window); - gdouble value, lower, upper, page_size; + double value, lower, upper, page_size; GtkPositionType edge_pos; gboolean vertical; @@ -3591,7 +3591,7 @@ gtk_scrolled_window_unmap (GtkWidget *widget) static void indicator_set_fade (Indicator *indicator, - gdouble pos) + double pos) { gboolean visible, changed; @@ -3623,7 +3623,7 @@ indicator_fade_cb (GtkWidget *widget, gpointer user_data) { Indicator *indicator = user_data; - gdouble t; + double t; gtk_progress_tracker_advance_frame (&indicator->tracker, gdk_frame_clock_get_frame_time (frame_clock)); @@ -3643,7 +3643,7 @@ indicator_fade_cb (GtkWidget *widget, static void indicator_start_fade (Indicator *indicator, - gdouble target) + double target) { if (indicator->target_pos == target) return; diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 65989011b8..332f46fe2a 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -1804,7 +1804,7 @@ gtk_settings_load_from_key_file (GtkSettings *settings, case G_TYPE_DOUBLE: { - gdouble d_val; + double d_val; g_value_init (&svalue.value, G_TYPE_DOUBLE); d_val = g_key_file_get_double (keyfile, "Settings", key, &error); diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c index 462becb974..aa8407611b 100644 --- a/gtk/gtkshortcutssection.c +++ b/gtk/gtkshortcutssection.c @@ -121,7 +121,7 @@ static gboolean gtk_shortcuts_section_change_current_page (GtkShortcutsSection * static void gtk_shortcuts_section_pan_gesture_pan (GtkGesturePan *gesture, GtkPanDirection direction, - gdouble offset, + double offset, GtkShortcutsSection *self); static GtkBuildableIface *parent_buildable_iface; @@ -753,7 +753,7 @@ gtk_shortcuts_section_change_current_page (GtkShortcutsSection *self, static void gtk_shortcuts_section_pan_gesture_pan (GtkGesturePan *gesture, GtkPanDirection direction, - gdouble offset, + double offset, GtkShortcutsSection *self) { if (offset < 50) diff --git a/gtk/gtksnapshot.c b/gtk/gtksnapshot.c index b9c99ffb83..7de6594167 100644 --- a/gtk/gtksnapshot.c +++ b/gtk/gtksnapshot.c @@ -1706,10 +1706,10 @@ gtk_snapshot_append_color (GtkSnapshot *snapshot, void gtk_snapshot_render_background (GtkSnapshot *snapshot, GtkStyleContext *context, - gdouble x, - gdouble y, - gdouble width, - gdouble height) + double x, + double y, + double width, + double height) { GtkCssBoxes boxes; @@ -1738,10 +1738,10 @@ gtk_snapshot_render_background (GtkSnapshot *snapshot, void gtk_snapshot_render_frame (GtkSnapshot *snapshot, GtkStyleContext *context, - gdouble x, - gdouble y, - gdouble width, - gdouble height) + double x, + double y, + double width, + double height) { GtkCssBoxes boxes; @@ -1770,10 +1770,10 @@ gtk_snapshot_render_frame (GtkSnapshot *snapshot, void gtk_snapshot_render_focus (GtkSnapshot *snapshot, GtkStyleContext *context, - gdouble x, - gdouble y, - gdouble width, - gdouble height) + double x, + double y, + double width, + double height) { GtkCssBoxes boxes; @@ -1801,8 +1801,8 @@ gtk_snapshot_render_focus (GtkSnapshot *snapshot, void gtk_snapshot_render_layout (GtkSnapshot *snapshot, GtkStyleContext *context, - gdouble x, - gdouble y, + double x, + double y, PangoLayout *layout) { const bool needs_translate = (x != 0 || y != 0); diff --git a/gtk/gtksnapshot.h b/gtk/gtksnapshot.h index 91c050d048..406a02da58 100644 --- a/gtk/gtksnapshot.h +++ b/gtk/gtksnapshot.h @@ -195,35 +195,35 @@ void gtk_snapshot_append_layout (GtkSnapshot GDK_AVAILABLE_IN_ALL void gtk_snapshot_render_background (GtkSnapshot *snapshot, GtkStyleContext *context, - gdouble x, - gdouble y, - gdouble width, - gdouble height); + double x, + double y, + double width, + double height); GDK_AVAILABLE_IN_ALL void gtk_snapshot_render_frame (GtkSnapshot *snapshot, GtkStyleContext *context, - gdouble x, - gdouble y, - gdouble width, - gdouble height); + double x, + double y, + double width, + double height); GDK_AVAILABLE_IN_ALL void gtk_snapshot_render_focus (GtkSnapshot *snapshot, GtkStyleContext *context, - gdouble x, - gdouble y, - gdouble width, - gdouble height); + double x, + double y, + double width, + double height); GDK_AVAILABLE_IN_ALL void gtk_snapshot_render_layout (GtkSnapshot *snapshot, GtkStyleContext *context, - gdouble x, - gdouble y, + double x, + double y, PangoLayout *layout); GDK_AVAILABLE_IN_ALL /* in gtkstylecontext.c */ void gtk_snapshot_render_insertion_cursor (GtkSnapshot *snapshot, GtkStyleContext *context, - gdouble x, - gdouble y, + double x, + double y, PangoLayout *layout, int index, PangoDirection direction); diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 512fbdd3c8..7e7460490f 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -202,8 +202,8 @@ struct _GtkSpinButton GtkSpinButtonUpdatePolicy update_policy; - gdouble climb_rate; - gdouble timer_step; + double climb_rate; + double timer_step; int width_chars; @@ -223,7 +223,7 @@ struct _GtkSpinButtonClass GtkWidgetClass parent_class; int (*input) (GtkSpinButton *spin_button, - gdouble *new_value); + double *new_value); int (*output) (GtkSpinButton *spin_button); void (*value_changed) (GtkSpinButton *spin_button); @@ -286,18 +286,18 @@ static void gtk_spin_button_unset_adjustment (GtkSpinButton *spin_button); static void gtk_spin_button_set_orientation (GtkSpinButton *spin_button, GtkOrientation orientation); static void gtk_spin_button_snap (GtkSpinButton *spin_button, - gdouble val); + double val); static void gtk_spin_button_insert_text (GtkEditable *editable, const char *new_text, int new_text_length, int *position); static void gtk_spin_button_real_spin (GtkSpinButton *spin_button, - gdouble step); + double step); static void gtk_spin_button_real_change_value (GtkSpinButton *spin, GtkScrollType scroll); static int gtk_spin_button_default_input (GtkSpinButton *spin_button, - gdouble *new_val); + double *new_val); static void gtk_spin_button_default_output (GtkSpinButton *spin_button); static void gtk_spin_button_update_width_chars (GtkSpinButton *spin_button); @@ -766,7 +766,7 @@ swipe_gesture_update (GtkGesture *gesture, GdkEventSequence *sequence, GtkSpinButton *spin_button) { - gdouble vel_y; + double vel_y; gtk_gesture_swipe_get_velocity (GTK_GESTURE_SWIPE (gesture), NULL, &vel_y); gtk_spin_button_real_spin (spin_button, -vel_y / 20); @@ -774,8 +774,8 @@ swipe_gesture_update (GtkGesture *gesture, static gboolean scroll_controller_scroll (GtkEventControllerScroll *Scroll, - gdouble dx, - gdouble dy, + double dx, + double dy, GtkWidget *widget) { GtkSpinButton *spin = GTK_SPIN_BUTTON (widget); @@ -812,7 +812,7 @@ gtk_spin_button_stop_spinning (GtkSpinButton *spin) static void start_spinning (GtkSpinButton *spin, GtkWidget *click_child, - gdouble step) + double step) { spin->click_child = click_child; @@ -1147,7 +1147,7 @@ weed_out_neg_zero (char *str, static char * gtk_spin_button_format_for_value (GtkSpinButton *spin_button, - gdouble value) + double value) { char *buf = g_strdup_printf ("%0.*f", spin_button->digits, value); @@ -1263,7 +1263,7 @@ static void gtk_spin_button_real_change_value (GtkSpinButton *spin, GtkScrollType scroll) { - gdouble old_value; + double old_value; if (!gtk_editable_get_editable (GTK_EDITABLE (spin->entry))) { @@ -1360,10 +1360,10 @@ gtk_spin_button_real_change_value (GtkSpinButton *spin, static void gtk_spin_button_snap (GtkSpinButton *spin_button, - gdouble val) + double val) { - gdouble inc; - gdouble tmp; + double inc; + double tmp; inc = gtk_adjustment_get_step_increment (spin_button->adjustment); if (inc == 0) @@ -1491,10 +1491,10 @@ gtk_spin_button_insert_text (GtkEditable *editable, static void gtk_spin_button_real_spin (GtkSpinButton *spin_button, - gdouble increment) + double increment) { GtkAdjustment *adjustment; - gdouble new_value = 0.0; + double new_value = 0.0; gboolean wrapped = FALSE; adjustment = spin_button->adjustment; @@ -1541,7 +1541,7 @@ gtk_spin_button_real_spin (GtkSpinButton *spin_button, static int gtk_spin_button_default_input (GtkSpinButton *spin_button, - gdouble *new_val) + double *new_val) { char *err = NULL; const char *text = gtk_editable_get_text (GTK_EDITABLE (spin_button->entry)); @@ -1586,7 +1586,7 @@ gtk_spin_button_default_output (GtkSpinButton *spin_button) void gtk_spin_button_configure (GtkSpinButton *spin_button, GtkAdjustment *adjustment, - gdouble climb_rate, + double climb_rate, guint digits) { g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button)); @@ -1647,7 +1647,7 @@ gtk_spin_button_configure (GtkSpinButton *spin_button, */ GtkWidget * gtk_spin_button_new (GtkAdjustment *adjustment, - gdouble climb_rate, + double climb_rate, guint digits) { GtkSpinButton *spin; @@ -1681,9 +1681,9 @@ gtk_spin_button_new (GtkAdjustment *adjustment, * Returns: The new spin button as a #GtkWidget */ GtkWidget * -gtk_spin_button_new_with_range (gdouble min, - gdouble max, - gdouble step) +gtk_spin_button_new_with_range (double min, + double max, + double step) { GtkAdjustment *adjustment; GtkSpinButton *spin; @@ -1801,8 +1801,8 @@ gtk_spin_button_get_digits (GtkSpinButton *spin_button) **/ void gtk_spin_button_set_increments (GtkSpinButton *spin_button, - gdouble step, - gdouble page) + double step, + double page) { g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button)); @@ -1826,8 +1826,8 @@ gtk_spin_button_set_increments (GtkSpinButton *spin_button, **/ void gtk_spin_button_get_increments (GtkSpinButton *spin_button, - gdouble *step, - gdouble *page) + double *step, + double *page) { g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button)); @@ -1850,8 +1850,8 @@ gtk_spin_button_get_increments (GtkSpinButton *spin_button, */ void gtk_spin_button_set_range (GtkSpinButton *spin_button, - gdouble min, - gdouble max) + double min, + double max) { GtkAdjustment *adjustment; @@ -1879,8 +1879,8 @@ gtk_spin_button_set_range (GtkSpinButton *spin_button, */ void gtk_spin_button_get_range (GtkSpinButton *spin_button, - gdouble *min, - gdouble *max) + double *min, + double *max) { g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button)); @@ -1898,7 +1898,7 @@ gtk_spin_button_get_range (GtkSpinButton *spin_button, * * Returns: the value of @spin_button */ -gdouble +double gtk_spin_button_get_value (GtkSpinButton *spin_button) { g_return_val_if_fail (GTK_IS_SPIN_BUTTON (spin_button), 0.0); @@ -1917,7 +1917,7 @@ gtk_spin_button_get_value (GtkSpinButton *spin_button) int gtk_spin_button_get_value_as_int (GtkSpinButton *spin_button) { - gdouble val; + double val; g_return_val_if_fail (GTK_IS_SPIN_BUTTON (spin_button), 0); @@ -1937,7 +1937,7 @@ gtk_spin_button_get_value_as_int (GtkSpinButton *spin_button) */ void gtk_spin_button_set_value (GtkSpinButton *spin_button, - gdouble value) + double value) { g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button)); @@ -2133,10 +2133,10 @@ gtk_spin_button_get_snap_to_ticks (GtkSpinButton *spin_button) void gtk_spin_button_spin (GtkSpinButton *spin_button, GtkSpinType direction, - gdouble increment) + double increment) { GtkAdjustment *adjustment; - gdouble diff; + double diff; g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button)); @@ -2208,7 +2208,7 @@ gtk_spin_button_spin (GtkSpinButton *spin_button, void gtk_spin_button_update (GtkSpinButton *spin_button) { - gdouble val; + double val; int error = 0; int return_val; diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h index 5e9b70caa5..28fa0c1499 100644 --- a/gtk/gtkspinbutton.h +++ b/gtk/gtkspinbutton.h @@ -101,18 +101,18 @@ GType gtk_spin_button_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL void gtk_spin_button_configure (GtkSpinButton *spin_button, GtkAdjustment *adjustment, - gdouble climb_rate, + double climb_rate, guint digits); GDK_AVAILABLE_IN_ALL GtkWidget* gtk_spin_button_new (GtkAdjustment *adjustment, - gdouble climb_rate, + double climb_rate, guint digits); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_spin_button_new_with_range (gdouble min, - gdouble max, - gdouble step); +GtkWidget* gtk_spin_button_new_with_range (double min, + double max, + double step); GDK_AVAILABLE_IN_ALL void gtk_spin_button_set_adjustment (GtkSpinButton *spin_button, @@ -129,31 +129,31 @@ guint gtk_spin_button_get_digits (GtkSpinButton *spin_button) GDK_AVAILABLE_IN_ALL void gtk_spin_button_set_increments (GtkSpinButton *spin_button, - gdouble step, - gdouble page); + double step, + double page); GDK_AVAILABLE_IN_ALL void gtk_spin_button_get_increments (GtkSpinButton *spin_button, - gdouble *step, - gdouble *page); + double *step, + double *page); GDK_AVAILABLE_IN_ALL void gtk_spin_button_set_range (GtkSpinButton *spin_button, - gdouble min, - gdouble max); + double min, + double max); GDK_AVAILABLE_IN_ALL void gtk_spin_button_get_range (GtkSpinButton *spin_button, - gdouble *min, - gdouble *max); + double *min, + double *max); GDK_AVAILABLE_IN_ALL -gdouble gtk_spin_button_get_value (GtkSpinButton *spin_button); +double gtk_spin_button_get_value (GtkSpinButton *spin_button); GDK_AVAILABLE_IN_ALL int gtk_spin_button_get_value_as_int (GtkSpinButton *spin_button); GDK_AVAILABLE_IN_ALL void gtk_spin_button_set_value (GtkSpinButton *spin_button, - gdouble value); + double value); GDK_AVAILABLE_IN_ALL void gtk_spin_button_set_update_policy (GtkSpinButton *spin_button, @@ -170,7 +170,7 @@ gboolean gtk_spin_button_get_numeric (GtkSpinButton *spin_button) GDK_AVAILABLE_IN_ALL void gtk_spin_button_spin (GtkSpinButton *spin_button, GtkSpinType direction, - gdouble increment); + double increment); GDK_AVAILABLE_IN_ALL void gtk_spin_button_set_wrap (GtkSpinButton *spin_button, diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c index a789be258c..98cdc4093a 100644 --- a/gtk/gtkstack.c +++ b/gtk/gtkstack.c @@ -2013,7 +2013,7 @@ gtk_stack_snapshot_crossfade (GtkWidget *widget, { GtkStack *stack = GTK_STACK (widget); GtkStackPrivate *priv = gtk_stack_get_instance_private (stack); - gdouble progress = gtk_progress_tracker_get_progress (&priv->tracker, FALSE); + double progress = gtk_progress_tracker_get_progress (&priv->tracker, FALSE); gtk_snapshot_push_cross_fade (snapshot, progress); @@ -2411,13 +2411,13 @@ gtk_stack_measure (GtkWidget *widget, { if (orientation == GTK_ORIENTATION_VERTICAL && !priv->vhomogeneous) { - gdouble t = priv->interpolate_size ? gtk_progress_tracker_get_ease_out_cubic (&priv->tracker, FALSE) : 1.0; + double t = priv->interpolate_size ? gtk_progress_tracker_get_ease_out_cubic (&priv->tracker, FALSE) : 1.0; *minimum = LERP (*minimum, priv->last_visible_widget_height, t); *natural = LERP (*natural, priv->last_visible_widget_height, t); } if (orientation == GTK_ORIENTATION_HORIZONTAL && !priv->hhomogeneous) { - gdouble t = priv->interpolate_size ? gtk_progress_tracker_get_ease_out_cubic (&priv->tracker, FALSE) : 1.0; + double t = priv->interpolate_size ? gtk_progress_tracker_get_ease_out_cubic (&priv->tracker, FALSE) : 1.0; *minimum = LERP (*minimum, priv->last_visible_widget_width, t); *natural = LERP (*natural, priv->last_visible_widget_width, t); } diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index b11a5b8028..f32e0d7c6e 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -978,9 +978,9 @@ _gtk_style_context_get_cursor_color (GtkStyleContext *context, static void draw_insertion_cursor (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, - gdouble height, + double x, + double y, + double height, float aspect_ratio, gboolean is_primary, PangoDirection direction, @@ -1043,7 +1043,7 @@ draw_insertion_cursor (GtkStyleContext *context, } static void -get_insertion_cursor_bounds (gdouble height, +get_insertion_cursor_bounds (double height, float aspect_ratio, PangoDirection direction, gboolean draw_arrow, @@ -1084,7 +1084,7 @@ get_insertion_cursor_bounds (gdouble height, static void snapshot_insertion_cursor (GtkSnapshot *snapshot, GtkStyleContext *context, - gdouble height, + double height, float aspect_ratio, gboolean is_primary, PangoDirection direction, @@ -1140,8 +1140,8 @@ snapshot_insertion_cursor (GtkSnapshot *snapshot, void gtk_render_insertion_cursor (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, + double x, + double y, PangoLayout *layout, int index, PangoDirection direction) @@ -1237,8 +1237,8 @@ gtk_render_insertion_cursor (GtkStyleContext *context, void gtk_snapshot_render_insertion_cursor (GtkSnapshot *snapshot, GtkStyleContext *context, - gdouble x, - gdouble y, + double x, + double y, PangoLayout *layout, int index, PangoDirection direction) diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h index 688f6fd1e0..bd4dde7646 100644 --- a/gtk/gtkstylecontext.h +++ b/gtk/gtkstylecontext.h @@ -904,8 +904,8 @@ GDK_AVAILABLE_IN_ALL void gtk_render_insertion_cursor (GtkStyleContext *context, cairo_t *cr, - gdouble x, - gdouble y, + double x, + double y, PangoLayout *layout, int index, PangoDirection direction); diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c index a6e8d88d93..1c3bdd27c3 100644 --- a/gtk/gtkswitch.c +++ b/gtk/gtkswitch.c @@ -196,8 +196,8 @@ gtk_switch_begin_toggle_animation (GtkSwitch *self) static void gtk_switch_click_gesture_pressed (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkSwitch *self) { graphene_rect_t switch_bounds; @@ -216,8 +216,8 @@ gtk_switch_click_gesture_pressed (GtkGestureClick *gesture, static void gtk_switch_click_gesture_released (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkSwitch *self) { GdkEventSequence *sequence; @@ -235,7 +235,7 @@ gtk_switch_click_gesture_released (GtkGestureClick *gesture, static void gtk_switch_pan_gesture_pan (GtkGesturePan *gesture, GtkPanDirection direction, - gdouble offset, + double offset, GtkSwitch *self) { GtkWidget *widget = GTK_WIDGET (self); @@ -261,8 +261,8 @@ gtk_switch_pan_gesture_pan (GtkGesturePan *gesture, static void gtk_switch_pan_gesture_drag_end (GtkGestureDrag *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkSwitch *self) { GdkEventSequence *sequence; diff --git a/gtk/gtktextattributes.h b/gtk/gtktextattributes.h index d087fed77b..e4f98f3568 100644 --- a/gtk/gtktextattributes.h +++ b/gtk/gtktextattributes.h @@ -152,7 +152,7 @@ struct _GtkTextAttributes PangoFontDescription *font; - gdouble font_scale; + double font_scale; int left_margin; int right_margin; diff --git a/gtk/gtktexthandle.c b/gtk/gtktexthandle.c index 0b67be7553..9cdf94a75a 100644 --- a/gtk/gtktexthandle.c +++ b/gtk/gtktexthandle.c @@ -334,8 +334,8 @@ gtk_text_handle_class_init (GtkTextHandleClass *klass) static void handle_drag_begin (GtkGestureDrag *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkTextHandle *handle) { GtkWidget *widget; @@ -360,12 +360,12 @@ handle_drag_begin (GtkGestureDrag *gesture, static void handle_drag_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkWidget *widget) { GtkTextHandle *handle = GTK_TEXT_HANDLE (widget); - gdouble start_x, start_y; + double start_x, start_y; int x, y; gtk_gesture_drag_get_start_point (gesture, &start_x, &start_y); @@ -388,8 +388,8 @@ handle_drag_update (GtkGestureDrag *gesture, static void handle_drag_end (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkTextHandle *handle) { g_signal_emit (handle, signals[DRAG_FINISHED], 0); diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 645ffe5bef..f9d1ae8a2a 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -291,10 +291,10 @@ struct _GtkTextViewPrivate struct _GtkTextPendingScroll { GtkTextMark *mark; - gdouble within_margin; + double within_margin; gboolean use_align; - gdouble xalign; - gdouble yalign; + double xalign; + double yalign; }; typedef enum @@ -392,16 +392,16 @@ static void gtk_text_view_state_flags_changed (GtkWidget *widget, static void gtk_text_view_click_gesture_pressed (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkTextView *text_view); static void gtk_text_view_drag_gesture_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkTextView *text_view); static void gtk_text_view_drag_gesture_end (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkTextView *text_view); static gboolean gtk_text_view_key_controller_key_pressed (GtkEventControllerKey *controller, @@ -540,10 +540,10 @@ static void gtk_text_view_do_popup (GtkTextView *text_view, static void cancel_pending_scroll (GtkTextView *text_view); static void gtk_text_view_queue_scroll (GtkTextView *text_view, GtkTextMark *mark, - gdouble within_margin, + double within_margin, gboolean use_align, - gdouble xalign, - gdouble yalign); + double xalign, + double yalign); static gboolean gtk_text_view_flush_scroll (GtkTextView *text_view); static void gtk_text_view_update_adjustments (GtkTextView *text_view); @@ -674,7 +674,7 @@ get_buffer (GtkTextView *text_view) #define LOWER_OFFSET_ANCHOR 0.2 static gboolean -check_scroll (gdouble offset, GtkAdjustment *adjustment) +check_scroll (double offset, GtkAdjustment *adjustment) { if ((offset > UPPER_OFFSET_ANCHOR && gtk_adjustment_get_value (adjustment) + gtk_adjustment_get_page_size (adjustment) < gtk_adjustment_get_upper (adjustment)) || @@ -691,7 +691,7 @@ gtk_text_view_drop_motion_scroll_timeout (gpointer data) GtkTextView *text_view; GtkTextViewPrivate *priv; GtkTextIter newplace; - gdouble pointer_xoffset, pointer_yoffset; + double pointer_xoffset, pointer_yoffset; text_view = GTK_TEXT_VIEW (data); priv = text_view->priv; @@ -703,8 +703,8 @@ gtk_text_view_drop_motion_scroll_timeout (gpointer data) gtk_text_buffer_move_mark (get_buffer (text_view), priv->dnd_mark, &newplace); - pointer_xoffset = (gdouble) priv->dnd_x / text_window_get_width (priv->text_window); - pointer_yoffset = (gdouble) priv->dnd_y / text_window_get_height (priv->text_window); + pointer_xoffset = (double) priv->dnd_x / text_window_get_width (priv->text_window); + pointer_yoffset = (double) priv->dnd_y / text_window_get_height (priv->text_window); if (check_scroll (pointer_xoffset, priv->hadjustment) || check_scroll (pointer_yoffset, priv->vadjustment)) @@ -2392,10 +2392,10 @@ gtk_text_view_get_line_at_y (GtkTextView *text_view, static gboolean _gtk_text_view_scroll_to_iter (GtkTextView *text_view, GtkTextIter *iter, - gdouble within_margin, + double within_margin, gboolean use_align, - gdouble xalign, - gdouble yalign, + double xalign, + double yalign, gboolean with_border) { GtkTextViewPrivate *priv = text_view->priv; @@ -2628,10 +2628,10 @@ _gtk_text_view_scroll_to_iter (GtkTextView *text_view, gboolean gtk_text_view_scroll_to_iter (GtkTextView *text_view, GtkTextIter *iter, - gdouble within_margin, + double within_margin, gboolean use_align, - gdouble xalign, - gdouble yalign) + double xalign, + double yalign) { return _gtk_text_view_scroll_to_iter (text_view, iter, @@ -2665,10 +2665,10 @@ cancel_pending_scroll (GtkTextView *text_view) static void gtk_text_view_queue_scroll (GtkTextView *text_view, GtkTextMark *mark, - gdouble within_margin, + double within_margin, gboolean use_align, - gdouble xalign, - gdouble yalign) + double xalign, + double yalign) { GtkTextIter iter; GtkTextPendingScroll *scroll; @@ -2881,10 +2881,10 @@ flush_update_im_spot_location (GtkTextView *text_view) void gtk_text_view_scroll_to_mark (GtkTextView *text_view, GtkTextMark *mark, - gdouble within_margin, + double within_margin, gboolean use_align, - gdouble xalign, - gdouble yalign) + double xalign, + double yalign) { g_return_if_fail (GTK_IS_TEXT_VIEW (text_view)); g_return_if_fail (GTK_IS_TEXT_MARK (mark)); @@ -5340,7 +5340,7 @@ get_iter_from_gesture (GtkTextView *text_view, GdkEventSequence *sequence; GtkTextViewPrivate *priv; int xcoord, ycoord; - gdouble px, py; + double px, py; priv = text_view->priv; sequence = @@ -5365,8 +5365,8 @@ get_iter_from_gesture (GtkTextView *text_view, static void gtk_text_view_click_gesture_pressed (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkTextView *text_view) { GdkEventSequence *sequence; @@ -6112,7 +6112,7 @@ gtk_text_view_move_cursor (GtkTextView *text_view, if (!cursor_visible (text_view)) { GtkScrollStep scroll_step; - gdouble old_xpos, old_ypos; + double old_xpos, old_ypos; switch (step) { @@ -6359,7 +6359,7 @@ gtk_text_view_move_viewport (GtkTextView *text_view, int count) { GtkAdjustment *adjustment; - gdouble increment; + double increment; switch (step) { @@ -6423,8 +6423,8 @@ gtk_text_view_scroll_pages (GtkTextView *text_view, GtkTextIter old_insert; GtkTextIter new_insert; GtkTextIter anchor; - gdouble newval; - gdouble oldval; + double newval; + double oldval; int y0, y1; priv = text_view->priv; @@ -6515,8 +6515,8 @@ gtk_text_view_scroll_hpages (GtkTextView *text_view, GtkTextMark *insert_mark; GtkTextIter old_insert; GtkTextIter new_insert; - gdouble newval; - gdouble oldval; + double newval; + double oldval; int y, height; priv = text_view->priv; @@ -7187,7 +7187,7 @@ drag_gesture_get_text_surface_coords (GtkGestureDrag *gesture, int *x, int *y) { - gdouble sx, sy, ox, oy; + double sx, sy, ox, oy; if (!gtk_gesture_drag_get_start_point (gesture, &sx, &sy) || !gtk_gesture_drag_get_offset (gesture, &ox, &oy)) @@ -7206,8 +7206,8 @@ drag_gesture_get_text_surface_coords (GtkGestureDrag *gesture, static void gtk_text_view_drag_gesture_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkTextView *text_view) { int start_x, start_y, x, y; @@ -7324,8 +7324,8 @@ gtk_text_view_drag_gesture_update (GtkGestureDrag *gesture, static void gtk_text_view_drag_gesture_end (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkTextView *text_view) { gboolean is_touchscreen, clicked_in_selection; @@ -7970,9 +7970,9 @@ gtk_text_view_set_hadjustment_values (GtkTextView *text_view) { GtkTextViewPrivate *priv; int screen_width; - gdouble old_value; - gdouble new_value; - gdouble new_upper; + double old_value; + double new_value; + double new_upper; priv = text_view->priv; @@ -7983,7 +7983,7 @@ gtk_text_view_set_hadjustment_values (GtkTextView *text_view) g_object_set (priv->hadjustment, "lower", 0.0, "upper", new_upper, - "page-size", (gdouble)screen_width, + "page-size", (double)screen_width, "step-increment", screen_width * 0.1, "page-increment", screen_width * 0.9, NULL); @@ -8000,9 +8000,9 @@ gtk_text_view_set_vadjustment_values (GtkTextView *text_view) GtkTextIter first_para; int screen_height; int y; - gdouble old_value; - gdouble new_value; - gdouble new_upper; + double old_value; + double new_value; + double new_upper; priv = text_view->priv; @@ -8013,7 +8013,7 @@ gtk_text_view_set_vadjustment_values (GtkTextView *text_view) g_object_set (priv->vadjustment, "lower", 0.0, "upper", new_upper, - "page-size", (gdouble)screen_height, + "page-size", (double)screen_height, "step-increment", screen_height * 0.1, "page-increment", screen_height * 0.9, NULL); diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h index d16f17f2b5..1d929f040b 100644 --- a/gtk/gtktextview.h +++ b/gtk/gtktextview.h @@ -199,17 +199,17 @@ GtkTextBuffer *gtk_text_view_get_buffer (GtkTextView *text_view); GDK_AVAILABLE_IN_ALL gboolean gtk_text_view_scroll_to_iter (GtkTextView *text_view, GtkTextIter *iter, - gdouble within_margin, + double within_margin, gboolean use_align, - gdouble xalign, - gdouble yalign); + double xalign, + double yalign); GDK_AVAILABLE_IN_ALL void gtk_text_view_scroll_to_mark (GtkTextView *text_view, GtkTextMark *mark, - gdouble within_margin, + double within_margin, gboolean use_align, - gdouble xalign, - gdouble yalign); + double xalign, + double yalign); GDK_AVAILABLE_IN_ALL void gtk_text_view_scroll_mark_onscreen (GtkTextView *text_view, GtkTextMark *mark); diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c index f7e851c6c7..6eb1472a51 100644 --- a/gtk/gtktooltip.c +++ b/gtk/gtktooltip.c @@ -136,8 +136,8 @@ static void gtk_tooltip_set_surface (GtkTooltip *tooltip, static void gtk_tooltip_handle_event_internal (GdkEventType event_type, GdkSurface *surface, GtkWidget *target_widget, - gdouble dx, - gdouble dy); + double dx, + double dy); static GQuark quark_current_tooltip; diff --git a/gtk/gtktreedatalist.c b/gtk/gtktreedatalist.c index 078847239b..b5a479ad29 100644 --- a/gtk/gtktreedatalist.c +++ b/gtk/gtktreedatalist.c @@ -162,7 +162,7 @@ _gtk_tree_data_list_node_to_value (GtkTreeDataList *list, g_value_set_float (value, (float) list->data.v_float); break; case G_TYPE_DOUBLE: - g_value_set_double (value, (gdouble) list->data.v_double); + g_value_set_double (value, (double) list->data.v_double); break; case G_TYPE_STRING: g_value_set_string (value, (char *) list->data.v_pointer); diff --git a/gtk/gtktreedatalist.h b/gtk/gtktreedatalist.h index 9207bce14a..676311786f 100644 --- a/gtk/gtktreedatalist.h +++ b/gtk/gtktreedatalist.h @@ -36,7 +36,7 @@ struct _GtkTreeDataList gint64 v_int64; guint64 v_uint64; float v_float; - gdouble v_double; + double v_double; gpointer v_pointer; } data; }; diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 8b20bedd91..8d03b23af7 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -818,8 +818,8 @@ static void gtk_tree_view_search_pressed_cb (GtkGesture *gestu double y, GtkTreeView *tree_view); static gboolean gtk_tree_view_search_scroll_event (GtkWidget *entry, - gdouble dx, - gdouble dy, + double dx, + double dy, GtkTreeView *tree_view); static gboolean gtk_tree_view_search_key_pressed (GtkEventControllerKey *key, guint keyval, @@ -886,45 +886,45 @@ static void grab_focus_and_unset_draw_keyfocus (GtkTreeView *tree_view); /* Gestures */ static void gtk_tree_view_column_click_gesture_pressed (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkTreeView *tree_view); static void gtk_tree_view_click_gesture_pressed (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkTreeView *tree_view); static void gtk_tree_view_click_gesture_released (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkTreeView *tree_view); static void gtk_tree_view_column_drag_gesture_begin (GtkGestureDrag *gesture, - gdouble start_x, - gdouble start_y, + double start_x, + double start_y, GtkTreeView *tree_view); static void gtk_tree_view_column_drag_gesture_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkTreeView *tree_view); static void gtk_tree_view_column_drag_gesture_end (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkTreeView *tree_view); static void gtk_tree_view_drag_gesture_begin (GtkGestureDrag *gesture, - gdouble start_x, - gdouble start_y, + double start_x, + double start_y, GtkTreeView *tree_view); static void gtk_tree_view_drag_gesture_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkTreeView *tree_view); static void gtk_tree_view_drag_gesture_end (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkTreeView *tree_view); static void gtk_tree_view_motion_controller_enter (GtkEventControllerMotion *controller, double x, @@ -3012,8 +3012,8 @@ gtk_tree_view_click_gesture_pressed (GtkGestureClick *gesture, static void gtk_tree_view_drag_gesture_begin (GtkGestureDrag *gesture, - gdouble start_x, - gdouble start_y, + double start_x, + double start_y, GtkTreeView *tree_view) { GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); @@ -3053,8 +3053,8 @@ gtk_tree_view_drag_gesture_begin (GtkGestureDrag *gesture, static void gtk_tree_view_column_click_gesture_pressed (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkTreeView *tree_view) { GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); @@ -3086,8 +3086,8 @@ gtk_tree_view_column_click_gesture_pressed (GtkGestureClick *gesture, static void gtk_tree_view_column_drag_gesture_begin (GtkGestureDrag *gesture, - gdouble start_x, - gdouble start_y, + double start_x, + double start_y, GtkTreeView *tree_view) { GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); @@ -3227,8 +3227,8 @@ gtk_tree_view_button_release_column_resize (GtkTreeView *tree_view) static void gtk_tree_view_column_drag_gesture_end (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkTreeView *tree_view) { GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); @@ -3248,8 +3248,8 @@ gtk_tree_view_column_drag_gesture_end (GtkGestureDrag *gesture, static void gtk_tree_view_drag_gesture_end (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkTreeView *tree_view) { gtk_tree_view_stop_rubber_band (tree_view); @@ -3258,8 +3258,8 @@ gtk_tree_view_drag_gesture_end (GtkGestureDrag *gesture, static void gtk_tree_view_click_gesture_released (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkTreeView *tree_view) { GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); @@ -3550,8 +3550,8 @@ update_prelight (GtkTreeView *tree_view, static gboolean gtk_tree_view_motion_resize_column (GtkTreeView *tree_view, - gdouble x, - gdouble y) + double x, + double y) { GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); int new_width; @@ -3577,7 +3577,7 @@ gtk_tree_view_update_current_reorder (GtkTreeView *tree_view) GtkTreeViewColumnReorder *reorder = NULL; GdkEventSequence *sequence; GList *list; - gdouble x; + double x; sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (priv->column_drag_gesture)); @@ -3607,7 +3607,7 @@ gtk_tree_view_vertical_autoscroll (GtkTreeView *tree_view) if (gtk_gesture_is_recognized (priv->drag_gesture)) { GdkEventSequence *sequence; - gdouble py; + double py; sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (priv->drag_gesture)); gtk_gesture_get_point (priv->drag_gesture, sequence, NULL, &py); @@ -3642,7 +3642,7 @@ gtk_tree_view_horizontal_autoscroll (GtkTreeView *tree_view) GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); GdkEventSequence *sequence; GdkRectangle visible_rect; - gdouble x; + double x; int offset; sequence = gtk_gesture_single_get_current_sequence @@ -3669,8 +3669,8 @@ gtk_tree_view_horizontal_autoscroll (GtkTreeView *tree_view) static void gtk_tree_view_motion_drag_column (GtkTreeView *tree_view, - gdouble x, - gdouble y) + double x, + double y) { GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); GtkTreeViewColumn *column = priv->drag_column; @@ -3849,7 +3849,7 @@ gtk_tree_view_update_rubber_band_selection (GtkTreeView *tree_view) GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); GtkTreeRBTree *start_tree, *end_tree; GtkTreeRBNode *start_node, *end_node; - gdouble start_y, offset_y; + double start_y, offset_y; int bin_y; if (!gtk_gesture_is_active (priv->drag_gesture)) @@ -3986,7 +3986,7 @@ static void gtk_tree_view_update_rubber_band (GtkTreeView *tree_view) { GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); - gdouble start_x, start_y, offset_x, offset_y, x, y; + double start_x, start_y, offset_x, offset_y, x, y; int bin_x, bin_y; if (!gtk_gesture_is_recognized (priv->drag_gesture)) @@ -4016,7 +4016,7 @@ gtk_tree_view_snapshot_rubber_band (GtkTreeView *tree_view, GtkSnapshot *snapshot) { GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); - gdouble start_x, start_y, offset_x, offset_y; + double start_x, start_y, offset_x, offset_y; GdkRectangle rect; GtkStyleContext *context; int bin_x, bin_y; @@ -4054,12 +4054,12 @@ gtk_tree_view_snapshot_rubber_band (GtkTreeView *tree_view, static void gtk_tree_view_column_drag_gesture_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkTreeView *tree_view) { GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); - gdouble start_x, start_y, x, y; + double start_x, start_y, x, y; GdkEventSequence *sequence; sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture)); @@ -4079,8 +4079,8 @@ gtk_tree_view_column_drag_gesture_update (GtkGestureDrag *gesture, static void gtk_tree_view_drag_gesture_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkTreeView *tree_view) { GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); @@ -5537,7 +5537,7 @@ get_separator_height (GtkTreeView *tree_view) { GtkStyleContext *context; GtkCssStyle *style; - gdouble d; + double d; int min_size; context = gtk_widget_get_style_context (GTK_WIDGET (tree_view)); @@ -6554,7 +6554,7 @@ gtk_tree_view_top_row_to_dy (GtkTreeView *tree_view) new_dy = MAX (0, new_dy); priv->in_top_row_to_dy = TRUE; - gtk_adjustment_set_value (priv->vadjustment, (gdouble)new_dy); + gtk_adjustment_set_value (priv->vadjustment, (double)new_dy); priv->in_top_row_to_dy = FALSE; } @@ -7017,7 +7017,7 @@ gtk_tree_view_maybe_begin_dragging_row (GtkTreeView *tree_view) { GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); GtkWidget *widget = GTK_WIDGET (tree_view); - gdouble start_x, start_y, offset_x, offset_y; + double start_x, start_y, offset_x, offset_y; TreeViewDragInfo *di; GtkTreePath *path = NULL; int button; @@ -13130,8 +13130,8 @@ gtk_tree_view_get_dest_row_at_pos (GtkTreeView *tree_view, GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); int cell_y; int bin_x, bin_y; - gdouble offset_into_row; - gdouble fourth; + double offset_into_row; + double fourth; GdkRectangle cell; GtkTreeViewColumn *column = NULL; GtkTreePath *tmp_path = NULL; @@ -13720,8 +13720,8 @@ gtk_tree_view_search_pressed_cb (GtkGesture *gesture, static gboolean gtk_tree_view_search_scroll_event (GtkWidget *widget, - gdouble dx, - gdouble dy, + double dx, + double dy, GtkTreeView *tree_view) { GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index ad81ebb946..b1bc4d8eba 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -91,12 +91,12 @@ static void gtk_tree_view_column_update_button (GtkTreeViewColum /* Button signal handlers */ static void column_button_drag_begin (GtkGestureDrag *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkTreeViewColumn *column); static void column_button_drag_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkTreeViewColumn *column); static void gtk_tree_view_column_button_clicked (GtkWidget *widget, @@ -1045,8 +1045,8 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column) static void column_button_drag_begin (GtkGestureDrag *gesture, - gdouble x, - gdouble y, + double x, + double y, GtkTreeViewColumn *column) { GtkTreeViewColumnPrivate *priv = column->priv; @@ -1065,8 +1065,8 @@ column_button_drag_begin (GtkGestureDrag *gesture, static void column_button_drag_update (GtkGestureDrag *gesture, - gdouble offset_x, - gdouble offset_y, + double offset_x, + double offset_y, GtkTreeViewColumn *column) { GtkTreeViewColumnPrivate *priv = column->priv; diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index 890a24f373..6e7097ec1f 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -163,7 +163,7 @@ viewport_set_adjustment_values (GtkViewport *viewport, GtkScrollablePolicy scroll_policy; GtkScrollablePolicy other_scroll_policy; GtkOrientation other_orientation; - gdouble upper, value; + double upper, value; int viewport_size, other_viewport_size; int view_width, view_height; @@ -223,7 +223,7 @@ viewport_set_adjustment_values (GtkViewport *viewport, if (orientation == GTK_ORIENTATION_HORIZONTAL && _gtk_widget_get_direction (GTK_WIDGET (viewport)) == GTK_TEXT_DIR_RTL) { - gdouble dist = gtk_adjustment_get_upper (adjustment) + double dist = gtk_adjustment_get_upper (adjustment) - value - gtk_adjustment_get_page_size (adjustment); value = upper - dist - viewport_size; diff --git a/gtk/gtkvolumebutton.c b/gtk/gtkvolumebutton.c index 431a1d2820..c9145749b9 100644 --- a/gtk/gtkvolumebutton.c +++ b/gtk/gtkvolumebutton.c @@ -85,7 +85,7 @@ static gboolean cb_query_tooltip (GtkWidget *button, GtkTooltip *tooltip, gpointer user_data); static void cb_value_changed (GtkVolumeButton *button, - gdouble value, + double value, gpointer user_data); G_DEFINE_TYPE (GtkVolumeButton, gtk_volume_button, GTK_TYPE_SCALE_BUTTON) @@ -222,7 +222,7 @@ cb_query_tooltip (GtkWidget *button, { GtkScaleButton *scale_button = GTK_SCALE_BUTTON (button); GtkAdjustment *adjustment; - gdouble val; + double val; char *str; adjustment = gtk_scale_button_get_adjustment (scale_button); @@ -257,7 +257,7 @@ cb_query_tooltip (GtkWidget *button, } static void -cb_value_changed (GtkVolumeButton *button, gdouble value, gpointer user_data) +cb_value_changed (GtkVolumeButton *button, double value, gpointer user_data) { gtk_widget_trigger_tooltip_query (GTK_WIDGET (button)); } diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 70158b101b..7a9cb2b478 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -797,8 +797,8 @@ gtk_widget_real_snapshot (GtkWidget *widget, static gboolean gtk_widget_real_contains (GtkWidget *widget, - gdouble x, - gdouble y) + double x, + double y) { GtkCssBoxes boxes; @@ -1887,7 +1887,7 @@ _gtk_widget_emulate_press (GtkWidget *widget, { GtkWidget *next_child, *parent; GdkEvent *press; - gdouble x, y; + double x, y; graphene_point_t p; if (event_widget == widget) @@ -9735,8 +9735,8 @@ gtk_widget_get_allocation (GtkWidget *widget, **/ gboolean gtk_widget_contains (GtkWidget *widget, - gdouble x, - gdouble y) + double x, + double y) { g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); @@ -9767,8 +9767,8 @@ gtk_widget_can_be_picked (GtkWidget *widget, static GtkWidget * gtk_widget_do_pick (GtkWidget *widget, - gdouble x, - gdouble y, + double x, + double y, GtkPickFlags flags) { GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget); @@ -9874,8 +9874,8 @@ gtk_widget_do_pick (GtkWidget *widget, **/ GtkWidget * gtk_widget_pick (GtkWidget *widget, - gdouble x, - gdouble y, + double x, + double y, GtkPickFlags flags) { g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); @@ -10101,7 +10101,7 @@ gtk_widget_get_allocated_baseline (GtkWidget *widget) **/ void gtk_widget_set_opacity (GtkWidget *widget, - gdouble opacity) + double opacity) { GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget); guint8 alpha; @@ -10131,7 +10131,7 @@ gtk_widget_set_opacity (GtkWidget *widget, * * Returns: the requested opacity for this widget. **/ -gdouble +double gtk_widget_get_opacity (GtkWidget *widget) { GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget); diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index ead4b6b429..771e584ab4 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -275,8 +275,8 @@ struct _GtkWidgetClass GtkSnapshot *snapshot); gboolean (* contains) (GtkWidget *widget, - gdouble x, - gdouble y); + double x, + double y); /*< private >*/ @@ -644,12 +644,12 @@ gboolean gtk_widget_translate_coordinates (GtkWidget *src_widget, GDK_AVAILABLE_IN_ALL gboolean gtk_widget_contains (GtkWidget *widget, - gdouble x, - gdouble y); + double x, + double y); GDK_AVAILABLE_IN_ALL GtkWidget * gtk_widget_pick (GtkWidget *widget, - gdouble x, - gdouble y, + double x, + double y, GtkPickFlags flags); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 41f06bbcc0..274b6d7ab9 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -1322,8 +1322,8 @@ get_edge_for_coordinates (GtkWindow *window, static void click_gesture_pressed_cb (GtkGestureClick *gesture, int n_press, - gdouble x, - gdouble y, + double x, + double y, GtkWindow *window) { GtkWindowPrivate *priv = gtk_window_get_instance_private (window); @@ -6903,8 +6903,8 @@ gtk_window_update_pointer_focus (GtkWindow *window, GdkDevice *device, GdkEventSequence *sequence, GtkWidget *target, - gdouble x, - gdouble y) + double x, + double y) { GtkWindowPrivate *priv = gtk_window_get_instance_private (window); GtkPointerFocus *focus; diff --git a/gtk/gtkwindowprivate.h b/gtk/gtkwindowprivate.h index 4cb31c3eed..a9546272ec 100644 --- a/gtk/gtkwindowprivate.h +++ b/gtk/gtkwindowprivate.h @@ -104,8 +104,8 @@ void gtk_window_update_pointer_focus (GtkWindow *window, GdkDevice *device, GdkEventSequence *sequence, GtkWidget *target, - gdouble x, - gdouble y); + double x, + double y); void gtk_window_set_pointer_focus_grab (GtkWindow *window, GdkDevice *device, GdkEventSequence *sequence, diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c index b0f54280fb..008b3e1ac7 100644 --- a/gtk/inspector/visual.c +++ b/gtk/inspector/visual.c @@ -204,7 +204,7 @@ get_font_scale (GtkInspectorVisual *vis) static void update_font_scale (GtkInspectorVisual *vis, - gdouble factor, + double factor, gboolean update_adjustment, gboolean update_entry) { @@ -228,7 +228,7 @@ static void font_scale_adjustment_changed (GtkAdjustment *adjustment, GtkInspectorVisual *vis) { - gdouble factor; + double factor; factor = gtk_adjustment_get_value (adjustment); update_font_scale (vis, factor, FALSE, TRUE); @@ -238,7 +238,7 @@ static void font_scale_entry_activated (GtkEntry *entry, GtkInspectorVisual *vis) { - gdouble factor; + double factor; char *err = NULL; factor = g_strtod (gtk_editable_get_text (GTK_EDITABLE (entry)), &err); @@ -772,7 +772,7 @@ init_cursor_size (GtkInspectorVisual *vis) if (size == 0) size = 32; - gtk_adjustment_set_value (vis->scale_adjustment, (gdouble)size); + gtk_adjustment_set_value (vis->scale_adjustment, (double)size); g_signal_connect (vis->cursor_size_adjustment, "value-changed", G_CALLBACK (cursor_size_changed), vis); } @@ -816,7 +816,7 @@ init_scale (GtkInspectorVisual *vis) #if defined (GDK_WINDOWING_X11) if (GDK_IS_X11_DISPLAY (vis->display)) { - gdouble scale; + double scale; scale = gdk_monitor_get_scale_factor (gdk_x11_display_get_primary_monitor (vis->display)); gtk_adjustment_set_value (vis->scale_adjustment, scale); @@ -845,7 +845,7 @@ init_animation (GtkInspectorVisual *vis) static void update_slowdown (GtkInspectorVisual *vis, - gdouble slowdown, + double slowdown, gboolean update_adjustment, gboolean update_entry) { @@ -868,8 +868,8 @@ static void slowdown_adjustment_changed (GtkAdjustment *adjustment, GtkInspectorVisual *vis) { - gdouble value = gtk_adjustment_get_value (adjustment); - gdouble previous = CLAMP (log2 (_gtk_get_slowdown ()), + double value = gtk_adjustment_get_value (adjustment); + double previous = CLAMP (log2 (_gtk_get_slowdown ()), gtk_adjustment_get_lower (adjustment), gtk_adjustment_get_upper (adjustment)); @@ -881,7 +881,7 @@ static void slowdown_entry_activated (GtkEntry *entry, GtkInspectorVisual *vis) { - gdouble slowdown; + double slowdown; char *err = NULL; slowdown = g_strtod (gtk_editable_get_text (GTK_EDITABLE (entry)), &err); diff --git a/gtk/tools/gdkpixbufutils.c b/gtk/tools/gdkpixbufutils.c index 4912f7962f..d1a627c37b 100644 --- a/gtk/tools/gdkpixbufutils.c +++ b/gtk/tools/gdkpixbufutils.c @@ -76,7 +76,7 @@ size_prepared_cb (GdkPixbufLoader *loader, int height, gpointer data) { - gdouble *scale = data; + double *scale = data; width = MAX (*scale * width, 1); height = MAX (*scale * height, 1); @@ -91,7 +91,7 @@ size_prepared_cb (GdkPixbufLoader *loader, GdkPixbuf * _gdk_pixbuf_new_from_stream_scaled (GInputStream *stream, const char *format, - gdouble scale, + double scale, GCancellable *cancellable, GError **error) { diff --git a/modules/printbackends/gtkprintbackendcloudprint.c b/modules/printbackends/gtkprintbackendcloudprint.c index a78bbe6d73..f99bcca2be 100644 --- a/modules/printbackends/gtkprintbackendcloudprint.c +++ b/modules/printbackends/gtkprintbackendcloudprint.c @@ -94,8 +94,8 @@ static void gtk_print_backend_cloudprint_print_stream (GtkPri GDestroyNotify dnotify); static cairo_surface_t * cloudprint_printer_create_cairo_surface (GtkPrinter *printer, GtkPrintSettings *settings, - gdouble width, - gdouble height, + double width, + double height, GIOChannel *cache_io); static void cloudprint_printer_request_details (GtkPrinter *printer); TGOAAccount * t_goa_account_copy (TGOAAccount *account); @@ -235,8 +235,8 @@ _cairo_write (void *closure, static cairo_surface_t * cloudprint_printer_create_cairo_surface (GtkPrinter *printer, GtkPrintSettings *settings, - gdouble width, - gdouble height, + double width, + double height, GIOChannel *cache_io) { cairo_surface_t *surface; @@ -942,7 +942,7 @@ cloudprint_printer_prepare_for_print (GtkPrinter *printer, GtkPrintSettings *settings, GtkPageSetup *page_setup) { - gdouble scale; + double scale; gtk_print_job_set_pages (print_job, gtk_print_settings_get_print_pages (settings)); gtk_print_job_set_page_ranges (print_job, NULL, 0); diff --git a/modules/printbackends/gtkprintbackendcups.c b/modules/printbackends/gtkprintbackendcups.c index 940b57f393..6453e824d9 100644 --- a/modules/printbackends/gtkprintbackendcups.c +++ b/modules/printbackends/gtkprintbackendcups.c @@ -185,16 +185,16 @@ static void cups_printer_request_details (GtkPrinter static gboolean cups_request_default_printer (GtkPrintBackendCups *print_backend); static gboolean cups_request_ppd (GtkPrinter *printer); static gboolean cups_printer_get_hard_margins (GtkPrinter *printer, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right); + double *top, + double *bottom, + double *left, + double *right); static gboolean cups_printer_get_hard_margins_for_paper_size (GtkPrinter *printer, GtkPaperSize *paper_size, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right); + double *top, + double *bottom, + double *left, + double *right); static GtkPrintCapabilities cups_printer_get_capabilities (GtkPrinter *printer); static void set_option_from_settings (GtkPrinterOption *option, GtkPrintSettings *setting); @@ -210,8 +210,8 @@ static void gtk_print_backend_cups_print_stream (GtkPrintBack GDestroyNotify dnotify); static cairo_surface_t * cups_printer_create_cairo_surface (GtkPrinter *printer, GtkPrintSettings *settings, - gdouble width, - gdouble height, + double width, + double height, GIOChannel *cache_io); static void gtk_print_backend_cups_set_password (GtkPrintBackend *backend, @@ -381,8 +381,8 @@ _cairo_write_to_cups (void *closure, static cairo_surface_t * cups_printer_create_cairo_surface (GtkPrinter *printer, GtkPrintSettings *settings, - gdouble width, - gdouble height, + double width, + double height, GIOChannel *cache_io) { cairo_surface_t *surface; @@ -6763,10 +6763,10 @@ cups_printer_get_default_page_size (GtkPrinter *printer) static gboolean cups_printer_get_hard_margins (GtkPrinter *printer, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right) + double *top, + double *bottom, + double *left, + double *right) { GtkPrinterCups *cups_printer = GTK_PRINTER_CUPS (printer); ppd_file_t *ppd_file; @@ -6796,10 +6796,10 @@ cups_printer_get_hard_margins (GtkPrinter *printer, static gboolean cups_printer_get_hard_margins_for_paper_size (GtkPrinter *printer, GtkPaperSize *paper_size, - gdouble *top, - gdouble *bottom, - gdouble *left, - gdouble *right) + double *top, + double *bottom, + double *left, + double *right) { ppd_file_t *ppd_file; ppd_size_t *size; diff --git a/modules/printbackends/gtkprintbackendfile.c b/modules/printbackends/gtkprintbackendfile.c index 4e0691702e..cb93537884 100644 --- a/modules/printbackends/gtkprintbackendfile.c +++ b/modules/printbackends/gtkprintbackendfile.c @@ -93,8 +93,8 @@ static void gtk_print_backend_file_print_stream (GtkPrintBack GDestroyNotify dnotify); static cairo_surface_t * file_printer_create_cairo_surface (GtkPrinter *printer, GtkPrintSettings *settings, - gdouble width, - gdouble height, + double width, + double height, GIOChannel *cache_io); static GList * file_printer_list_papers (GtkPrinter *printer); @@ -318,8 +318,8 @@ _cairo_write (void *closure, static cairo_surface_t * file_printer_create_cairo_surface (GtkPrinter *printer, GtkPrintSettings *settings, - gdouble width, - gdouble height, + double width, + double height, GIOChannel *cache_io) { cairo_surface_t *surface; @@ -770,7 +770,7 @@ file_printer_prepare_for_print (GtkPrinter *printer, GtkPrintSettings *settings, GtkPageSetup *page_setup) { - gdouble scale; + double scale; GtkPrintPages pages; GtkPageRange *ranges; int n_ranges; diff --git a/modules/printbackends/gtkprintbackendlpr.c b/modules/printbackends/gtkprintbackendlpr.c index 1e8e0e3550..8fba9b71fd 100644 --- a/modules/printbackends/gtkprintbackendlpr.c +++ b/modules/printbackends/gtkprintbackendlpr.c @@ -69,8 +69,8 @@ static void lpr_printer_prepare_for_print (GtkPrinter GtkPageSetup *page_setup); static cairo_surface_t * lpr_printer_create_cairo_surface (GtkPrinter *printer, GtkPrintSettings *settings, - gdouble width, - gdouble height, + double width, + double height, GIOChannel *cache_io); static void gtk_print_backend_lpr_print_stream (GtkPrintBackend *print_backend, GtkPrintJob *job, @@ -184,8 +184,8 @@ _cairo_write (void *closure, static cairo_surface_t * lpr_printer_create_cairo_surface (GtkPrinter *printer, GtkPrintSettings *settings, - gdouble width, - gdouble height, + double width, + double height, GIOChannel *cache_io) { cairo_surface_t *surface; diff --git a/tests/motion-compression.c b/tests/motion-compression.c index 33be6b617e..b0b1a8edbb 100644 --- a/tests/motion-compression.c +++ b/tests/motion-compression.c @@ -6,8 +6,8 @@ int cursor_x, cursor_y; static void motion_cb (GtkEventControllerMotion *motion, - gdouble x, - gdouble y, + double x, + double y, GtkWidget *widget) { float processing_ms = gtk_adjustment_get_value (adjustment); diff --git a/tests/rendernode-create-tests.c b/tests/rendernode-create-tests.c index 97418a60cf..2bd7a3876b 100644 --- a/tests/rendernode-create-tests.c +++ b/tests/rendernode-create-tests.c @@ -5,12 +5,12 @@ static void hsv_to_rgb (GdkRGBA *rgba, - gdouble h, - gdouble s, - gdouble v) + double h, + double s, + double v) { - gdouble hue, saturation, value; - gdouble f, p, q, t; + double hue, saturation, value; + double f, p, q, t; rgba->alpha = 1.0; diff --git a/tests/scrolling-performance.c b/tests/scrolling-performance.c index 3d5b165623..f386c911b7 100644 --- a/tests/scrolling-performance.c +++ b/tests/scrolling-performance.c @@ -51,11 +51,11 @@ create_widget_factory_content (void) static void set_adjustment_to_fraction (GtkAdjustment *adjustment, - gdouble fraction) + double fraction) { - gdouble upper = gtk_adjustment_get_upper (adjustment); - gdouble lower = gtk_adjustment_get_lower (adjustment); - gdouble page_size = gtk_adjustment_get_page_size (adjustment); + double upper = gtk_adjustment_get_upper (adjustment); + double lower = gtk_adjustment_get_lower (adjustment); + double page_size = gtk_adjustment_get_page_size (adjustment); gtk_adjustment_set_value (adjustment, (1 - fraction) * lower + @@ -69,7 +69,7 @@ scroll_viewport (GtkWidget *viewport, { static gint64 start_time; gint64 now = gdk_frame_clock_get_frame_time (frame_clock); - gdouble elapsed; + double elapsed; GtkAdjustment *hadjustment, *vadjustment; if (start_time == 0) diff --git a/tests/testassistant.c b/tests/testassistant.c index 0d0d88259a..e85396cda1 100644 --- a/tests/testassistant.c +++ b/tests/testassistant.c @@ -109,7 +109,7 @@ progress_timeout (GtkWidget *assistant) { GtkWidget *progress; int current_page; - gdouble value; + double value; current_page = gtk_assistant_get_current_page (GTK_ASSISTANT (assistant)); progress = gtk_assistant_get_nth_page (GTK_ASSISTANT (assistant), current_page); diff --git a/tests/testframe.c b/tests/testframe.c index 5a47758242..d2345b7dd5 100644 --- a/tests/testframe.c +++ b/tests/testframe.c @@ -23,8 +23,8 @@ #define EPSILON 1e-10 -static gdouble -double_normalize (gdouble n) +static double +double_normalize (double n) { if (fabs (1.0 - n) < EPSILON) n = 1.0; @@ -37,7 +37,7 @@ double_normalize (gdouble n) static void spin_xalign_cb (GtkSpinButton *spin, GtkFrame *frame) { - gdouble xalign; + double xalign; xalign = double_normalize (gtk_spin_button_get_value (spin)); gtk_frame_set_label_align (frame, xalign); diff --git a/tests/testgrid.c b/tests/testgrid.c index bb9a4ce829..e2af187dc5 100644 --- a/tests/testgrid.c +++ b/tests/testgrid.c @@ -34,8 +34,8 @@ static GtkOrientation o; static void toggle_orientation (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkGrid *grid) { o = 1 - o; diff --git a/tests/testgtk.c b/tests/testgtk.c index 310f59ab71..028985e63b 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -2020,7 +2020,7 @@ entry_progress_timeout (gpointer data) } else { - gdouble fraction; + double fraction; fraction = gtk_entry_get_progress_fraction (GTK_ENTRY (data)); @@ -2463,8 +2463,8 @@ spin_button_time_output_func (GtkSpinButton *spin_button) { GtkAdjustment *adjustment; static char buf[6]; - gdouble hours; - gdouble minutes; + double hours; + double minutes; adjustment = gtk_spin_button_get_adjustment (spin_button); hours = gtk_adjustment_get_value (adjustment) / 60.0; @@ -2477,7 +2477,7 @@ spin_button_time_output_func (GtkSpinButton *spin_button) static int spin_button_month_input_func (GtkSpinButton *spin_button, - gdouble *new_val) + double *new_val) { int i; static const char *month[12] = { "January", "February", "March", "April", @@ -2502,7 +2502,7 @@ spin_button_month_input_func (GtkSpinButton *spin_button, *new_val = 0.0; return GTK_INPUT_ERROR; } - *new_val = (gdouble) i; + *new_val = (double) i; return TRUE; } @@ -2510,7 +2510,7 @@ static int spin_button_month_output_func (GtkSpinButton *spin_button) { GtkAdjustment *adjustment; - gdouble value; + double value; int i; static const char *month[12] = { "January", "February", "March", "April", "May", "June", "July", "August", "September", @@ -2529,11 +2529,11 @@ spin_button_month_output_func (GtkSpinButton *spin_button) static int spin_button_hex_input_func (GtkSpinButton *spin_button, - gdouble *new_val) + double *new_val) { const char *buf; char *err; - gdouble res; + double res; buf = gtk_editable_get_text (GTK_EDITABLE (spin_button)); res = strtol(buf, &err, 16); @@ -2549,7 +2549,7 @@ spin_button_hex_output_func (GtkSpinButton *spin_button) { GtkAdjustment *adjustment; static char buf[7]; - gdouble val; + double val; adjustment = gtk_spin_button_get_adjustment (spin_button); val = gtk_adjustment_get_value (adjustment); @@ -3516,7 +3516,7 @@ create_display_screen (GtkWidget *widget) static char * reformat_value (GtkScale *scale, - gdouble value) + double value) { return g_strdup_printf ("-->%0.*g<--", gtk_scale_get_digits (scale), value); @@ -5115,7 +5115,7 @@ static gboolean progress_timeout (gpointer data) { ProgressData *pdata = data; - gdouble new_val; + double new_val; char *text; if (pdata->activity) diff --git a/tests/testiconview.c b/tests/testiconview.c index b0f8808cf5..e3494db792 100644 --- a/tests/testiconview.c +++ b/tests/testiconview.c @@ -358,8 +358,8 @@ do_popup_menu (GtkWidget *icon_list, static void press_handler (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkWidget *widget) { GtkTreePath *path = NULL; diff --git a/tests/testlevelbar.c b/tests/testlevelbar.c index 242aa727dd..2886d66f7c 100644 --- a/tests/testlevelbar.c +++ b/tests/testlevelbar.c @@ -44,7 +44,7 @@ static gboolean increase_level (gpointer data) { GtkLevelBar *bar = data; - gdouble value; + double value; value = gtk_level_bar_get_value (bar); value += 0.1; diff --git a/tests/testscale.c b/tests/testscale.c index 277a837e4b..2c73d30f1b 100644 --- a/tests/testscale.c +++ b/tests/testscale.c @@ -64,8 +64,8 @@ trough (GtkToggleButton *button) } } -gdouble marks[3] = { 0.0, 50.0, 100.0 }; -gdouble extra_marks[2] = { 20.0, 40.0 }; +double marks[3] = { 0.0, 50.0, 100.0 }; +double extra_marks[2] = { 20.0, 40.0 }; static void extra (GtkToggleButton *button) @@ -114,7 +114,7 @@ int main (int argc, char *argv[]) "<small>Right</small>" }; - gdouble bath_marks[4] = { 0.0, 33.3, 66.6, 100.0 }; + double bath_marks[4] = { 0.0, 33.3, 66.6, 100.0 }; const char *bath_labels[4] = { "<span color='blue' size='small'>Cold</span>", "<span size='small'>Baby bath</span>", @@ -122,7 +122,7 @@ int main (int argc, char *argv[]) "<span color='Red' size='small'>Hot</span>" }; - gdouble pos_marks[4] = { 0.0, 33.3, 66.6, 100.0 }; + double pos_marks[4] = { 0.0, 33.3, 66.6, 100.0 }; const char *pos_labels[4] = { "Left", "Right", "Top", "Bottom" }; gboolean done = FALSE; diff --git a/tests/testscrolledwindow.c b/tests/testscrolledwindow.c index 6642ef3b44..631b2059aa 100644 --- a/tests/testscrolledwindow.c +++ b/tests/testscrolledwindow.c @@ -24,7 +24,7 @@ content_width_changed (GtkSpinButton *spin_button, gpointer data) { GtkScrolledWindow *swindow = data; - gdouble value; + double value; value = gtk_spin_button_get_value (spin_button); gtk_scrolled_window_set_min_content_width (swindow, (int)value); @@ -35,7 +35,7 @@ content_height_changed (GtkSpinButton *spin_button, gpointer data) { GtkScrolledWindow *swindow = data; - gdouble value; + double value; value = gtk_spin_button_get_value (spin_button); gtk_scrolled_window_set_min_content_height (swindow, (int)value); diff --git a/tests/testtreemodel.c b/tests/testtreemodel.c index 913bfce662..b4d0b8b8b4 100644 --- a/tests/testtreemodel.c +++ b/tests/testtreemodel.c @@ -211,7 +211,7 @@ test_run (const char *title, { int i, k, d, items; GTimer *timer; - gdouble elapsed; + double elapsed; int memused; #ifdef HAVE_MALLINFO int uordblks_before = 0; diff --git a/tests/testtreepos.c b/tests/testtreepos.c index 2980c027b5..81951c38e6 100644 --- a/tests/testtreepos.c +++ b/tests/testtreepos.c @@ -55,8 +55,8 @@ clicked_icon (GtkTreeView *tv, static void release_event (GtkGestureClick *gesture, guint n_press, - gdouble x, - gdouble y, + double x, + double y, GtkTreeView *tv) { GtkTreePath *path; diff --git a/tests/testvolumebutton.c b/tests/testvolumebutton.c index 7fb886dcf4..0291d3d7b4 100644 --- a/tests/testvolumebutton.c +++ b/tests/testvolumebutton.c @@ -19,7 +19,7 @@ static void value_changed (GtkWidget *button, - gdouble volume, + double volume, gpointer user_data) { g_message ("volume changed to %f", volume); diff --git a/tests/testwidgetfocus.c b/tests/testwidgetfocus.c index 0d583fe30a..e28d4aa794 100644 --- a/tests/testwidgetfocus.c +++ b/tests/testwidgetfocus.c @@ -202,8 +202,8 @@ gtk_focus_widget_snapshot (GtkWidget *widget, GtkSnapshot *snapshot) static void motion_cb (GtkEventControllerMotion *controller, - gdouble x, - gdouble y, + double x, + double y, GtkWidget *widget) { GtkFocusWidget *self = GTK_FOCUS_WIDGET (widget); diff --git a/tests/video-timer.c b/tests/video-timer.c index cc59a9525a..ed070e111f 100644 --- a/tests/video-timer.c +++ b/tests/video-timer.c @@ -4,7 +4,7 @@ #include "variable.h" typedef struct { - gdouble angle; + double angle; gint64 stream_time; gint64 clock_time; gint64 frame_counter; diff --git a/testsuite/a11y/accessibility-dump.c b/testsuite/a11y/accessibility-dump.c index d1189dc41e..748cbcf106 100644 --- a/testsuite/a11y/accessibility-dump.c +++ b/testsuite/a11y/accessibility-dump.c @@ -435,7 +435,7 @@ dump_atk_value (AtkValue *atk_value, GString *string) { AtkRange *range; - gdouble value; + double value; char *text; value = 0.0; diff --git a/testsuite/a11y/tree-performance.c b/testsuite/a11y/tree-performance.c index c25e491bf4..d04bbb7adc 100644 --- a/testsuite/a11y/tree-performance.c +++ b/testsuite/a11y/tree-performance.c @@ -147,7 +147,7 @@ static void test_performance_list (void) { GtkBuilder *builder; - gdouble elapsed; + double elapsed; GtkWidget *window; GError *error = NULL; @@ -172,7 +172,7 @@ static void test_a11y_performance_list (void) { GtkBuilder *builder; - gdouble elapsed; + double elapsed; GtkWidget *window; GError *error = NULL; int count_before; @@ -294,7 +294,7 @@ static void test_performance_tree (void) { GtkBuilder *builder; - gdouble elapsed; + double elapsed; GtkWidget *window; GError *error = NULL; @@ -319,7 +319,7 @@ static void test_a11y_performance_tree (void) { GtkBuilder *builder; - gdouble elapsed; + double elapsed; GtkWidget *window; GError *error = NULL; int count_before; diff --git a/testsuite/a11y/value.c b/testsuite/a11y/value.c index 376eada8ea..f43acf933d 100644 --- a/testsuite/a11y/value.c +++ b/testsuite/a11y/value.c @@ -61,8 +61,8 @@ test_basic (GtkWidget *widget) NotifyData notify_data; AtkObject *atk_object; AtkValue *atk_value; - gdouble value = 50; - gdouble ret; + double value = 50; + double ret; char *text; atk_object = gtk_widget_get_accessible (widget); diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c index 63c0b5d67f..8d8f9e3d01 100644 --- a/testsuite/gtk/builder.c +++ b/testsuite/gtk/builder.c @@ -736,7 +736,7 @@ test_spin_button (void) "</interface>"; GObject *obj; GtkAdjustment *adjustment; - gdouble value; + double value; builder = builder_new_from_string (buffer, -1, NULL); obj = gtk_builder_get_object (builder, "spinbutton1"); diff --git a/testsuite/gtk/gestures.c b/testsuite/gtk/gestures.c index 07dc374858..595c79ea8a 100644 --- a/testsuite/gtk/gestures.c +++ b/testsuite/gtk/gestures.c @@ -81,8 +81,8 @@ point_press (PointState *point, static void point_update (PointState *point, GtkWidget *widget, - gdouble x, - gdouble y) + double x, + double y) { GdkDisplay *display; GdkDevice *device; @@ -247,7 +247,7 @@ typedef struct { } GestureData; static void -press_cb (GtkGesture *g, int n_press, gdouble x, gdouble y, gpointer data) +press_cb (GtkGesture *g, int n_press, double x, double y, gpointer data) { GtkEventController *c = GTK_EVENT_CONTROLLER (g); GdkEventSequence *sequence; diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c index a707fbc984..dda0f22d2b 100644 --- a/testsuite/gtk/notify.c +++ b/testsuite/gtk/notify.c @@ -272,10 +272,10 @@ check_property (GObject *instance, GParamSpec *pspec) guint i; NotifyData data; gulong id; - gdouble value; - gdouble new_value; + double value; + double new_value; int current_count; - gdouble delta; + double delta; data.name = pspec->name; data.count = 0; |