summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2000-12-14 04:58:44 +0000
committerHavoc Pennington <hp@src.gnome.org>2000-12-14 04:58:44 +0000
commitbe59b202e84f28c9bb348313554716be21435b72 (patch)
tree882eed0c5a2b0aa015d8257ba77c410f3c8be340 /gtk
parentbacb35ba3cdc5d089d7cc07006c54cff957081d7 (diff)
downloadgtk+-be59b202e84f28c9bb348313554716be21435b72.tar.gz
Remove double _ in front of some functions
2000-12-13 Havoc Pennington <hp@pobox.com> * gtk/gtktextbtree.h: Remove double _ in front of some functions * gtk/gtktext*.[hc]: update accordingly
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtktextbtree.c22
-rw-r--r--gtk/gtktextbtree.h72
-rw-r--r--gtk/gtktextbuffer.c6
-rw-r--r--gtk/gtktextiter.c24
-rw-r--r--gtk/gtktextlayout.c4
5 files changed, 64 insertions, 64 deletions
diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index 322344e896..9fe5277136 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -431,7 +431,7 @@ _gtk_text_btree_new (GtkTextTagTable *table,
GtkTextIter start;
GtkTextLineSegment *seg;
- __gtk_text_btree_get_iter_at_line_char (tree, &start, 0, 0);
+ _gtk_text_btree_get_iter_at_line_char (tree, &start, 0, 0);
tree->insert_mark = _gtk_text_btree_set_mark (tree,
@@ -1102,7 +1102,7 @@ insert_pixbuf_or_widget_segment (GtkTextIter *iter,
}
void
-__gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
+_gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
GdkPixbuf *pixbuf)
{
GtkTextLineSegment *seg;
@@ -1863,7 +1863,7 @@ _gtk_text_btree_get_line (GtkTextBTree *tree,
}
GtkTextLine*
-__gtk_text_btree_get_line_at_char (GtkTextBTree *tree,
+_gtk_text_btree_get_line_at_char (GtkTextBTree *tree,
gint char_index,
gint *line_start_index,
gint *real_char_index)
@@ -2621,7 +2621,7 @@ _gtk_text_btree_place_cursor (GtkTextBTree *tree,
}
void
-__gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree,
+_gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree,
const gchar *name)
{
GtkTextMark *mark;
@@ -3705,7 +3705,7 @@ _gtk_text_line_char_locate (GtkTextLine *line,
}
void
-__gtk_text_line_byte_to_char_offsets (GtkTextLine *line,
+_gtk_text_line_byte_to_char_offsets (GtkTextLine *line,
gint byte_offset,
gint *line_char_offset,
gint *seg_char_offset)
@@ -3751,7 +3751,7 @@ __gtk_text_line_byte_to_char_offsets (GtkTextLine *line,
}
void
-__gtk_text_line_char_to_byte_offsets (GtkTextLine *line,
+_gtk_text_line_char_to_byte_offsets (GtkTextLine *line,
gint char_offset,
gint *line_byte_offset,
gint *seg_byte_offset)
@@ -3901,7 +3901,7 @@ node_compare (GtkTextBTreeNode *lhs,
/* remember that tag == NULL means "any tag" */
GtkTextLine*
-__gtk_text_line_next_could_contain_tag (GtkTextLine *line,
+_gtk_text_line_next_could_contain_tag (GtkTextLine *line,
GtkTextBTree *tree,
GtkTextTag *tag)
{
@@ -4056,7 +4056,7 @@ prev_line_under_node (GtkTextBTreeNode *node,
}
GtkTextLine*
-__gtk_text_line_previous_could_contain_tag (GtkTextLine *line,
+_gtk_text_line_previous_could_contain_tag (GtkTextLine *line,
GtkTextBTree *tree,
GtkTextTag *tag)
{
@@ -4987,7 +4987,7 @@ gtk_text_btree_node_check_valid_downward (GtkTextBTreeNode *node,
/**
- * __gtk_text_btree_validate_line:
+ * _gtk_text_btree_validate_line:
* @tree: a #GtkTextBTree
* @line: line to validate
* @view_id: view ID for the view to validate
@@ -4996,7 +4996,7 @@ gtk_text_btree_node_check_valid_downward (GtkTextBTreeNode *node,
* results up through the entire tree.
**/
void
-__gtk_text_btree_validate_line (GtkTextBTree *tree,
+_gtk_text_btree_validate_line (GtkTextBTree *tree,
GtkTextLine *line,
gpointer view_id)
{
@@ -5225,7 +5225,7 @@ get_tree_bounds (GtkTextBTree *tree,
GtkTextIter *start,
GtkTextIter *end)
{
- __gtk_text_btree_get_iter_at_line_char (tree, start, 0, 0);
+ _gtk_text_btree_get_iter_at_line_char (tree, start, 0, 0);
_gtk_text_btree_get_last_iter (tree, end);
}
diff --git a/gtk/gtktextbtree.h b/gtk/gtktextbtree.h
index 3763ed5a21..93558fae5c 100644
--- a/gtk/gtktextbtree.h
+++ b/gtk/gtktextbtree.h
@@ -31,8 +31,8 @@ void _gtk_text_btree_delete (GtkTextIter *start,
void _gtk_text_btree_insert (GtkTextIter *iter,
const gchar *text,
gint len);
-void __gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
- GdkPixbuf *pixbuf);
+void _gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
+ GdkPixbuf *pixbuf);
GtkTextChildAnchor* _gtk_text_btree_create_child_anchor (GtkTextIter *iter);
@@ -65,9 +65,9 @@ gboolean _gtk_text_btree_validate (GtkTextBTree *tree,
gint *y,
gint *old_height,
gint *new_height);
-void __gtk_text_btree_validate_line (GtkTextBTree *tree,
- GtkTextLine *line,
- gpointer view_id);
+void _gtk_text_btree_validate_line (GtkTextBTree *tree,
+ GtkTextLine *line,
+ gpointer view_id);
/* Tag */
@@ -81,10 +81,10 @@ void _gtk_text_btree_tag (const GtkTextIter *start,
GtkTextLine * _gtk_text_btree_get_line (GtkTextBTree *tree,
gint line_number,
gint *real_line_number);
-GtkTextLine * __gtk_text_btree_get_line_at_char (GtkTextBTree *tree,
- gint char_index,
- gint *line_start_index,
- gint *real_char_index);
+GtkTextLine * _gtk_text_btree_get_line_at_char (GtkTextBTree *tree,
+ gint char_index,
+ gint *line_start_index,
+ gint *real_char_index);
GtkTextTag** _gtk_text_btree_get_tags (const GtkTextIter *iter,
gint *num_tags);
gchar *_gtk_text_btree_get_text (const GtkTextIter *start,
@@ -101,20 +101,20 @@ gboolean _gtk_text_btree_char_is_invisible (const GtkTextIter *iter);
void _gtk_text_btree_get_iter_at_char (GtkTextBTree *tree,
GtkTextIter *iter,
gint char_index);
-void __gtk_text_btree_get_iter_at_line_char (GtkTextBTree *tree,
- GtkTextIter *iter,
- gint line_number,
- gint char_index);
-void __gtk_text_btree_get_iter_at_line_byte (GtkTextBTree *tree,
- GtkTextIter *iter,
- gint line_number,
- gint byte_index);
+void _gtk_text_btree_get_iter_at_line_char (GtkTextBTree *tree,
+ GtkTextIter *iter,
+ gint line_number,
+ gint char_index);
+void _gtk_text_btree_get_iter_at_line_byte (GtkTextBTree *tree,
+ GtkTextIter *iter,
+ gint line_number,
+ gint byte_index);
gboolean _gtk_text_btree_get_iter_from_string (GtkTextBTree *tree,
GtkTextIter *iter,
const gchar *string);
-gboolean __gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree,
- GtkTextIter *iter,
- const gchar *mark_name);
+gboolean _gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree,
+ GtkTextIter *iter,
+ const gchar *mark_name);
void _gtk_text_btree_get_iter_at_mark (GtkTextBTree *tree,
GtkTextIter *iter,
GtkTextMark *mark);
@@ -144,8 +144,8 @@ GtkTextMark *_gtk_text_btree_set_mark (GtkTextBTree
gboolean left_gravity,
const GtkTextIter *index,
gboolean should_exist);
-void __gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree,
- const gchar *name);
+void _gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree,
+ const gchar *name);
void _gtk_text_btree_remove_mark (GtkTextBTree *tree,
GtkTextMark *segment);
gboolean _gtk_text_btree_get_selection_bounds (GtkTextBTree *tree,
@@ -237,14 +237,14 @@ void _gtk_text_line_char_locate (GtkTextLine
GtkTextLineSegment **any_segment,
gint *seg_char_offset,
gint *line_char_offset);
-void __gtk_text_line_byte_to_char_offsets (GtkTextLine *line,
- gint byte_offset,
- gint *line_char_offset,
- gint *seg_char_offset);
-void __gtk_text_line_char_to_byte_offsets (GtkTextLine *line,
- gint char_offset,
- gint *line_byte_offset,
- gint *seg_byte_offset);
+void _gtk_text_line_byte_to_char_offsets (GtkTextLine *line,
+ gint byte_offset,
+ gint *line_char_offset,
+ gint *seg_char_offset);
+void _gtk_text_line_char_to_byte_offsets (GtkTextLine *line,
+ gint char_offset,
+ gint *line_byte_offset,
+ gint *seg_byte_offset);
GtkTextLineSegment *_gtk_text_line_byte_to_any_segment (GtkTextLine *line,
gint byte_offset,
gint *seg_offset);
@@ -255,12 +255,12 @@ gint _gtk_text_line_byte_to_char (GtkTextLine
gint byte_offset);
gint _gtk_text_line_char_to_byte (GtkTextLine *line,
gint char_offset);
-GtkTextLine * __gtk_text_line_next_could_contain_tag (GtkTextLine *line,
- GtkTextBTree *tree,
- GtkTextTag *tag);
-GtkTextLine * __gtk_text_line_previous_could_contain_tag (GtkTextLine *line,
- GtkTextBTree *tree,
- GtkTextTag *tag);
+GtkTextLine * _gtk_text_line_next_could_contain_tag (GtkTextLine *line,
+ GtkTextBTree *tree,
+ GtkTextTag *tag);
+GtkTextLine * _gtk_text_line_previous_could_contain_tag (GtkTextLine *line,
+ GtkTextBTree *tree,
+ GtkTextTag *tag);
/* Debug */
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 0010615a7e..e501b3776a 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -1330,7 +1330,7 @@ gtk_text_buffer_insert_pixbuf (GtkTextBuffer *buffer,
g_return_if_fail (iter != NULL);
g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
- __gtk_text_btree_insert_pixbuf (iter, pixbuf);
+ _gtk_text_btree_insert_pixbuf (iter, pixbuf);
/* FIXME pixbuf-specific signal like insert_text */
@@ -1909,7 +1909,7 @@ gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer *buffer,
g_return_if_fail (iter != NULL);
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
- __gtk_text_btree_get_iter_at_line_char (get_btree (buffer),
+ _gtk_text_btree_get_iter_at_line_char (get_btree (buffer),
iter, line_number, char_offset);
}
@@ -1922,7 +1922,7 @@ gtk_text_buffer_get_iter_at_line_index (GtkTextBuffer *buffer,
g_return_if_fail (iter != NULL);
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
- __gtk_text_btree_get_iter_at_line_byte (get_btree (buffer),
+ _gtk_text_btree_get_iter_at_line_byte (get_btree (buffer),
iter, line_number, byte_index);
}
diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index acf977137a..2e181f37e7 100644
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -342,7 +342,7 @@ ensure_char_offsets (GtkTextRealIter *iter)
{
g_assert (iter->line_byte_offset >= 0);
- __gtk_text_line_byte_to_char_offsets (iter->line,
+ _gtk_text_line_byte_to_char_offsets (iter->line,
iter->line_byte_offset,
&iter->line_char_offset,
&iter->segment_char_offset);
@@ -356,7 +356,7 @@ ensure_byte_offsets (GtkTextRealIter *iter)
{
g_assert (iter->line_char_offset >= 0);
- __gtk_text_line_char_to_byte_offsets (iter->line,
+ _gtk_text_line_char_to_byte_offsets (iter->line,
iter->line_char_offset,
&iter->line_byte_offset,
&iter->segment_byte_offset);
@@ -2701,7 +2701,7 @@ gtk_text_iter_set_offset (GtkTextIter *iter, gint char_index)
real->cached_char_index == char_index)
return;
- line = __gtk_text_btree_get_line_at_char (real->tree,
+ line = _gtk_text_btree_get_line_at_char (real->tree,
char_index,
&line_start,
&real_char_index);
@@ -2799,7 +2799,7 @@ gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter,
check_invariants (iter);
current_line = real->line;
- next_line = __gtk_text_line_next_could_contain_tag (current_line,
+ next_line = _gtk_text_line_next_could_contain_tag (current_line,
real->tree, tag);
while (gtk_text_iter_forward_indexable_segment (iter))
@@ -2821,7 +2821,7 @@ gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter,
iter_set_from_byte_offset (real, next_line, 0);
current_line = real->line;
- next_line = __gtk_text_line_next_could_contain_tag (current_line,
+ next_line = _gtk_text_line_next_could_contain_tag (current_line,
real->tree,
tag);
}
@@ -2881,7 +2881,7 @@ gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter,
check_invariants (iter);
current_line = real->line;
- prev_line = __gtk_text_line_previous_could_contain_tag (current_line,
+ prev_line = _gtk_text_line_previous_could_contain_tag (current_line,
real->tree, tag);
@@ -2929,7 +2929,7 @@ gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter,
}
current_line = real->line;
- prev_line = __gtk_text_line_previous_could_contain_tag (current_line,
+ prev_line = _gtk_text_line_previous_could_contain_tag (current_line,
real->tree,
tag);
}
@@ -3808,7 +3808,7 @@ _gtk_text_btree_get_iter_at_char (GtkTextBTree *tree,
g_return_if_fail (iter != NULL);
g_return_if_fail (tree != NULL);
- line = __gtk_text_btree_get_line_at_char (tree, char_index,
+ line = _gtk_text_btree_get_line_at_char (tree, char_index,
&line_start, &real_char_index);
iter_init_from_char_offset (iter, tree, line, real_char_index - line_start);
@@ -3819,7 +3819,7 @@ _gtk_text_btree_get_iter_at_char (GtkTextBTree *tree,
}
void
-__gtk_text_btree_get_iter_at_line_char (GtkTextBTree *tree,
+_gtk_text_btree_get_iter_at_line_char (GtkTextBTree *tree,
GtkTextIter *iter,
gint line_number,
gint char_on_line)
@@ -3842,7 +3842,7 @@ __gtk_text_btree_get_iter_at_line_char (GtkTextBTree *tree,
}
void
-__gtk_text_btree_get_iter_at_line_byte (GtkTextBTree *tree,
+_gtk_text_btree_get_iter_at_line_byte (GtkTextBTree *tree,
GtkTextIter *iter,
gint line_number,
gint byte_index)
@@ -3929,7 +3929,7 @@ _gtk_text_btree_get_iter_at_last_toggle (GtkTextBTree *tree,
if (line == NULL)
{
/* Set iter to first in tree */
- __gtk_text_btree_get_iter_at_line_char (tree, iter, 0, 0);
+ _gtk_text_btree_get_iter_at_line_char (tree, iter, 0, 0);
check_invariants (iter);
return FALSE;
}
@@ -3943,7 +3943,7 @@ _gtk_text_btree_get_iter_at_last_toggle (GtkTextBTree *tree,
}
gboolean
-__gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree,
+_gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree,
GtkTextIter *iter,
const gchar *mark_name)
{
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index ee5ffb43da..6e6819403b 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -784,7 +784,7 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
{
gint old_height = line_data ? line_data->height : 0;
- __gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
+ _gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
line, layout);
line_data = _gtk_text_line_get_data (line, layout);
@@ -813,7 +813,7 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
{
gint old_height = line_data ? line_data->height : 0;
- __gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
+ _gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
line, layout);
line_data = _gtk_text_line_get_data (line, layout);
View Lorry Controller Status