[gtk/wip/baedert/for-master: 67/69] scrolledwindow: s/gint/int/g

[Timm Bäder <baedert src gnome org>]

commit 12aee5753213d85b131cc6c4f43729c9bb18082a
Author: Timm Bäder <mail baedert org>
Date:   Wed Jul 22 06:26:31 2020 +0200

    scrolledwindow: s/gint/int/g

 gtk/gtkscrolledwindow.c | 62 ++++++++++++++++++++++++-------------------------
 gtk/gtkscrolledwindow.h | 16 ++++++-------
 2 files changed, 39 insertions(+), 39 deletions(-)
---
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index bb74c4f17b..951c850150 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -265,10 +265,10 @@ typedef struct
   guint    propagate_natural_height : 1;
   guint    smooth_scroll            : 1;
 
-  gint     min_content_width;
-  gint     min_content_height;
-  gint     max_content_width;
-  gint     max_content_height;
+  int      min_content_width;
+  int      min_content_height;
+  int      max_content_width;
+  int      max_content_height;
 
   guint scroll_events_overshoot_id;
 
@@ -391,8 +391,8 @@ static void _gtk_scrolled_window_set_adjustment_value  (GtkScrolledWindow *scrol
 static void gtk_scrolled_window_cancel_deceleration (GtkScrolledWindow *scrolled_window);
 
 static gboolean _gtk_scrolled_window_get_overshoot (GtkScrolledWindow *scrolled_window,
-                                                    gint              *overshoot_x,
-                                                    gint              *overshoot_y);
+                                                    int               *overshoot_x,
+                                                    int               *overshoot_y);
 
 static void     gtk_scrolled_window_start_deceleration (GtkScrolledWindow *scrolled_window);
 
@@ -931,7 +931,7 @@ static void
 gtk_scrolled_window_invalidate_overshoot (GtkScrolledWindow *scrolled_window)
 {
   GtkAllocation child_allocation;
-  gint overshoot_x, overshoot_y;
+  int overshoot_x, overshoot_y;
 
   if (!_gtk_scrolled_window_get_overshoot (scrolled_window, &overshoot_x, &overshoot_y))
     return;
@@ -1121,7 +1121,7 @@ coords_close_to_indicator (GtkScrolledWindow *sw,
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (sw);
   graphene_rect_t indicator_bounds;
-  gint distance;
+  int distance;
 
   if (!gtk_widget_compute_bounds (indicator->scrollbar, GTK_WIDGET (sw), &indicator_bounds))
     return FALSE;
@@ -1467,8 +1467,8 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget,
   GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
   GtkAllocation child_allocation;
-  gint sb_width;
-  gint sb_height;
+  int sb_width;
+  int sb_height;
 
   /* Get possible scrollbar dimensions */
   gtk_widget_measure (priv->vscrollbar, GTK_ORIENTATION_HORIZONTAL, -1,
@@ -1490,8 +1490,8 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget,
 
   if (priv->child && gtk_widget_get_visible (priv->child))
     {
-      gint child_scroll_width;
-      gint child_scroll_height;
+      int child_scroll_width;
+      int child_scroll_height;
       gboolean previous_hvis;
       gboolean previous_vvis;
       guint count = 0;
@@ -1735,8 +1735,8 @@ gtk_scrolled_window_measure (GtkWidget      *widget,
             }
           else
             {
-              gint min = priv->min_content_width >= 0 ? priv->min_content_width : 0;
-              gint max = priv->max_content_width >= 0 ? priv->max_content_width : G_MAXINT;
+              int min = priv->min_content_width >= 0 ? priv->min_content_width : 0;
+              int max = priv->max_content_width >= 0 ? priv->max_content_width : G_MAXINT;
 
               minimum_req = CLAMP (minimum_req, min, max);
               natural_req = CLAMP (natural_req, min, max);
@@ -1753,8 +1753,8 @@ gtk_scrolled_window_measure (GtkWidget      *widget,
             }
           else
             {
-              gint min = priv->min_content_height >= 0 ? priv->min_content_height : 0;
-              gint max = priv->max_content_height >= 0 ? priv->max_content_height : G_MAXINT;
+              int min = priv->min_content_height >= 0 ? priv->min_content_height : 0;
+              int max = priv->max_content_height >= 0 ? priv->max_content_height : G_MAXINT;
 
               minimum_req = CLAMP (minimum_req, min, max);
               natural_req = CLAMP (natural_req, min, max);
@@ -1859,7 +1859,7 @@ gtk_scrolled_window_snapshot_overshoot (GtkScrolledWindow *scrolled_window,
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
   GtkWidget *widget = GTK_WIDGET (scrolled_window);
-  gint overshoot_x, overshoot_y;
+  int overshoot_x, overshoot_y;
   GtkStyleContext *context;
   GdkRectangle rect;
 
@@ -1963,7 +1963,7 @@ gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window)
     g_quark_from_static_string (GTK_STYLE_CLASS_TOP),
     g_quark_from_static_string (GTK_STYLE_CLASS_BOTTOM),
   };
-  gint i;
+  int i;
 
   gtk_widget_set_focusable (widget, TRUE);
 
@@ -2971,8 +2971,8 @@ gtk_scrolled_window_relative_allocation (GtkScrolledWindow *scrolled_window,
                                          GtkAllocation     *allocation)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
-  gint sb_width;
-  gint sb_height;
+  int sb_width;
+  int sb_height;
   int width, height;
 
   g_return_if_fail (scrolled_window != NULL);
@@ -3023,8 +3023,8 @@ gtk_scrolled_window_relative_allocation (GtkScrolledWindow *scrolled_window,
 
 static gboolean
 _gtk_scrolled_window_get_overshoot (GtkScrolledWindow *scrolled_window,
-                                    gint              *overshoot_x,
-                                    gint              *overshoot_y)
+                                    int               *overshoot_x,
+                                    int               *overshoot_y)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
   GtkAdjustment *vadjustment, *hadjustment;
@@ -3123,7 +3123,7 @@ gtk_scrolled_window_allocate_scrollbar (GtkScrolledWindow *scrolled_window,
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
   GtkAllocation child_allocation, content_allocation;
   GtkWidget *widget = GTK_WIDGET (scrolled_window);
-  gint sb_height, sb_width;
+  int sb_height, sb_width;
 
   gtk_scrolled_window_inner_allocation (scrolled_window, &content_allocation);
   gtk_widget_measure (priv->vscrollbar, GTK_ORIENTATION_HORIZONTAL, -1,
@@ -3808,7 +3808,7 @@ gtk_scrolled_window_realize (GtkWidget *widget)
  *
  * Returns: the minimum content width
  */
-gint
+int
 gtk_scrolled_window_get_min_content_width (GtkScrolledWindow *scrolled_window)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
@@ -3832,7 +3832,7 @@ gtk_scrolled_window_get_min_content_width (GtkScrolledWindow *scrolled_window)
  */
 void
 gtk_scrolled_window_set_min_content_width (GtkScrolledWindow *scrolled_window,
-                                           gint               width)
+                                           int                width)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
 
@@ -3858,7 +3858,7 @@ gtk_scrolled_window_set_min_content_width (GtkScrolledWindow *scrolled_window,
  *
  * Returns: the minimal content height
  */
-gint
+int
 gtk_scrolled_window_get_min_content_height (GtkScrolledWindow *scrolled_window)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
@@ -3882,7 +3882,7 @@ gtk_scrolled_window_get_min_content_height (GtkScrolledWindow *scrolled_window)
  */
 void
 gtk_scrolled_window_set_min_content_height (GtkScrolledWindow *scrolled_window,
-                                            gint               height)
+                                            int                height)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
 
@@ -3957,7 +3957,7 @@ gtk_scrolled_window_get_overlay_scrolling (GtkScrolledWindow *scrolled_window)
  */
 void
 gtk_scrolled_window_set_max_content_width (GtkScrolledWindow *scrolled_window,
-                                           gint               width)
+                                           int               width)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
 
@@ -3981,7 +3981,7 @@ gtk_scrolled_window_set_max_content_width (GtkScrolledWindow *scrolled_window,
  *
  * Returns: the maximum content width, or -1
  */
-gint
+int
 gtk_scrolled_window_get_max_content_width (GtkScrolledWindow *scrolled_window)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
@@ -4005,7 +4005,7 @@ gtk_scrolled_window_get_max_content_width (GtkScrolledWindow *scrolled_window)
  */
 void
 gtk_scrolled_window_set_max_content_height (GtkScrolledWindow *scrolled_window,
-                                            gint               height)
+                                            int                height)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
 
@@ -4029,7 +4029,7 @@ gtk_scrolled_window_set_max_content_height (GtkScrolledWindow *scrolled_window,
  *
  * Returns: the maximum content height, or -1
  */
-gint
+int
 gtk_scrolled_window_get_max_content_height (GtkScrolledWindow *scrolled_window)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index 5d1a1d66e1..f9ec39f877 100644
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -130,15 +130,15 @@ GDK_AVAILABLE_IN_ALL
 gboolean       gtk_scrolled_window_get_has_frame     (GtkScrolledWindow *scrolled_window);
 
 GDK_AVAILABLE_IN_ALL
-gint           gtk_scrolled_window_get_min_content_width  (GtkScrolledWindow *scrolled_window);
+int           gtk_scrolled_window_get_min_content_width  (GtkScrolledWindow *scrolled_window);
 GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_min_content_width  (GtkScrolledWindow *scrolled_window,
-                                                           gint               width);
+                                                           int                width);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_scrolled_window_get_min_content_height (GtkScrolledWindow *scrolled_window);
+int           gtk_scrolled_window_get_min_content_height (GtkScrolledWindow *scrolled_window);
 GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_min_content_height (GtkScrolledWindow *scrolled_window,
-                                                           gint               height);
+                                                           int                height);
 GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_kinetic_scrolling  (GtkScrolledWindow *scrolled_window,
                                                            gboolean           kinetic_scrolling);
@@ -159,15 +159,15 @@ gboolean       gtk_scrolled_window_get_overlay_scrolling (GtkScrolledWindow   *s
 
 GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_max_content_width  (GtkScrolledWindow *scrolled_window,
-                                                           gint               width);
+                                                           int                width);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_scrolled_window_get_max_content_width  (GtkScrolledWindow *scrolled_window);
+int           gtk_scrolled_window_get_max_content_width  (GtkScrolledWindow *scrolled_window);
 
 GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_max_content_height (GtkScrolledWindow *scrolled_window,
-                                                           gint               height);
+                                                           int                height);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_scrolled_window_get_max_content_height (GtkScrolledWindow *scrolled_window);
+int           gtk_scrolled_window_get_max_content_height (GtkScrolledWindow *scrolled_window);
 
 GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_propagate_natural_width  (GtkScrolledWindow *scrolled_window,