[gtk+] gtkpango: Remove unused functions
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gtkpango: Remove unused functions
- Date: Tue, 15 Aug 2017 19:24:54 +0000 (UTC)
commit d81fc8edcef5d07c46113011df7f54a9c95c58ec
Author: Timm Bäder <mail baedert org>
Date: Tue Aug 15 21:20:19 2017 +0200
gtkpango: Remove unused functions
Remove _gtk_pango_move_lines and a few function declarations in the
private header file since they are only used inside gtkpango.c
gtk/gtkpango.c | 80 +++----------------------------------------------------
gtk/gtkpango.h | 19 -------------
2 files changed, 5 insertions(+), 94 deletions(-)
---
diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c
index 63d445f..98f787a 100644
--- a/gtk/gtkpango.c
+++ b/gtk/gtkpango.c
@@ -541,7 +541,7 @@ _gtk_pango_get_run_attributes (AtkAttributeSet *attributes,
*
* Returns: the new position
*/
-gint
+static gint
_gtk_pango_move_chars (PangoLayout *layout,
gint offset,
gint count)
@@ -587,7 +587,7 @@ _gtk_pango_move_chars (PangoLayout *layout,
*
* Returns: the new position
*/
-gint
+static gint
_gtk_pango_move_words (PangoLayout *layout,
gint offset,
gint count)
@@ -633,7 +633,7 @@ _gtk_pango_move_words (PangoLayout *layout,
*
* Returns: the new position
*/
-gint
+static gint
_gtk_pango_move_sentences (PangoLayout *layout,
gint offset,
gint count)
@@ -664,76 +664,6 @@ _gtk_pango_move_sentences (PangoLayout *layout,
}
/*
- * _gtk_pango_move_lines:
- * @layout: a #PangoLayout
- * @offset: a character offset in @layout
- * @count: the number of lines to move from @offset
- *
- * Returns the position that is @count lines from the
- * given @offset. @count may be positive or negative.
- *
- * If @count is negative, the returned position will
- * be the start of a line, else it will be the end of
- * line.
- *
- * Returns: the new position
- */
-gint
-_gtk_pango_move_lines (PangoLayout *layout,
- gint offset,
- gint count)
-{
- GSList *lines, *l;
- PangoLayoutLine *line;
- gint num;
- const gchar *text;
- gint pos, line_pos;
- gint index;
- gint len;
-
- text = pango_layout_get_text (layout);
- index = g_utf8_offset_to_pointer (text, offset) - text;
- lines = pango_layout_get_lines (layout);
- line = NULL;
-
- num = 0;
- for (l = lines; l; l = l->next)
- {
- line = l->data;
- if (index < line->start_index + line->length)
- break;
- num++;
- }
-
- if (count < 0)
- {
- num += count;
- if (num < 0)
- num = 0;
-
- line = g_slist_nth_data (lines, num);
-
- return g_utf8_pointer_to_offset (text, text + line->start_index);
- }
- else
- {
- line_pos = index - line->start_index;
-
- len = g_slist_length (lines);
- num += count;
- if (num >= len || (count == 0 && num == len - 1))
- return g_utf8_strlen (text, -1) - 1;
-
- line = l->data;
- pos = line->start_index + line_pos;
- if (pos >= line->start_index + line->length)
- pos = line->start_index + line->length - 1;
-
- return g_utf8_pointer_to_offset (text, text + pos);
- }
-}
-
-/*
* _gtk_pango_is_inside_word:
* @layout: a #PangoLayout
* @offset: a character offset in @layout
@@ -743,7 +673,7 @@ _gtk_pango_move_lines (PangoLayout *layout,
*
* Returns: %TRUE if @offset is inside a word
*/
-gboolean
+static gboolean
_gtk_pango_is_inside_word (PangoLayout *layout,
gint offset)
{
@@ -772,7 +702,7 @@ _gtk_pango_is_inside_word (PangoLayout *layout,
*
* Returns: %TRUE if @offset is inside a sentence
*/
-gboolean
+static gboolean
_gtk_pango_is_inside_sentence (PangoLayout *layout,
gint offset)
{
diff --git a/gtk/gtkpango.h b/gtk/gtkpango.h
index 0d6e6c0..216f928 100644
--- a/gtk/gtkpango.h
+++ b/gtk/gtkpango.h
@@ -44,25 +44,6 @@ AtkAttributeSet *_gtk_pango_get_run_attributes (AtkAttributeSet *attributes,
gint *start_offset,
gint *end_offset);
-gint _gtk_pango_move_chars (PangoLayout *layout,
- gint offset,
- gint count);
-gint _gtk_pango_move_words (PangoLayout *layout,
- gint offset,
- gint count);
-gint _gtk_pango_move_sentences (PangoLayout *layout,
- gint offset,
- gint count);
-gint _gtk_pango_move_lines (PangoLayout *layout,
- gint offset,
- gint count);
-
-gboolean _gtk_pango_is_inside_word (PangoLayout *layout,
- gint offset);
-gboolean _gtk_pango_is_inside_sentence (PangoLayout *layout,
- gint offset);
-
-
gchar *_gtk_pango_get_text_before (PangoLayout *layout,
AtkTextBoundary boundary_type,
gint offset,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]