[pango/pango2: 63/135] Tweak boolean getters

[Matthias Clasen <matthiasc src gnome org>]

commit 15104b6a42bd67eefd045279c0392e27f170ceae
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jan 25 00:25:40 2022 -0500

    Tweak boolean getters
    
    Add 'is' to all the boolean getters on
    PangoLayoutLine and PangoLines. Update
    all callers.

 examples/columns.c        |  4 ++--
 pango/pango-layout-iter.c |  2 +-
 pango/pango-layout-line.c | 22 +++++++++++-----------
 pango/pango-layout-line.h | 12 ++++++------
 pango/pango-layout.c      |  2 +-
 pango/pango-lines.c       | 18 +++++++++---------
 pango/pango-lines.h       |  6 +++---
 pango/serializer.c        |  6 +++---
 tests/test-ellipsize.c    |  4 ++--
 9 files changed, 38 insertions(+), 38 deletions(-)
---
diff --git a/examples/columns.c b/examples/columns.c
index 063127b6..39c799c2 100644
--- a/examples/columns.c
+++ b/examples/columns.c
@@ -74,10 +74,10 @@ retry:
                                            PANGO_WRAP_CHAR,
                                            PANGO_ELLIPSIZE_NONE);
 
-      if (!pango_layout_line_ends_paragraph (line))
+      if (!pango_layout_line_is_paragraph_end (line))
         line = pango_layout_line_justify (line, width);
 
-      pango_layout_line_get_trimmed_extents (line, PANGO_LEADING_TRIM_NONE, &ext);
+      pango_layout_line_get_extents (line, NULL, &ext);
 
       if (y + ext.height > height)
         {
diff --git a/pango/pango-layout-iter.c b/pango/pango-layout-iter.c
index 93941ac2..1903c656 100644
--- a/pango/pango-layout-iter.c
+++ b/pango/pango-layout-iter.c
@@ -64,7 +64,7 @@ static gboolean
 line_is_terminated (PangoLayoutIter *iter)
 {
   if (iter->line_no + 1 < pango_lines_get_line_count (iter->lines))
-    return pango_layout_line_ends_paragraph (iter->line);
+    return pango_layout_line_is_paragraph_end (iter->line);
 
   return FALSE;
 
diff --git a/pango/pango-layout-line.c b/pango/pango-layout-line.c
index 722122f3..f7183b6d 100644
--- a/pango/pango-layout-line.c
+++ b/pango/pango-layout-line.c
@@ -723,7 +723,7 @@ pango_layout_line_get_log_attrs (PangoLayoutLine *line,
 }
 
 /**
- * pango_layout_line_wrapped:
+ * pango_layout_line_is_wrapped:
  * @line: a `PangoLayoutLine`
  *
  * Gets whether the line is wrapped.
@@ -731,7 +731,7 @@ pango_layout_line_get_log_attrs (PangoLayoutLine *line,
  * Returns: `TRUE` if @line has been wrapped
  */
 gboolean
-pango_layout_line_wrapped (PangoLayoutLine *line)
+pango_layout_line_is_wrapped (PangoLayoutLine *line)
 {
   g_return_val_if_fail (PANGO_IS_LAYOUT_LINE (line), FALSE);
 
@@ -739,7 +739,7 @@ pango_layout_line_wrapped (PangoLayoutLine *line)
 }
 
 /**
- * pango_layout_line_ellipsized:
+ * pango_layout_line_is_ellipsized:
  * @line: a `PangoLayoutLine`
  *
  * Gets whether the line is ellipsized.
@@ -747,7 +747,7 @@ pango_layout_line_wrapped (PangoLayoutLine *line)
  * Returns: `TRUE` if @line has been ellipsized
  */
 gboolean
-pango_layout_line_ellipsized (PangoLayoutLine *line)
+pango_layout_line_is_ellipsized (PangoLayoutLine *line)
 {
   g_return_val_if_fail (PANGO_IS_LAYOUT_LINE (line), FALSE);
 
@@ -755,7 +755,7 @@ pango_layout_line_ellipsized (PangoLayoutLine *line)
 }
 
 /**
- * pango_layout_line_hyphenated:
+ * pango_layout_line_is_hyphenated:
  * @line: a `PangoLayoutLine`
  *
  * Gets whether the line is hyphenated.
@@ -763,7 +763,7 @@ pango_layout_line_ellipsized (PangoLayoutLine *line)
  * Returns: `TRUE` if @line has been hyphenated
  */
 gboolean
-pango_layout_line_hyphenated (PangoLayoutLine *line)
+pango_layout_line_is_hyphenated (PangoLayoutLine *line)
 {
   g_return_val_if_fail (PANGO_IS_LAYOUT_LINE (line), FALSE);
 
@@ -771,7 +771,7 @@ pango_layout_line_hyphenated (PangoLayoutLine *line)
 }
 
 /**
- * pango_layout_line_justified:
+ * pango_layout_line_is_justified:
  * @line: a `PangoLayoutLine`
  *
  * Gets whether the line is justified.
@@ -781,7 +781,7 @@ pango_layout_line_hyphenated (PangoLayoutLine *line)
  * Returns: `TRUE` if @line has been justified
  */
 gboolean
-pango_layout_line_justified (PangoLayoutLine *line)
+pango_layout_line_is_justified (PangoLayoutLine *line)
 {
   g_return_val_if_fail (PANGO_IS_LAYOUT_LINE (line), FALSE);
 
@@ -789,7 +789,7 @@ pango_layout_line_justified (PangoLayoutLine *line)
 }
 
 /**
- * pango_layout_line_starts_paragraph:
+ * pango_layout_line_is_paragraph_start:
  * @line: a `PangoLayoutLine`
  *
  * Gets whether the line is the first of a paragraph.
@@ -797,7 +797,7 @@ pango_layout_line_justified (PangoLayoutLine *line)
  * Returns: `TRUE` if @line starts a paragraph
  */
 gboolean
-pango_layout_line_starts_paragraph (PangoLayoutLine *line)
+pango_layout_line_is_paragraph_start (PangoLayoutLine *line)
 {
   g_return_val_if_fail (PANGO_IS_LAYOUT_LINE (line), FALSE);
 
@@ -813,7 +813,7 @@ pango_layout_line_starts_paragraph (PangoLayoutLine *line)
  * Returns: `TRUE` if @line ends a paragraph
  */
 gboolean
-pango_layout_line_ends_paragraph (PangoLayoutLine *line)
+pango_layout_line_is_paragraph_end (PangoLayoutLine *line)
 {
   g_return_val_if_fail (PANGO_IS_LAYOUT_LINE (line), FALSE);
 
diff --git a/pango/pango-layout-line.h b/pango/pango-layout-line.h
index 773d2b75..7545e982 100644
--- a/pango/pango-layout-line.h
+++ b/pango/pango-layout-line.h
@@ -36,23 +36,23 @@ const PangoLogAttr *    pango_layout_line_get_log_attrs (PangoLayoutLine       *
                                                          int                   *n_attrs);
 
 PANGO_AVAILABLE_IN_ALL
-gboolean                pango_layout_line_wrapped       (PangoLayoutLine       *line);
+gboolean                pango_layout_line_is_wrapped    (PangoLayoutLine       *line);
 
 PANGO_AVAILABLE_IN_ALL
-gboolean                pango_layout_line_ellipsized    (PangoLayoutLine       *line);
+gboolean                pango_layout_line_is_ellipsized (PangoLayoutLine       *line);
 
 PANGO_AVAILABLE_IN_ALL
-gboolean                pango_layout_line_hyphenated    (PangoLayoutLine       *line);
+gboolean                pango_layout_line_is_hyphenated (PangoLayoutLine       *line);
 
 PANGO_AVAILABLE_IN_ALL
-gboolean                pango_layout_line_justified     (PangoLayoutLine       *line);
+gboolean                pango_layout_line_is_justified  (PangoLayoutLine       *line);
 
 PANGO_AVAILABLE_IN_ALL
-gboolean                pango_layout_line_starts_paragraph
+gboolean                pango_layout_line_is_paragraph_start
                                                         (PangoLayoutLine       *line);
 
 PANGO_AVAILABLE_IN_ALL
-gboolean                pango_layout_line_ends_paragraph
+gboolean                pango_layout_line_is_paragraph_end
                                                         (PangoLayoutLine       *line);
 
 PANGO_AVAILABLE_IN_ALL
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 816eb9ef..53b03b23 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -697,7 +697,7 @@ retry:
           break;
 
         case PANGO_ALIGN_JUSTIFY:
-          if (!pango_layout_line_ends_paragraph (line))
+          if (!pango_layout_line_is_paragraph_end (line))
             {
               line = pango_layout_line_justify (line, width);
               break;
diff --git a/pango/pango-lines.c b/pango/pango-lines.c
index 5d2f60e1..5e6e2528 100644
--- a/pango/pango-lines.c
+++ b/pango/pango-lines.c
@@ -338,7 +338,7 @@ pango_lines_get_unknown_glyphs_count (PangoLines *lines)
 }
 
 /**
- * pango_lines_wrapped:
+ * pango_lines_is_wrapped:
  * @lines: a `PangoLines` object
  *
  * Returns whether any line in @lines is wrapped.
@@ -346,12 +346,12 @@ pango_lines_get_unknown_glyphs_count (PangoLines *lines)
  * Returns: `TRUE` if @lines is wrapped
  */
 gboolean
-pango_lines_wrapped (PangoLines *lines)
+pango_lines_is_wrapped (PangoLines *lines)
 {
   for (int i = 0; i < lines->lines->len; i++)
     {
       Line *l = &g_array_index (lines->lines, Line, i);
-      if (pango_layout_line_wrapped (l->line))
+      if (pango_layout_line_is_wrapped (l->line))
         return TRUE;
     }
 
@@ -359,7 +359,7 @@ pango_lines_wrapped (PangoLines *lines)
 }
 
 /**
- * pango_lines_ellipsized:
+ * pango_lines_is_ellipsized:
  * @lines: a `PangoLines` object
  *
  * Returns whether any line in @lines is ellipsized.
@@ -367,12 +367,12 @@ pango_lines_wrapped (PangoLines *lines)
  * Returns: `TRUE` if @lines is ellipsized
  */
 gboolean
-pango_lines_ellipsized (PangoLines *lines)
+pango_lines_is_ellipsized (PangoLines *lines)
 {
   for (int i = 0; i < lines->lines->len; i++)
     {
       Line *l = &g_array_index (lines->lines, Line, i);
-      if (pango_layout_line_ellipsized (l->line))
+      if (pango_layout_line_is_ellipsized (l->line))
         return TRUE;
     }
 
@@ -380,7 +380,7 @@ pango_lines_ellipsized (PangoLines *lines)
 }
 
 /**
- * pango_lines_hyphenated:
+ * pango_lines_is_hyphenated:
  * @lines: a `PangoLines` object
  *
  * Returns whether any line in @lines is hyphenated.
@@ -388,12 +388,12 @@ pango_lines_ellipsized (PangoLines *lines)
  * Returns: `TRUE` if @lines is hyphenated
  */
 gboolean
-pango_lines_hyphenated (PangoLines *lines)
+pango_lines_is_hyphenated (PangoLines *lines)
 {
   for (int i = 0; i < lines->lines->len; i++)
     {
       Line *l = &g_array_index (lines->lines, Line, i);
-      if (pango_layout_line_hyphenated (l->line))
+      if (pango_layout_line_is_hyphenated (l->line))
         return TRUE;
     }
 
diff --git a/pango/pango-lines.h b/pango/pango-lines.h
index b61d5a84..97f50384 100644
--- a/pango/pango-lines.h
+++ b/pango/pango-lines.h
@@ -66,13 +66,13 @@ int                     pango_lines_get_unknown_glyphs_count
                                                     (PangoLines        *lines);
 
 PANGO_AVAILABLE_IN_ALL
-gboolean                pango_lines_wrapped         (PangoLines        *lines);
+gboolean                pango_lines_is_wrapped      (PangoLines        *lines);
 
 PANGO_AVAILABLE_IN_ALL
-gboolean                pango_lines_ellipsized      (PangoLines        *lines);
+gboolean                pango_lines_is_ellipsized   (PangoLines        *lines);
 
 PANGO_AVAILABLE_IN_ALL
-gboolean                pango_lines_hyphenated      (PangoLines        *lines);
+gboolean                pango_lines_is_hyphenated   (PangoLines        *lines);
 
 PANGO_AVAILABLE_IN_ALL
 void                    pango_lines_index_to_line   (PangoLines        *lines,
diff --git a/pango/serializer.c b/pango/serializer.c
index 1e163ad1..f65d1983 100644
--- a/pango/serializer.c
+++ b/pango/serializer.c
@@ -752,9 +752,9 @@ lines_to_json (GtkJsonPrinter *printer,
 
   gtk_json_printer_start_object (printer, "output");
 
-  gtk_json_printer_add_boolean (printer, "wrapped", pango_lines_wrapped (lines));
-  gtk_json_printer_add_boolean (printer, "ellipsized", pango_lines_ellipsized (lines));
-  gtk_json_printer_add_boolean (printer, "hypenated", pango_lines_hyphenated (lines));
+  gtk_json_printer_add_boolean (printer, "wrapped", pango_lines_is_wrapped (lines));
+  gtk_json_printer_add_boolean (printer, "ellipsized", pango_lines_is_ellipsized (lines));
+  gtk_json_printer_add_boolean (printer, "hypenated", pango_lines_is_hyphenated (lines));
   gtk_json_printer_add_integer (printer, "unknown-glyphs", pango_lines_get_unknown_glyphs_count (lines));
   pango_lines_get_size (lines, &width, &height);
   gtk_json_printer_add_integer (printer, "width", width);
diff --git a/tests/test-ellipsize.c b/tests/test-ellipsize.c
index f68d9baf..f8512a09 100644
--- a/tests/test-ellipsize.c
+++ b/tests/test-ellipsize.c
@@ -49,7 +49,7 @@ test_ellipsize_height (void)
   pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
 
   g_assert_cmpint (pango_lines_get_line_count (pango_layout_get_lines (layout)), ==, 1);
-  g_assert_true (pango_lines_ellipsized (pango_layout_get_lines (layout)));
+  g_assert_true (pango_lines_is_ellipsized (pango_layout_get_lines (layout)));
   pango_lines_get_size (pango_layout_get_lines (layout), NULL, &height2);
 
   g_assert_cmpint (height1, ==, height2);
@@ -73,7 +73,7 @@ test_ellipsize_crash (void)
   pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
 
   g_assert_cmpint (pango_lines_get_line_count (pango_layout_get_lines (layout)), ==, 1);
-  g_assert_true (pango_lines_ellipsized (pango_layout_get_lines (layout)));
+  g_assert_true (pango_lines_is_ellipsized (pango_layout_get_lines (layout)));
 
   g_object_unref (layout);
 }