[gtkhtml] Coding style and whitespace cleanup.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkhtml] Coding style and whitespace cleanup.
- Date: Mon, 12 Jul 2010 02:30:02 +0000 (UTC)
commit b1dc89727e3f035a4061ae5293f56e650068ba6a
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Jul 11 13:20:09 2010 -0400
Coding style and whitespace cleanup.
gtkhtml/gtkhtml-stream.c | 2 +-
gtkhtml/gtkhtml.c | 4 +-
gtkhtml/gtkhtmldebug.c | 8 ++--
gtkhtml/htmlclue.c | 10 +++---
gtkhtml/htmlclueflow.c | 26 +++++++-------
gtkhtml/htmlcolor.c | 4 +-
gtkhtml/htmlcursor.c | 16 ++++----
gtkhtml/htmlengine-edit-cut-and-paste.c | 16 ++++----
gtkhtml/htmlengine-edit-table.c | 46 ++++++++++++------------
gtkhtml/htmlengine-edit-tablecell.c | 58 +++++++++++++++---------------
gtkhtml/htmlengine-edit-text.c | 2 +-
gtkhtml/htmlengine-edit.c | 8 ++--
gtkhtml/htmlengine-print.c | 2 +-
gtkhtml/htmlengine.c | 4 +-
gtkhtml/htmlfontmanager.c | 12 +++---
gtkhtml/htmlgdkpainter.c | 2 +-
gtkhtml/htmlobject.c | 30 ++++++++--------
gtkhtml/htmlpainter.c | 8 ++--
gtkhtml/htmlselection.c | 4 +-
gtkhtml/htmlstyle.c | 10 +++---
gtkhtml/htmltable.c | 52 ++++++++++++++--------------
gtkhtml/htmltext.c | 48 +++++++++++++-------------
gtkhtml/htmltextslave.c | 54 ++++++++++++++--------------
gtkhtml/htmltokenizer.c | 20 +++++-----
gtkhtml/htmlundo.c | 38 ++++++++++----------
gtkhtml/test-stress.c | 24 ++++++------
gtkhtml/test-suite.c | 8 ++--
27 files changed, 258 insertions(+), 258 deletions(-)
---
diff --git a/gtkhtml/gtkhtml-stream.c b/gtkhtml/gtkhtml-stream.c
index fd394bc..4d27c7d 100644
--- a/gtkhtml/gtkhtml-stream.c
+++ b/gtkhtml/gtkhtml-stream.c
@@ -207,7 +207,7 @@ gtk_html_stream_log_new (GtkHTML *html, GtkHTMLStream *stream)
log->file = fopen (fname, "w+");
g_free (fname);
- log_num ++;
+ log_num++;
new_stream = gtk_html_stream_new (html,
stream_log_types,
diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
index 128df96..5237610 100644
--- a/gtkhtml/gtkhtml.c
+++ b/gtkhtml/gtkhtml.c
@@ -1695,10 +1695,10 @@ url_is_absolute (const gchar *url)
if (!isalpha (*url))
return FALSE;
- url ++;
+ url++;
while (*url && (isalnum (*url) || *url == '+' || *url == '-' || *url == '.'))
- url ++;
+ url++;
return *url && *url == ':';
}
diff --git a/gtkhtml/gtkhtmldebug.c b/gtkhtml/gtkhtmldebug.c
index 5b93693..abb0446 100644
--- a/gtkhtml/gtkhtmldebug.c
+++ b/gtkhtml/gtkhtmldebug.c
@@ -162,7 +162,7 @@ gtk_html_debug_dump_object (HTMLObject *obj,
g_print (" [%s, %d]",
clueflow_style_to_string (HTML_CLUEFLOW (obj)->style), HTML_CLUEFLOW (obj)->levels->len);
g_print (" levels: [");
- for (i = 0; i < HTML_CLUEFLOW (obj)->levels->len; i ++) {
+ for (i = 0; i < HTML_CLUEFLOW (obj)->levels->len; i++) {
g_print ("%d", HTML_CLUEFLOW (obj)->levels->data [i]);
if (i < HTML_CLUEFLOW (obj)->levels->len - 1)
g_print (" ");
@@ -209,7 +209,7 @@ gtk_html_debug_dump_object (HTMLObject *obj,
tw += HTML_TEXT_SLAVE (obj)->owner->pi->entries [ii].widths [io];
g_print ("%d ", HTML_TEXT_SLAVE (obj)->owner->pi->entries [ii].widths [io]);
html_text_pi_forward (HTML_TEXT_SLAVE (obj)->owner->pi, &ii, &io);
- offset ++;
+ offset++;
}
g_print ("\ntotal width by widths in entries (in engine units): %d", (gint)(0.5 + tw / PANGO_SCALE));
@@ -230,10 +230,10 @@ gtk_html_debug_dump_object (HTMLObject *obj,
text->text_len, text->text_bytes, text->text);
/* debug_spell_errors (text->spell_errors); */
if (text->pi) {
- for (i =0; i < text->pi->n; i ++)
+ for (i =0; i < text->pi->n; i++)
g_print ("item %d offset: %d length: %d\n", i, text->pi->entries [i].glyph_item.item->offset, text->pi->entries [i].glyph_item.item->length);
- for (i = 0; i < text->text_len; i ++) {
+ for (i = 0; i < text->text_len; i++) {
union {
PangoLogAttr attr;
guint as_int;
diff --git a/gtkhtml/htmlclue.c b/gtkhtml/htmlclue.c
index 43402b1..3e552bd 100644
--- a/gtkhtml/htmlclue.c
+++ b/gtkhtml/htmlclue.c
@@ -62,7 +62,7 @@ get_n_children (HTMLObject *o)
gint n_children = 0;
while (cur) {
- n_children ++;
+ n_children++;
cur = html_object_next_not_slave (cur);
}
@@ -79,7 +79,7 @@ get_child (HTMLObject *o, gint index)
while (cur) {
if (!index)
break;
- index --;
+ index--;
cur = html_object_next_not_slave (cur);
}
@@ -95,7 +95,7 @@ get_child_index (HTMLObject *self, HTMLObject *child)
while (cur) {
if (cur == child)
return index;
- index ++;
+ index++;
cur = html_object_next_not_slave (cur);
}
@@ -242,7 +242,7 @@ split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, gint lev
*left = g_list_prepend (*left, self);
*right = g_list_prepend (*right, dup);
- level --;
+ level--;
if (level > 0)
html_object_split (self->parent, e, dup, 0, level, left, right);
}
@@ -380,7 +380,7 @@ find_anchor (HTMLObject *self, const gchar *name, gint *x, gint *y)
clue = HTML_CLUE (self);
- for ( obj = clue->head; obj != NULL; obj = obj->next ) {
+ for (obj = clue->head; obj != NULL; obj = obj->next) {
if ((anchor = html_object_find_anchor ( obj, name, x, y)) != 0 )
return anchor;
}
diff --git a/gtkhtml/htmlclueflow.c b/gtkhtml/htmlclueflow.c
index 3206e5d..9e82f99 100644
--- a/gtkhtml/htmlclueflow.c
+++ b/gtkhtml/htmlclueflow.c
@@ -267,7 +267,7 @@ op_helper (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left,
if (!from && prev_flow_in_cluevs (self)) {
(*len) ++;
/* if (cut)
- e->cursor->position --; */
+ e->cursor->position--; */
}
if (cut)
html_clue_remove_text_slaves (HTML_CLUE (self));
@@ -391,9 +391,9 @@ merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **
cf2->item_type = cf1->item_type;
update_item_number (self, e);
- cf1->item_number --;
+ cf1->item_number--;
update_item_number (with, e);
- cf1->item_number ++;
+ cf1->item_number++;
if (cf2_next_relative)
update_item_number (cf2_next_relative, e);
@@ -1174,7 +1174,7 @@ get_item_marker_str (HTMLClueFlow *flow, gboolean ascii_only)
if (type == HTML_LIST_TYPE_BLOCKQUOTE && flow->levels->len > 0) {
gint i;
- for (i = flow->levels->len - 1; i >= 0; i --) {
+ for (i = flow->levels->len - 1; i >= 0; i--) {
if (flow->levels->data [i] != HTML_LIST_TYPE_BLOCKQUOTE) {
type = flow->levels->data [i];
break;
@@ -1490,7 +1490,7 @@ write_indent (HTMLEngineSaveState *state, gint level)
while (level > 0) {
if (!html_engine_save_output_string (state, " "))
return FALSE;
- level --;
+ level--;
}
return TRUE;
@@ -2018,11 +2018,11 @@ save_plain (HTMLObject *self,
lattrs = g_new (PangoLogAttr, slen + 1);
n_items = g_list_length (items_list);
items = g_new (PangoItem *, n_items);
- for (i = 0, cur = items_list; i < n_items; i ++, cur = cur->next)
+ for (i = 0, cur = items_list; i < n_items; i++, cur = cur->next)
items [i] = (PangoItem *) cur->data;
offset = 0;
- for (i = 0; i < n_items; i ++) {
+ for (i = 0; i < n_items; i++) {
PangoItem tmp_item;
gint start_offset;
@@ -2034,7 +2034,7 @@ save_plain (HTMLObject *self,
tmp_item.length += items [i + 1]->length;
tmp_item.num_chars += items [i + 1]->num_chars;
offset += items [i + 1]->num_chars;
- i ++;
+ i++;
} else
break;
}
@@ -2045,7 +2045,7 @@ save_plain (HTMLObject *self,
html_text_remove_unwanted_line_breaks ((gchar *) s, slen, lattrs);
g_list_free (items_list);
- for (i = 0; i < n_items; i ++)
+ for (i = 0; i < n_items; i++)
pango_item_free (items [i]);
g_free (items);
pango_attr_list_unref (attrs);
@@ -2070,7 +2070,7 @@ save_plain (HTMLObject *self,
if (lattrs [wl].is_white) {
while (lattrs [wl].is_white && wl < slen)
- wl ++;
+ wl++;
if (wl < slen && html_text_is_line_break (lattrs [wl]))
look_backward = FALSE;
@@ -2082,14 +2082,14 @@ save_plain (HTMLObject *self,
while (wl > 0) {
if (html_text_is_line_break (lattrs [wl]))
break;
- wl --;
+ wl--;
}
}
if (wl > clen && wl < slen && html_text_is_line_break (lattrs [wl])) {
wi = MIN (wl, wmax);
while (wi > clen && lattrs [wi - 1].is_white)
- wi --;
+ wi--;
len = wi - clen;
width = utf8_width ((gchar *) s, len);
skip = wl - wi;
@@ -2133,7 +2133,7 @@ save_plain (HTMLObject *self,
if (*s == '\n') {
s++;
- clen ++;
+ clen++;
}
g_string_append_c (out, '\n');
diff --git a/gtkhtml/htmlcolor.c b/gtkhtml/htmlcolor.c
index e1b7d47..17870a9 100644
--- a/gtkhtml/htmlcolor.c
+++ b/gtkhtml/htmlcolor.c
@@ -63,7 +63,7 @@ html_color_ref (HTMLColor *color)
{
g_assert (color);
- color->refcount ++;
+ color->refcount++;
}
void
@@ -72,7 +72,7 @@ html_color_unref (HTMLColor *color)
g_assert (color);
g_assert (color->refcount > 0);
- color->refcount --;
+ color->refcount--;
if (!color->refcount) {
/* if (color->allocated)
diff --git a/gtkhtml/htmlcursor.c b/gtkhtml/htmlcursor.c
index 07f7652..769b80a 100644
--- a/gtkhtml/htmlcursor.c
+++ b/gtkhtml/htmlcursor.c
@@ -225,7 +225,7 @@ forward (HTMLCursor *cursor,
if (!html_object_is_container (next))
cursor->offset = (next->parent == cursor->object->parent) ? 1 : 0;
cursor->object = next;
- cursor->position ++;
+ cursor->position++;
} else
retval = FALSE;
}
@@ -290,7 +290,7 @@ backward (HTMLCursor *cursor,
if (!html_object_is_container (prev))
cursor->offset = html_object_get_length (prev);
cursor->object = prev;
- cursor->position --;
+ cursor->position--;
} else
retval = FALSE;
}
@@ -927,7 +927,7 @@ html_cursor_forward_n (HTMLCursor *cursor, HTMLEngine *e, guint n)
gboolean rv = FALSE;
while (n && html_cursor_forward (cursor, e)) {
- n --;
+ n--;
rv = TRUE;
}
@@ -940,7 +940,7 @@ html_cursor_backward_n (HTMLCursor *cursor, HTMLEngine *e, guint n)
gboolean rv = FALSE;
while (n && html_cursor_backward (cursor, e)) {
- n --;
+ n--;
rv = TRUE;
}
@@ -969,7 +969,7 @@ move_to_next_object (HTMLCursor *cursor, HTMLEngine *e)
next = html_object_next_cursor (cursor->object, (gint *) &cursor->offset);
if (next && next->parent) {
cursor->object = next;
- cursor->position ++;
+ cursor->position++;
if (!html_object_is_container (next)) {
if (html_object_get_direction (next->parent) == HTML_DIRECTION_RTL) {
@@ -993,7 +993,7 @@ move_to_prev_object (HTMLCursor *cursor, HTMLEngine *e)
prev = html_object_prev_cursor (cursor->object, (gint *) &cursor->offset);
if (prev && prev->parent) {
cursor->object = prev;
- cursor->position --;
+ cursor->position--;
if (!html_object_is_container (prev)) {
if (html_object_get_direction (prev->parent) == HTML_DIRECTION_RTL) {
@@ -1126,9 +1126,9 @@ move_right (HTMLCursor *cursor, HTMLEngine *e)
if (rv && !html_object_is_container (cursor->object) && cursor->object->parent == orig->parent) {
if (html_object_get_direction (cursor->object) == HTML_DIRECTION_RTL)
- cursor->offset --;
+ cursor->offset--;
else
- cursor->offset ++;
+ cursor->offset++;
}
return rv;
diff --git a/gtkhtml/htmlengine-edit-cut-and-paste.c b/gtkhtml/htmlengine-edit-cut-and-paste.c
index d773abc..4f80060 100644
--- a/gtkhtml/htmlengine-edit-cut-and-paste.c
+++ b/gtkhtml/htmlengine-edit-cut-and-paste.c
@@ -138,7 +138,7 @@ get_parent_depth (HTMLObject *o, HTMLObject *parent)
while (o && parent && o != parent) {
o = o->parent;
- level ++;
+ level++;
}
return level;
@@ -647,13 +647,13 @@ validate_tables (HTMLEngine *e, HTMLUndoDirection dir, gboolean add_undo, gboole
gint steps = 0;
while (html_cursor_forward (e->cursor, e)) {
- steps ++;
+ steps++;
if (HTML_IS_TABLE (e->cursor->object)) {
next = html_object_next_not_slave (e->cursor->object);
if (next) {
insert_empty_paragraph (e, dir, FALSE);
*fix_para = TRUE;
- steps ++;
+ steps++;
break;
}
} else
@@ -1019,7 +1019,7 @@ fix_aligned_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection di
if (!html_cursor_forward (e->cursor, e))
g_assert (html_cursor_backward (e->cursor, e));
else
- e->cursor->position --;
+ e->cursor->position--;
html_clue_remove (HTML_CLUE (cf->parent), cf);
html_object_destroy (cf);
@@ -1071,7 +1071,7 @@ fix_aligned_position (HTMLEngine *e, guint *position_after, HTMLUndoDirection di
html_clue_append (HTML_CLUE (cf), e->cursor->object);
html_clue_append_after (HTML_CLUE (cluev), cf, flow);
e->cursor->offset = 0;
- e->cursor->position ++;
+ e->cursor->position++;
(*position_after) ++;
#ifdef OP_DEBUG
gtk_html_debug_dump_tree_simple (e->clue, 0);
@@ -1327,13 +1327,13 @@ use_pictograms (HTMLEngine *e)
while (picto_chars [state + relative]) {
if (picto_chars [state + relative] == uc)
break;
- relative ++;
+ relative++;
}
state = picto_states [state + relative];
/* 0 .. not found, -n .. found n-th */
if (state <= 0)
break;
- pos --;
+ pos--;
}
/* Special case needed to recognize angel and devilish. */
@@ -1486,7 +1486,7 @@ html_engine_paste_link (HTMLEngine *e, const gchar *text, gint len, const gchar
target = strrchr (url, '#');
if (target) {
*target = 0;
- target ++;
+ target++;
}
html_engine_paste_text (e, text, len);
diff --git a/gtkhtml/htmlengine-edit-table.c b/gtkhtml/htmlengine-edit-table.c
index 8547edb..074c635 100644
--- a/gtkhtml/htmlengine-edit-table.c
+++ b/gtkhtml/htmlengine-edit-table.c
@@ -111,9 +111,9 @@ html_engine_insert_table (HTMLEngine *e, gint cols, gint rows, gint width, gint
table = html_table_new (width, percent, padding, spacing, border);
- for (r = 0; r < rows; r ++) {
+ for (r = 0; r < rows; r++) {
html_table_start_row (HTML_TABLE (table));
- for (c = 0; c < cols; c ++)
+ for (c = 0; c < cols; c++)
html_table_add_cell (HTML_TABLE (table), html_engine_new_cell (e, HTML_TABLE (table)));
html_table_end_row (HTML_TABLE (table));
}
@@ -238,8 +238,8 @@ html_table_insert_column (HTMLTable *t, HTMLEngine *e, gint col, HTMLTableCell *
html_engine_goto_table_0 (e, t);
html_table_alloc_cell (t, 0, t->totalCols);
- for (c = t->totalCols - 1; c > col; c --) {
- for (r = 0; r < t->totalRows; r ++) {
+ for (c = t->totalCols - 1; c > col; c--) {
+ for (r = 0; r < t->totalRows; r++) {
HTMLTableCell *cell = t->cells [r][c - 1];
if (cell) {
@@ -247,14 +247,14 @@ html_table_insert_column (HTMLTable *t, HTMLEngine *e, gint col, HTMLTableCell *
html_table_cell_set_position (cell, cell->row, c);
t->cells [r][c - 1] = NULL;
} else if (c == col + 1 && cell->row == r)
- cell->cspan ++;
+ cell->cspan++;
if (cell->col > c - 1)
t->cells [r][c - 1] = NULL;
t->cells [r][c] = cell;
}
}
}
- for (r = 0; r < t->totalRows; r ++) {
+ for (r = 0; r < t->totalRows; r++) {
if (!t->cells [r][col]) {
guint len;
@@ -314,7 +314,7 @@ delete_cells_undo_destroy (HTMLUndoData *undo_data)
DeleteCellsUndo *data = (DeleteCellsUndo *) undo_data;
gint i;
- for (i = 0; i < data->size; i ++)
+ for (i = 0; i < data->size; i++)
if (data->cells [i])
html_object_destroy (HTML_OBJECT (data->cells [i]));
g_free(data->cells);
@@ -397,7 +397,7 @@ html_table_delete_column (HTMLTable *t, HTMLEngine *e, gint col, HTMLUndoDirecti
pos.offset = e->cursor->offset;
html_engine_goto_table_0 (e, t);
- for (r = 0; r < t->totalRows; r ++) {
+ for (r = 0; r < t->totalRows; r++) {
cell = t->cells [r][col];
/* remove & keep old one */
@@ -407,7 +407,7 @@ html_table_delete_column (HTMLTable *t, HTMLEngine *e, gint col, HTMLUndoDirecti
t->cells [r][col] = NULL;
}
- for (c = col + 1; c < t->totalCols; c ++) {
+ for (c = col + 1; c < t->totalCols; c++) {
cell = t->cells [r][c];
if (cell && cell->col != col) {
if (cell->row == r && cell->col == c)
@@ -421,7 +421,7 @@ html_table_delete_column (HTMLTable *t, HTMLEngine *e, gint col, HTMLUndoDirecti
html_cursor_jump_to (e->cursor, e, pos.object, pos.offset);
position_after = e->cursor->position;
delete_column_setup_undo (e, column, t->totalRows, position_after, col, dir);
- t->totalCols --;
+ t->totalCols--;
html_object_change_set (HTML_OBJECT (t), HTML_CHANGE_ALL_CALC);
html_engine_queue_draw (e, HTML_OBJECT (t));
@@ -530,8 +530,8 @@ html_table_insert_row (HTMLTable *t, HTMLEngine *e, gint row, HTMLTableCell **ro
html_engine_goto_table_0 (e, t);
html_table_alloc_cell (t, t->totalRows, 0);
- for (r = t->totalRows; r > row; r --) {
- for (c = 0; c < t->totalCols; c ++) {
+ for (r = t->totalRows; r > row; r--) {
+ for (c = 0; c < t->totalCols; c++) {
HTMLTableCell *cell = t->cells [r - 1][c];
if (cell) {
@@ -539,14 +539,14 @@ html_table_insert_row (HTMLTable *t, HTMLEngine *e, gint row, HTMLTableCell **ro
html_table_cell_set_position (cell, r, cell->col);
t->cells [r - 1][c] = NULL;
} else if (r == row + 1 && cell->col == c)
- cell->rspan ++;
+ cell->rspan++;
if (cell->row > r - 1)
t->cells [r - 1][c] = NULL;
t->cells [r][c] = cell;
}
}
}
- for (c = 0; c < t->totalCols; c ++) {
+ for (c = 0; c < t->totalCols; c++) {
if (!t->cells [row][c]) {
guint len;
@@ -652,7 +652,7 @@ html_table_delete_row (HTMLTable *t, HTMLEngine *e, gint row, HTMLUndoDirection
pos.offset = e->cursor->offset;
html_engine_goto_table_0 (e, t);
- for (c = 0; c < t->totalCols; c ++) {
+ for (c = 0; c < t->totalCols; c++) {
cell = t->cells [row][c];
/* remove & keep old one */
@@ -662,7 +662,7 @@ html_table_delete_row (HTMLTable *t, HTMLEngine *e, gint row, HTMLUndoDirection
t->cells [row][c] = NULL;
}
- for (r = row + 1; r < t->totalRows; r ++) {
+ for (r = row + 1; r < t->totalRows; r++) {
cell = t->cells [r][c];
if (cell && cell->row != row) {
if (cell->row == r && cell->col == c)
@@ -674,7 +674,7 @@ html_table_delete_row (HTMLTable *t, HTMLEngine *e, gint row, HTMLUndoDirection
}
html_cursor_jump_to (e->cursor, e, pos.object, pos.offset);
- t->totalRows --;
+ t->totalRows--;
position_after = e->cursor->position;
delete_row_setup_undo (e, row_cells, t->totalCols, position_after, row, dir);
html_object_change_set (HTML_OBJECT (t), HTML_CHANGE_ALL_CALC);
@@ -1020,8 +1020,8 @@ table_set_padding (HTMLEngine *e, HTMLTable *t, gint padding, gboolean relative,
html_cursor_get_position (e->cursor)), dir);
t->padding = new_padding;
- for (r = 0; r < t->totalRows; r ++)
- for (c = 0; c < t->totalCols; c ++)
+ for (r = 0; r < t->totalRows; r++)
+ for (c = 0; c < t->totalCols; c++)
if (t->cells [r][c]->col == c && t->cells [r][c]->row == r) {
HTML_CLUEV (t->cells [r][c])->padding = new_padding;
HTML_OBJECT (t->cells [r][c])->change |= HTML_CHANGE_ALL_CALC;
@@ -1176,12 +1176,12 @@ html_engine_table_set_cols (HTMLEngine *e, gint cols)
if (table->totalCols < cols) {
gint n = cols - table->totalCols;
- for (; n > 0; n --)
+ for (; n > 0; n--)
html_table_insert_column (table, e, table->totalCols, NULL, HTML_UNDO_UNDO);
} else {
gint n = table->totalCols - cols;
- for (; n > 0; n --)
+ for (; n > 0; n--)
html_table_delete_column (table, e, table->totalCols - 1, HTML_UNDO_UNDO);
}
}
@@ -1204,12 +1204,12 @@ html_engine_table_set_rows (HTMLEngine *e, gint rows)
if (table->totalRows < rows) {
gint n = rows - table->totalRows;
- for (; n > 0; n --)
+ for (; n > 0; n--)
html_table_insert_row (table, e, table->totalRows, NULL, HTML_UNDO_UNDO);
} else {
gint n = table->totalRows - rows;
- for (; n > 0; n --)
+ for (; n > 0; n--)
html_table_delete_row (table, e, table->totalRows - 1, HTML_UNDO_UNDO);
}
}
diff --git a/gtkhtml/htmlengine-edit-tablecell.c b/gtkhtml/htmlengine-edit-tablecell.c
index d045211..45e7422 100644
--- a/gtkhtml/htmlengine-edit-tablecell.c
+++ b/gtkhtml/htmlengine-edit-tablecell.c
@@ -449,7 +449,7 @@ move_cell_rd_undo_free (struct MoveCellRDUndo *undo)
{
gint i;
- for (i = 0; i < undo->rspan*undo->cspan; i ++)
+ for (i = 0; i < undo->rspan*undo->cspan; i++)
if (undo->removed [i])
html_object_destroy (HTML_OBJECT (undo->removed [i]));
g_free (undo->removed);
@@ -466,8 +466,8 @@ move_cell_rd (HTMLTable *t, HTMLTableCell *cell, gint rs, gint cs)
undo = move_cell_rd_undo_new (cell->rspan, cell->cspan);
/* printf ("move %dx%d --> %dx%d\n", cell->row, cell->col, cell->row + rs, cell->col + cs); */
- for (r = cell->row + cell->rspan - 1; r >= cell->row; r --)
- for (c = cell->col + cell->cspan - 1; c >= cell->col; c --) {
+ for (r = cell->row + cell->rspan - 1; r >= cell->row; r--)
+ for (c = cell->col + cell->cspan - 1; c >= cell->col; c--) {
if (r > cell->row + cell->rspan - 1 - rs || c > cell->col + cell->cspan - 1 - cs) {
gint nr = rs + r - (rs ? cell->rspan : 0), nc = cs + c - (cs ? cell->cspan : 0);
@@ -548,8 +548,8 @@ move_cell_rd_undo (HTMLTable *table, struct MoveCellRDUndo *undo)
HTMLTableCell *cell = table->cells [undo->move.rt][undo->move.ct];
gint r, c;
- for (r = 0; r < undo->rspan; r ++)
- for (c = 0; c < undo->cspan; c ++)
+ for (r = 0; r < undo->rspan; r++)
+ for (c = 0; c < undo->cspan; c++)
if (undo->moved [r*undo->cspan + c].move) {
struct Move *move = &undo->moved [r*undo->cspan + c];
@@ -559,11 +559,11 @@ move_cell_rd_undo (HTMLTable *table, struct MoveCellRDUndo *undo)
table->cells [move->rt][move->ct] = NULL;
}
- for (r = 0; r < cell->rspan; r ++)
- for (c = 0; c < cell->cspan; c ++)
+ for (r = 0; r < cell->rspan; r++)
+ for (c = 0; c < cell->cspan; c++)
table->cells [undo->move.rt + r][undo->move.ct + c] = NULL;
- for (r = 0; r < cell->rspan; r ++)
- for (c = 0; c < cell->cspan; c ++)
+ for (r = 0; r < cell->rspan; r++)
+ for (c = 0; c < cell->cspan; c++)
table->cells [undo->move.rs + r][undo->move.cs + c] = cell;
html_table_cell_set_position (cell, undo->move.rs, undo->move.cs);
@@ -600,24 +600,24 @@ expand_cspan (HTMLEngine *e, HTMLTableCell *cell, gint cspan, HTMLUndoDirection
gint r, c, *move_rows, max_move, add_cols;
move_rows = g_new0 (gint, cell->rspan);
- for (r = cell->row; r < cell->row + cell->rspan; r ++)
- for (c = cell->col + cell->cspan; c < MIN (cell->col + cspan, table->totalCols); c ++)
+ for (r = cell->row; r < cell->row + cell->rspan; r++)
+ for (c = cell->col + cell->cspan; c < MIN (cell->col + cspan, table->totalCols); c++)
if (table->cells [r][c] && !html_clue_is_empty (HTML_CLUE (table->cells [r][c])) && move_rows [r - cell->row] == 0)
move_rows [r - cell->row] = cspan - (c - cell->col);
max_move = 0;
- for (r = 0; r < cell->rspan; r ++)
+ for (r = 0; r < cell->rspan; r++)
if (move_rows [r] > max_move)
max_move = move_rows [r];
add_cols = MAX (max_move, cspan - (table->totalCols - cell->col));
/* printf ("max move: %d add: %d\n", max_move, add_cols); */
- for (c = 0; c < add_cols; c ++)
+ for (c = 0; c < add_cols; c++)
html_table_insert_column (table, e, table->totalCols, NULL, dir);
if (max_move > 0) {
- for (c = table->totalCols - max_move - 1; c >= cell->col + cspan - max_move; c --)
- for (r = cell->row; r < cell->row + cell->rspan; r ++) {
+ for (c = table->totalCols - max_move - 1; c >= cell->col + cspan - max_move; c--)
+ for (r = cell->row; r < cell->row + cell->rspan; r++) {
HTMLTableCell *ccell = table->cells [r][c];
if (ccell && ccell->col == c) {
@@ -629,8 +629,8 @@ expand_cspan (HTMLEngine *e, HTMLTableCell *cell, gint cspan, HTMLUndoDirection
expand_cspan_setup_undo (e, slist, cell->cspan, position_before, dir);
cell->cspan = cspan;
- for (r = cell->row; r < cell->row + cell->rspan; r ++)
- for (c = cell->col; c < cell->col + cell->cspan; c ++)
+ for (r = cell->row; r < cell->row + cell->rspan; r++)
+ for (c = cell->col; c < cell->col + cell->cspan; c++)
table->cells [r][c] = cell;
html_object_change_set (HTML_OBJECT (cell), HTML_CHANGE_ALL);
@@ -681,8 +681,8 @@ collapse_cspan (HTMLEngine *e, HTMLTableCell *cell, gint cspan, HTMLUndoDirectio
gint r, c;
table = HTML_TABLE (HTML_OBJECT (cell)->parent);
- for (c = cell->col + cspan; c < cell->col + cell->cspan; c ++)
- for (r = cell->row; r < cell->row + cell->rspan; r ++) {
+ for (c = cell->col + cspan; c < cell->col + cell->cspan; c++)
+ for (r = cell->row; r < cell->row + cell->rspan; r++) {
table->cells [r][c] = NULL;
html_table_set_cell (table, r, c, html_engine_new_cell (e, table));
html_table_cell_set_position (table->cells [r][c], r, c);
@@ -719,13 +719,13 @@ calc_rspan_max_move (HTMLTableCell *cell, gint rspan)
gint r, c, *move_cols, max_move;
move_cols = g_new0 (gint, cell->cspan);
- for (c = cell->col; c < cell->col + cell->cspan; c ++)
- for (r = cell->row + cell->rspan; r < MIN (cell->row + rspan, table->totalRows); r ++)
+ for (c = cell->col; c < cell->col + cell->cspan; c++)
+ for (r = cell->row + cell->rspan; r < MIN (cell->row + rspan, table->totalRows); r++)
if (table->cells [r][c] && !html_clue_is_empty (HTML_CLUE (table->cells [r][c])) && move_cols [c - cell->col] == 0)
move_cols [c - cell->col] = rspan - (r - cell->row);
max_move = 0;
- for (c = 0; c < cell->cspan; c ++)
+ for (c = 0; c < cell->cspan; c++)
if (move_cols [c] > max_move)
max_move = move_cols [c];
g_free (move_cols);
@@ -743,12 +743,12 @@ expand_rspan (HTMLEngine *e, HTMLTableCell *cell, gint rspan, HTMLUndoDirection
max_move = calc_rspan_max_move (cell, rspan);
add_rows = MAX (max_move, rspan - (table->totalRows - cell->row));
/* printf ("max move: %d add: %d\n", max_move, add_rows); */
- for (r = 0; r < add_rows; r ++)
+ for (r = 0; r < add_rows; r++)
html_table_insert_row (table, e, table->totalRows, NULL, dir);
if (max_move > 0) {
- for (r = table->totalRows - max_move - 1; r >= cell->row + rspan - max_move; r --)
- for (c = cell->col; c < cell->col + cell->cspan; c ++) {
+ for (r = table->totalRows - max_move - 1; r >= cell->row + rspan - max_move; r--)
+ for (c = cell->col; c < cell->col + cell->cspan; c++) {
HTMLTableCell *ccell = table->cells [r][c];
if (ccell && ccell->row == r) {
@@ -759,8 +759,8 @@ expand_rspan (HTMLEngine *e, HTMLTableCell *cell, gint rspan, HTMLUndoDirection
}
cell->rspan = rspan;
- for (r = cell->row; r < cell->row + cell->rspan; r ++)
- for (c = cell->col; c < cell->col + cell->cspan; c ++)
+ for (r = cell->row; r < cell->row + cell->rspan; r++)
+ for (c = cell->col; c < cell->col + cell->cspan; c++)
table->cells [r][c] = cell;
html_object_change_set (HTML_OBJECT (cell), HTML_CHANGE_ALL);
@@ -792,8 +792,8 @@ collapse_rspan (HTMLEngine *e, HTMLTableCell *cell, gint rspan, HTMLUndoDirectio
gint r, c;
table = HTML_TABLE (HTML_OBJECT (cell)->parent);
- for (r = cell->row + rspan; r < cell->row + cell->rspan; r ++)
- for (c = cell->col; c < cell->col + cell->cspan; c ++) {
+ for (r = cell->row + rspan; r < cell->row + cell->rspan; r++)
+ for (c = cell->col; c < cell->col + cell->cspan; c++) {
table->cells [r][c] = NULL;
html_table_set_cell (table, r, c, html_engine_new_cell (e, table));
html_table_cell_set_position (table->cells [r][c], r, c);
diff --git a/gtkhtml/htmlengine-edit-text.c b/gtkhtml/htmlengine-edit-text.c
index 1cd49c5..34f45ae 100644
--- a/gtkhtml/htmlengine-edit-text.c
+++ b/gtkhtml/htmlengine-edit-text.c
@@ -114,7 +114,7 @@ set_link (HTMLObject *obj, HTMLEngine *e, gpointer data)
target = strrchr (url, '#');
if (target) {
*target = 0;
- target ++;
+ target++;
}
}
diff --git a/gtkhtml/htmlengine-edit.c b/gtkhtml/htmlengine-edit.c
index ea6a766..00c7e31 100644
--- a/gtkhtml/htmlengine-edit.c
+++ b/gtkhtml/htmlengine-edit.c
@@ -397,7 +397,7 @@ html_engine_new_link (HTMLEngine *e, const gchar *text, gint len, gchar *url)
real_target = strchr (text, '#');
if (real_target) {
real_url = g_strndup (url, real_target - url);
- real_target ++;
+ real_target++;
} else
real_url = url;
@@ -574,9 +574,9 @@ html_engine_indent_paragraph (HTMLEngine *e)
prev = html_cursor_get_prev_char (e->cursor);
if (prev != ' ' && prev != '\t') {
html_engine_insert_text (e, " ", 1);
- line_offset ++;
+ line_offset++;
} else if (position > e->cursor->position)
- position --;
+ position--;
last_space = line_offset - 1;
} else {
line_offset = 0;
@@ -810,7 +810,7 @@ html_engine_get_insert_level_for_object (HTMLEngine *e, HTMLObject *o)
while (clue && clue->parent && (HTML_IS_CLUEV (clue->parent) || HTML_IS_TABLE_CELL (clue->parent))) {
clue = clue->parent;
- cursor_level ++;
+ cursor_level++;
}
}
}
diff --git a/gtkhtml/htmlengine-print.c b/gtkhtml/htmlengine-print.c
index 07dc261..5c55b46 100644
--- a/gtkhtml/htmlengine-print.c
+++ b/gtkhtml/htmlengine-print.c
@@ -151,7 +151,7 @@ print_all_pages (HTMLPainter *painter,
document_height = html_engine_get_doc_height (engine);
do {
- pages ++;
+ pages++;
new_split_offset = html_object_check_page_split (
engine->clue, painter, split_offset + body_height);
diff --git a/gtkhtml/htmlengine.c b/gtkhtml/htmlengine.c
index fc65a30..5bdb83d 100644
--- a/gtkhtml/htmlengine.c
+++ b/gtkhtml/htmlengine.c
@@ -5174,7 +5174,7 @@ html_engine_block_redraw (HTMLEngine *e)
{
g_return_if_fail (HTML_IS_ENGINE (e));
- e->block_redraw ++;
+ e->block_redraw++;
if (e->redraw_idle_id) {
g_source_remove (e->redraw_idle_id);
e->redraw_idle_id = 0;
@@ -5189,7 +5189,7 @@ html_engine_unblock_redraw (HTMLEngine *e)
g_return_if_fail (e->block_redraw > 0);
- e->block_redraw --;
+ e->block_redraw--;
if (!e->block_redraw && e->need_redraw) {
if (e->redraw_idle_id) {
g_source_remove (e->redraw_idle_id);
diff --git a/gtkhtml/htmlfontmanager.c b/gtkhtml/htmlfontmanager.c
index 9a1d6ea..252595e 100644
--- a/gtkhtml/htmlfontmanager.c
+++ b/gtkhtml/htmlfontmanager.c
@@ -74,7 +74,7 @@ html_font_set_release (HTMLFontSet *set, HTMLPainter *painter)
static void
html_font_set_unref (HTMLFontSet *set, HTMLPainter *painter)
{
- set->ref_count --;
+ set->ref_count--;
if (!set->ref_count) {
html_font_set_release (set, painter);
if (set->face)
@@ -276,11 +276,11 @@ strip_white_space (gchar *name)
{
gint end;
while (name [0] == ' ' || name [0] == '\t')
- name ++;
+ name++;
end = strlen (name);
while (end && (name [end - 1] == ' ' || name [end - 1] == '\t')) {
name [end - 1] = 0;
- end --;
+ end--;
}
return name;
@@ -308,7 +308,7 @@ alloc_new_font (HTMLFontManager *manager, HTMLFontSet **set, gchar *face_list, G
g_hash_table_insert (manager->font_sets, g_strdup (face_name), *set);
}
if (strcmp (face_list, *face)) {
- (*set)->ref_count ++;
+ (*set)->ref_count++;
g_hash_table_insert (manager->font_sets, g_strdup (face_list), *set);
}
break;
@@ -403,13 +403,13 @@ void
html_font_ref (HTMLFont *font, HTMLPainter *painter)
{
html_painter_ref_font (painter, font);
- font->ref_count ++;
+ font->ref_count++;
}
void
html_font_unref (HTMLFont *font, HTMLPainter *painter)
{
- font->ref_count --;
+ font->ref_count--;
html_painter_unref_font (painter, font);
if (font->ref_count < 1)
diff --git a/gtkhtml/htmlgdkpainter.c b/gtkhtml/htmlgdkpainter.c
index 9ad3002..4e6c3b0 100644
--- a/gtkhtml/htmlgdkpainter.c
+++ b/gtkhtml/htmlgdkpainter.c
@@ -799,7 +799,7 @@ draw_glyphs (HTMLPainter *painter, gint x, gint y, PangoItem *item, PangoGlyphSt
if (properties.strikethrough || properties.underline)
cw = draw_lines (glyphs, x, y, gdk_painter->pixmap, gdk_painter->gc, item, &properties);
else
- for (i=0; i < glyphs->num_glyphs; i ++)
+ for (i=0; i < glyphs->num_glyphs; i++)
cw += glyphs->glyphs [i].geometry.width;
if (fg_text_color || fg)
diff --git a/gtkhtml/htmlobject.c b/gtkhtml/htmlobject.c
index 1d9d128..ea6b665 100644
--- a/gtkhtml/htmlobject.c
+++ b/gtkhtml/htmlobject.c
@@ -615,8 +615,8 @@ html_object_real_cursor_forward (HTMLObject *self, HTMLCursor *cursor, HTMLEngin
len = html_object_get_length (self);
if (cursor->offset < len) {
- cursor->offset ++;
- cursor->position ++;
+ cursor->offset++;
+ cursor->position++;
return TRUE;
} else
return FALSE;
@@ -653,8 +653,8 @@ html_object_real_cursor_backward (HTMLObject *self, HTMLCursor *cursor, HTMLEngi
return FALSE;
if (cursor->offset > 1 || html_cursor_allow_zero_offset (cursor, self)) {
- cursor->offset --;
- cursor->position --;
+ cursor->offset--;
+ cursor->position--;
return TRUE;
}
@@ -678,14 +678,14 @@ html_object_real_cursor_right (HTMLObject *self, HTMLPainter *painter, HTMLCurso
len = html_object_get_length (self);
if (cursor->offset < len) {
- cursor->offset ++;
- cursor->position ++;
+ cursor->offset++;
+ cursor->position++;
return TRUE;
}
} else {
if (cursor->offset > 1 || html_cursor_allow_zero_offset (cursor, self)) {
- cursor->offset --;
- cursor->position --;
+ cursor->offset--;
+ cursor->position--;
return TRUE;
}
}
@@ -706,8 +706,8 @@ html_object_real_cursor_left (HTMLObject *self, HTMLPainter *painter, HTMLCursor
if (dir != HTML_DIRECTION_RTL) {
if (cursor->offset > 1 || html_cursor_allow_zero_offset (cursor, self)) {
- cursor->offset --;
- cursor->position --;
+ cursor->offset--;
+ cursor->position--;
return TRUE;
}
} else {
@@ -716,8 +716,8 @@ html_object_real_cursor_left (HTMLObject *self, HTMLPainter *painter, HTMLCursor
len = html_object_get_length (self);
if (cursor->offset < len) {
- cursor->offset ++;
- cursor->position ++;
+ cursor->offset++;
+ cursor->position++;
return TRUE;
}
}
@@ -2036,7 +2036,7 @@ html_object_nth_parent (HTMLObject *self, gint n)
{
while (self && n > 0) {
self = self->parent;
- n --;
+ n--;
}
return self;
@@ -2048,7 +2048,7 @@ html_object_get_parent_level (HTMLObject *self)
gint level = 0;
while (self) {
- level ++;
+ level++;
self = self->parent;
}
@@ -2131,7 +2131,7 @@ html_object_get_insert_level (HTMLObject *o)
while (o && (HTML_IS_CLUEV (o) || HTML_IS_TABLE_CELL (o))
&& HTML_CLUE (o)->head && (HTML_IS_CLUEV (HTML_CLUE (o)->head) || HTML_IS_TABLE_CELL (HTML_CLUE (o)->head))) {
- level ++;
+ level++;
o = HTML_CLUE (o)->head;
}
diff --git a/gtkhtml/htmlpainter.c b/gtkhtml/htmlpainter.c
index 5080ed0..a9e2647 100644
--- a/gtkhtml/htmlpainter.c
+++ b/gtkhtml/htmlpainter.c
@@ -142,7 +142,7 @@ text_width (HTMLPainter *painter, PangoFontDescription *desc, const gchar *text,
gint i;
for (list = glyphs; list; list = list->next->next) {
PangoGlyphString *str = (PangoGlyphString *) list->data;
- for (i=0; i < str->num_glyphs; i ++)
+ for (i=0; i < str->num_glyphs; i++)
width += str->glyphs [i].geometry.width;
}
}
@@ -197,7 +197,7 @@ text_size (HTMLPainter *painter, PangoFontDescription *desc, const gchar *text,
c_text = g_utf8_offset_to_pointer (c_text, str->num_glyphs);
if (*text == '\t')
- c_text ++;
+ c_text++;
c_bytes = c_text - text;
}
}
@@ -533,7 +533,7 @@ html_replace_tabs (const gchar *text, gchar *translated, guint bytes)
strncpy (tt, t, tab - t);
tt += tab - t;
*tt = ' ';
- tt ++;
+ tt++;
t = tab + 1;
} else
strncpy (tt, t, bytes - (t - text));
@@ -1018,7 +1018,7 @@ html_painter_text_itemize_and_prepare_glyphs (HTMLPainter *painter, PangoFontDes
end = g_utf8_offset_to_pointer (text, item->num_chars);
*glyphs = html_get_glyphs_non_tab (*glyphs, item, i, text, end - text, item->num_chars);
text = end;
- i ++;
+ i++;
}
*glyphs = g_list_reverse (*glyphs);
g_list_free (items);
diff --git a/gtkhtml/htmlselection.c b/gtkhtml/htmlselection.c
index 73cc370..7b091fb 100644
--- a/gtkhtml/htmlselection.c
+++ b/gtkhtml/htmlselection.c
@@ -414,13 +414,13 @@ html_engine_activate_selection (HTMLEngine *e, guint32 time)
void
html_engine_block_selection (HTMLEngine *e)
{
- e->block_selection ++;
+ e->block_selection++;
}
void
html_engine_unblock_selection (HTMLEngine *e)
{
- e->block_selection --;
+ e->block_selection--;
}
void
diff --git a/gtkhtml/htmlstyle.c b/gtkhtml/htmlstyle.c
index f881b36..7c3a2e9 100644
--- a/gtkhtml/htmlstyle.c
+++ b/gtkhtml/htmlstyle.c
@@ -397,7 +397,7 @@ static HTMLStyle *
parse_border_style (HTMLStyle *style, gchar *value)
{
while (isspace (*value))
- value ++;
+ value++;
if (!g_ascii_strcasecmp (value, "solid"))
style = html_style_set_border_style (style, HTML_BORDER_SOLID);
@@ -425,7 +425,7 @@ static HTMLStyle *
parse_border_width (HTMLStyle *style, gchar *value)
{
while (isspace (*value))
- value ++;
+ value++;
if (!g_ascii_strcasecmp (value, "thin"))
style = html_style_set_border_width (style, 1);
@@ -448,11 +448,11 @@ parse_border (HTMLStyle *style, gchar *value)
gchar orig = 0;
while (isspace (*value))
- value ++;
+ value++;
next = value;
while (*next && !isspace (*next))
- next ++;
+ next++;
if (*next) {
orig = *next;
*next = 0;
@@ -466,7 +466,7 @@ parse_border (HTMLStyle *style, gchar *value)
if (modified) {
*next = orig;
- next ++;
+ next++;
}
value = next;
diff --git a/gtkhtml/htmltable.c b/gtkhtml/htmltable.c
index b0d2ab9..dde5148 100644
--- a/gtkhtml/htmltable.c
+++ b/gtkhtml/htmltable.c
@@ -246,7 +246,7 @@ get_n_children (HTMLObject *self)
for (r = 0; r < t->totalRows; r++)
for (c = 0; c < t->totalCols; c++)
if (t->cells [r][c] && t->cells [r][c]->row == r && t->cells [r][c]->col == c)
- n_children ++;
+ n_children++;
/* printf ("table n_children %d\n", n_children); */
@@ -267,7 +267,7 @@ get_child (HTMLObject *self, gint index)
child = HTML_OBJECT (t->cells [r][c]);
break;
}
- n ++;
+ n++;
}
/* printf ("table ref %d child %p\n", index, child); */
@@ -289,7 +289,7 @@ get_child_index (HTMLObject *self, HTMLObject *child)
/* printf ("table child %p index %d\n", child, n); */
return n;
}
- n ++;
+ n++;
}
}
@@ -310,8 +310,8 @@ get_recursive_length (HTMLObject *self)
len += html_object_get_recursive_length (HTML_OBJECT (t->cells [r][c])) + 1;
/* if (len > 0)
- len --; */
- len ++;
+ len--; */
+ len++;
return len;
}
@@ -470,8 +470,8 @@ split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, gint lev
dup = HTML_OBJECT (g_new0 (HTMLTable, 1));
dup_table = HTML_TABLE (dup);
copy_sized (self, dup, t->totalRows, t->totalCols);
- for (r = 0; r < t->totalRows; r ++) {
- for (c = 0; c < t->totalCols; c ++) {
+ for (r = 0; r < t->totalRows; r++) {
+ for (c = 0; c < t->totalCols; c++) {
HTMLTableCell *cc;
cc = t->cells [r][c];
@@ -558,8 +558,8 @@ could_merge (HTMLTable *t1, HTMLTable *t2)
|| t1->totalCols != t2->totalCols || t1->totalRows != t2->totalRows)
return FALSE;
- for (r = 0; r < t1->totalRows; r ++) {
- for (c = 0; c < t1->totalCols; c ++) {
+ for (r = 0; r < t1->totalRows; r++) {
+ for (c = 0; c < t1->totalCols; c++) {
HTMLTableCell *c1, *c2;
c1 = t1->cells [r][c];
@@ -653,8 +653,8 @@ merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **
cursor_cell_2 = HTML_TABLE_CELL (object_get_parent_cell (cursor->object, HTML_OBJECT (t1)));
cursor_cell_3 = HTML_TABLE_CELL (object_get_parent_cell (e->cursor->object, HTML_OBJECT (t2)));
- for (r = 0; r < t1->totalRows; r ++) {
- for (c = 0; c < t1->totalCols; c ++) {
+ for (r = 0; r < t1->totalRows; r++) {
+ for (c = 0; c < t1->totalCols; c++) {
HTMLTableCell *c1, *c2;
c1 = t1->cells [r][c];
@@ -680,7 +680,7 @@ merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **
+ (t1->totalCols - c1->col);
for (list = *left; list; list = list->next)
if (list->data && HTML_IS_TABLE (list->data))
- e->cursor->position --;
+ e->cursor->position--;
/* printf ("3rd dec: %d t1_tail %d,%d\n",
(t1->totalRows - c1->row - 1)*t1->totalCols
@@ -869,11 +869,11 @@ calc_column_width_step (HTMLTable *table, HTMLPainter *painter, GArray *array, g
if (LL col_width * (ARR (cell->col + i + 1) - ARR (cell->col))
- LL new_width * span_width > LL (new_width + 1) * span_width
- LL col_width * (ARR (cell->col + i + 1) - ARR (cell->col)))
- new_width ++;
+ new_width++;
} else {
new_width = added + col_width / span;
if (col_width - LL span * new_width > LL span * (new_width + 1) - col_width)
- new_width ++;
+ new_width++;
}
new_width -= added;
added += new_width;
@@ -917,7 +917,7 @@ calc_column_width_template (HTMLTable *table, HTMLPainter *painter, GArray *arra
}
}
g_free (arr);
- span ++;
+ span++;
}
for (c = 0; c < table->totalCols; c++)
@@ -1367,7 +1367,7 @@ calc_percentage_step (HTMLTable *table, gint *col_percent, gint *span_percent, g
not_percented = 0;
for (cp = 0; cp < span; cp++)
if (!PERC (c + cp))
- not_percented ++;
+ not_percented++;
np = 1;
added = 0;
@@ -1379,7 +1379,7 @@ calc_percentage_step (HTMLTable *table, gint *col_percent, gint *span_percent, g
if (np * pleft - part * not_percented >
(part + 1) * not_percented - np * pleft)
part++;
- np ++;
+ np++;
}
} else {
part = ((col_percent [c + cp + 1] - col_percent [c]) * pleft)
@@ -1388,7 +1388,7 @@ calc_percentage_step (HTMLTable *table, gint *col_percent, gint *span_percent, g
- part * (col_percent [cl] - col_percent [c])
> (part + 1) * (col_percent [cl] - col_percent [c])
- (col_percent [c + cp + 1] - col_percent [c]) * pleft)
- part ++;
+ part++;
}
part -= added;
added += part;
@@ -1407,7 +1407,7 @@ calc_col_percentage (HTMLTable *table, gint *col_percent)
gboolean next = TRUE;
percent = g_new0 (gint, table->totalCols);
- for (span = 1; next && span <= table->totalCols; span ++) {
+ for (span = 1; next && span <= table->totalCols; span++) {
for (c = 0; c < table->totalCols; c++)
percent [c] = 0;
@@ -1433,7 +1433,7 @@ calc_not_percented (HTMLTable *table, gint *col_percent)
not_percented = 0;
for (c = 0; c < table->totalCols; c++)
if (col_percent [c + 1] == col_percent [c])
- not_percented ++;
+ not_percented++;
return not_percented;
}
@@ -1461,7 +1461,7 @@ divide_into_percented (HTMLTable *table, gint *col_percent, gint *max_size, gint
add = LL left * (request - max_size [c] + filled) / to_fill;
if (LL left * (request - max_size [c] + filled) - LL add * to_fill >
LL (add + 1) * to_fill - LL left * (request - max_size [c] + filled))
- add ++;
+ add++;
add -= added;
added += add;
filled += request - max_size [c];
@@ -1539,7 +1539,7 @@ divide_upto_preferred_width (HTMLTable *table, HTMLPainter *painter, GArray *pre
part = (LL min_fill * processed_pw) / total_pref;
if (LL min_fill * processed_pw - LL part * total_pref
> LL (part + 1) * total_pref - LL min_fill * processed_pw)
- part ++;
+ part++;
part -= added;
if (max_size [c] + part > pw)
part = pw - max_size [c];
@@ -1591,7 +1591,7 @@ divide_left_by_preferred_width (HTMLTable *table, HTMLPainter *painter,
pw, part, total_fill, processed_pw); */
if (LL total_fill * processed_pw - LL part * pref
> LL (part + 1) * pref - LL total_fill * processed_pw)
- part ++;
+ part++;
part -= added;
max_size [c] += part;
added += part;
@@ -2413,8 +2413,8 @@ html_table_end_table (HTMLTable *table)
{
gint r, c, cells = 0;
- for (r = 0; r < table->totalRows; r ++)
- for (c = 0; c < table->totalCols; c ++)
+ for (r = 0; r < table->totalRows; r++)
+ for (c = 0; c < table->totalCols; c++)
if (table->cells [r][c]) {
if (HTML_CLUE (table->cells [r][c])->head == NULL) {
HTMLTableCell *cell = table->cells [r][c];
@@ -2422,7 +2422,7 @@ html_table_end_table (HTMLTable *table)
remove_cell (table, cell);
html_object_destroy (HTML_OBJECT (cell));
} else
- cells ++;
+ cells++;
}
return cells;
}
diff --git a/gtkhtml/htmltext.c b/gtkhtml/htmltext.c
index 9dbd99e..7609a26 100644
--- a/gtkhtml/htmltext.c
+++ b/gtkhtml/htmltext.c
@@ -105,7 +105,7 @@ html_text_pango_info_destroy (HTMLTextPangoInfo *pi)
{
gint i;
- for (i = 0; i < pi->n; i ++) {
+ for (i = 0; i < pi->n; i++) {
pango_item_free (pi->entries [i].glyph_item.item);
if (pi->entries [i].glyph_item.glyphs)
pango_glyph_string_free (pi->entries [i].glyph_item.glyphs);
@@ -197,7 +197,7 @@ debug_word_width (HTMLText *t)
guint i;
printf ("words: %d | ", t->words);
- for (i = 0; i < t->words; i ++)
+ for (i = 0; i < t->words; i++)
printf ("%d ", t->word_width [i]);
printf ("\n");
}
@@ -218,7 +218,7 @@ word_get_position (HTMLText *text, guint off, guint *word_out, guint *left_out,
coff += s ? g_utf8_pointer_to_offset (ls, s) : g_utf8_strlen (ls, -1);
(*word_out) ++;
if (s)
- s ++;
+ s++;
} while (s && coff < off);
*left_out = off - loff;
@@ -799,7 +799,7 @@ html_text_text_line_length (const gchar *text, gint *line_offset, guint len, gin
*line_offset += skip;
if (*line_offset != -1)
sum_skip += skip - 1;
- l ++;
+ l++;
if (tabs)
(*tabs) ++;
}
@@ -834,9 +834,9 @@ html_text_get_line_offset (HTMLText *text, HTMLPainter *painter, gint offset)
if (*s == '\t')
line_offset += 8 - (line_offset % 8);
else
- line_offset ++;
+ line_offset++;
s = g_utf8_next_char (s);
- offset --;
+ offset--;
}
}
}
@@ -853,7 +853,7 @@ html_text_get_item_index (HTMLText *text, HTMLPainter *painter, gint offset, gin
if (pi->n > 0) {
while (idx < pi->n - 1 && offset >= pi->entries [idx].glyph_item.item->num_chars) {
offset -= pi->entries [idx].glyph_item.item->num_chars;
- idx ++;
+ idx++;
}
*item_offset = offset;
@@ -988,9 +988,9 @@ html_text_calc_part_width (HTMLText *text, HTMLPainter *painter, gchar *start, g
line_offset += skip;
} else {
width += pi->entries [idx].widths [offset];
- line_offset ++;
+ line_offset++;
}
- len --;
+ len--;
old_idx = idx;
if (html_text_pi_forward (pi, &idx, &offset) && idx != old_idx)
@@ -1139,7 +1139,7 @@ gint
html_text_pango_info_get_index (HTMLTextPangoInfo *pi, gint byte_offset, gint idx)
{
while (idx < pi->n && pi->entries [idx].glyph_item.item->offset + pi->entries [idx].glyph_item.item->length <= byte_offset)
- idx ++;
+ idx++;
return idx;
}
@@ -1165,7 +1165,7 @@ html_text_remove_unwanted_line_breaks (gchar *s, gint len, PangoLogAttr *attrs)
gint i;
gunichar last_uc = 0;
- for (i = 0; i < len; i ++) {
+ for (i = 0; i < len; i++) {
gunichar uc = g_utf8_get_char (s);
if (attrs [i].is_line_break) {
@@ -1435,10 +1435,10 @@ html_text_get_pango_info (HTMLText *text, HTMLPainter *painter)
if (text->pi && text->pi->attrs)
html_text_remove_unwanted_line_breaks (text->text, text->text_len, text->pi->attrs);
- for (i = 0, cur = items; i < text->pi->n; i ++, cur = cur->next)
+ for (i = 0, cur = items; i < text->pi->n; i++, cur = cur->next)
text->pi->entries [i].glyph_item.item = (PangoItem *) cur->data;
- for (i = 0; i < text->pi->n; i ++) {
+ for (i = 0; i < text->pi->n; i++) {
PangoItem *item;
PangoGlyphString *glyphs;
@@ -1513,23 +1513,23 @@ html_text_tail_white_space (HTMLText *text, HTMLPainter *painter, gint offset, g
if (html_text_pi_backward (pi, &ii, &io)) {
s = g_utf8_prev_char (s);
- offset --;
+ offset--;
if (pi->attrs [offset].is_white) {
if (*s == '\t' && offset > 1) {
gint skip = 8, co = offset - 1;
do {
s = g_utf8_prev_char (s);
- co --;
+ co--;
if (*s != '\t')
- skip --;
+ skip--;
} while (s && co > 0 && *s != '\t');
ww += skip*pi->entries [ii].widths [io];
} else {
ww += pi->entries [ii].widths [io];
}
- wl ++;
+ wl++;
}
}
@@ -1580,11 +1580,11 @@ calc_min_width (HTMLObject *self, HTMLPainter *painter)
line_offset += skip;
} else {
ww += pi->entries [ii].widths [io];
- line_offset ++;
+ line_offset++;
}
s = g_utf8_next_char (s);
- offset ++;
+ offset++;
html_text_pi_forward (pi, &ii, &io);
}
@@ -1923,7 +1923,7 @@ is_convert_nbsp_needed (const gchar *s, gint *delta_out, GSList **changes_out)
if (uc == ENTITY_NBSP || uc == ' ') {
change = check_prev_white (white_space, last_white, delta_out);
- white_space ++;
+ white_space++;
last_white = uc;
} else {
change = check_last_white (white_space, last_white, delta_out);
@@ -1991,7 +1991,7 @@ convert_nbsp (gchar *fill, const gchar *text)
if (uc == ENTITY_NBSP || uc == ' ') {
write_prev_white_space (white_space, &fill);
- white_space ++;
+ white_space++;
} else {
write_last_white_space (white_space, &fill);
white_space = 0;
@@ -2340,12 +2340,12 @@ select_range (HTMLObject *self,
/* extend to cursor positions */
while (offset > 0 && !pi->attrs [offset].is_cursor_position) {
- offset --;
- length ++;
+ offset--;
+ length++;
}
while (offset + length < text->text_len && !pi->attrs [offset + length].is_cursor_position)
- length ++;
+ length++;
/* printf ("updated offset: %d length: %d (end offset %d)\n", offset, length, offset + length); */
diff --git a/gtkhtml/htmltextslave.c b/gtkhtml/htmltextslave.c
index bbfa7d3..7c075ff 100644
--- a/gtkhtml/htmltextslave.c
+++ b/gtkhtml/htmltextslave.c
@@ -319,8 +319,8 @@ html_text_slave_remove_leading_space (HTMLTextSlave *slave, HTMLPainter *painter
if (*begin == ' ' && could_remove_leading_space (slave, lineBegin)) {
begin = g_utf8_next_char (begin);
slave->charStart = begin;
- slave->posStart ++;
- slave->posLen --;
+ slave->posStart++;
+ slave->posLen--;
}
return begin;
@@ -419,13 +419,13 @@ hts_fit_line (HTMLObject *o, HTMLPainter *painter,
= skip*html_painter_get_space_width (painter, font_style, face) * PANGO_SCALE;
line_offset += skip;
} else {
- line_offset ++;
+ line_offset++;
}
w += pi->entries [ii].widths [io];
html_text_pi_forward (pi, &ii, &io);
s = g_utf8_next_char (s);
- offset ++;
+ offset++;
}
if (offset == slave->posStart + slave->posLen && (widthLeft >= w || force_fit)) {
@@ -524,7 +524,7 @@ reorder_glyph_items (GSList *glyph_items, gint n_items)
return NULL;
tmp_list = glyph_items;
- for (i = 0; i < n_items; i ++) {
+ for (i = 0; i < n_items; i++) {
HTMLTextSlaveGlyphItem *gi = tmp_list->data;
min_level = MIN (min_level, gi->glyph_item.item->analysis.level);
@@ -535,7 +535,7 @@ reorder_glyph_items (GSList *glyph_items, gint n_items)
level_start_i = 0;
level_start_node = glyph_items;
tmp_list = glyph_items;
- for (i = 0; i < n_items; i ++) {
+ for (i = 0; i < n_items; i++) {
HTMLTextSlaveGlyphItem *gi= tmp_list->data;
if (gi->glyph_item.item->analysis.level == min_level) {
@@ -577,7 +577,7 @@ get_glyph_items_in_range (HTMLTextSlave *slave, HTMLPainter *painter, gint start
start_offset += slave->posStart;
end_offset = start_offset + len;
- for (offset = 0, i = 0; i < pi->n; i ++) {
+ for (offset = 0, i = 0; i < pi->n; i++) {
PangoItem *item = pi->entries [i].glyph_item.item;
/* do item and slave overlap? */
@@ -637,7 +637,7 @@ get_glyph_items_in_range (HTMLTextSlave *slave, HTMLPainter *painter, gint start
}
glyph_items = g_slist_prepend (glyph_items, glyph_item);
- n_items ++;
+ n_items++;
}
if (offset + item->num_chars >= end_offset)
@@ -975,16 +975,16 @@ calc_offset (HTMLTextSlave *slave, HTMLPainter *painter, gint x)
if (item->analysis.level % 2 == 0) {
/* LTR */
- for (i = 0; i < item->num_chars; i ++) {
+ for (i = 0; i < item->num_chars; i++) {
if (x < html_painter_pango_to_engine (painter, width + gi->widths [i] / 2))
goto done;
width += gi->widths [i];
}
} else {
/* RTL */
- for (i = item->num_chars - 1; i >= 0; i --) {
+ for (i = item->num_chars - 1; i >= 0; i--) {
if (x < html_painter_pango_to_engine (painter, width + gi->widths [i] / 2)) {
- i ++;
+ i++;
goto done;
}
width += gi->widths [i];
@@ -1263,16 +1263,16 @@ html_text_slave_cursor_right_one (HTMLTextSlave *slave, HTMLPainter *painter, HT
if (gi->glyph_item.item->analysis.level % 2 == 0) {
/* LTR */
if (index < gi->glyph_item.item->offset + gi->glyph_item.item->length) {
- cursor->offset ++;
- cursor->position ++;
+ cursor->offset++;
+ cursor->position++;
return TRUE;
}
} else {
/* RTL */
if (index > gi->glyph_item.item->offset && index <= gi->glyph_item.item->offset + gi->glyph_item.item->length) {
- cursor->offset --;
- cursor->position --;
+ cursor->offset--;
+ cursor->position--;
return TRUE;
}
@@ -1282,12 +1282,12 @@ html_text_slave_cursor_right_one (HTMLTextSlave *slave, HTMLPainter *painter, HT
if (html_text_slave_gi_left_edge (slave, cursor, next)) {
if (next->glyph_item.item->analysis.level % 2 == 0) {
/* LTR */
- cursor->offset ++;
- cursor->position ++;
+ cursor->offset++;
+ cursor->position++;
} else {
/* RTL */
- cursor->offset --;
- cursor->position --;
+ cursor->offset--;
+ cursor->position--;
}
return TRUE;
@@ -1326,16 +1326,16 @@ html_text_slave_cursor_left_one (HTMLTextSlave *slave, HTMLPainter *painter, HTM
if (gi->glyph_item.item->analysis.level % 2 == 0) {
/* LTR */
if (index - gi->glyph_item.item->offset > 1 || (!prev && !prev_obj && index - gi->glyph_item.item->offset > 0)) {
- cursor->offset --;
- cursor->position --;
+ cursor->offset--;
+ cursor->position--;
return TRUE;
}
} else {
/* RTL */
if (index < gi->glyph_item.item->offset + gi->glyph_item.item->length) {
- cursor->offset ++;
- cursor->position ++;
+ cursor->offset++;
+ cursor->position++;
return TRUE;
}
@@ -1346,13 +1346,13 @@ html_text_slave_cursor_left_one (HTMLTextSlave *slave, HTMLPainter *painter, HTM
if (prev->glyph_item.item->analysis.level % 2 == 0) {
/* LTR */
if (index - gi->glyph_item.item->offset == 0) {
- cursor->offset --;
- cursor->position --;
+ cursor->offset--;
+ cursor->position--;
}
} else {
/* RTL */
- cursor->offset ++;
- cursor->position ++;
+ cursor->offset++;
+ cursor->position++;
}
return TRUE;
diff --git a/gtkhtml/htmltokenizer.c b/gtkhtml/htmltokenizer.c
index 192e438..089cbd4 100644
--- a/gtkhtml/htmltokenizer.c
+++ b/gtkhtml/htmltokenizer.c
@@ -366,7 +366,7 @@ html_token_buffer_append_token (HTMLTokenBuffer * buf, const gchar *token, gint
strncpy (buf->data + buf->used, token, len);
buf->used += len;
buf->data [buf->used] = 0;
- buf->used ++;
+ buf->used++;
dt(printf ("html_token_buffer_append_token: '%s'\n", buf->data + buf->used - 1 - len));
@@ -465,7 +465,7 @@ html_tokenizer_convert_entity (gchar *token)
/*value to add*/
gunichar value = INVALID_ENTITY_CHARACTER_MARKER;
/*skip not needed &*/
- read_pos ++;
+ read_pos++;
count_chars = strcspn (read_pos, ";");
if (count_chars < 14 && count_chars > 1) {
/*save for recovery*/
@@ -532,10 +532,10 @@ convert_text_encoding (const GIConv iconv_cd,
if (currlength > 0) {
g_warning ("IconvError=%s", current);
*newbuffer = INVALID_ENTITY_CHARACTER_MARKER;
- newbuffer ++;
- current ++;
- currlength --;
- newlength --;
+ newbuffer++;
+ current++;
+ currlength--;
+ newlength--;
}
}
returnbuffer[oldlength - newlength] = '\0';
@@ -857,7 +857,7 @@ add_char (HTMLTokenizer *t, gchar c)
if (c!='\0')
{
*(p->dest) = c;
- p->dest ++;
+ p->dest++;
*(p->dest) = 0;
}
}
@@ -963,7 +963,7 @@ in_comment (HTMLTokenizer *t, const gchar **src)
p->searchExtensionEndCount = 0;
p->searchGtkHTMLCount = 0;
} else
- p->searchGtkHTMLCount ++;
+ p->searchGtkHTMLCount++;
} else {
p->searchGtkHTMLCount = 0;
if (p->searchCount < 2)
@@ -991,7 +991,7 @@ in_extension (HTMLTokenizer *t, const gchar **src)
/* check for "-->" */
if (!p->tquote && **src == '-') {
if (p->searchExtensionEndCount < 2)
- p->searchExtensionEndCount ++;
+ p->searchExtensionEndCount++;
(*src) ++;
} else if (!p->tquote && p->searchExtensionEndCount == 2 && **src == '>') {
p->extension = FALSE;
@@ -1003,7 +1003,7 @@ in_extension (HTMLTokenizer *t, const gchar **src)
while (p->searchExtensionEndCount) {
extension_one_char (t, &c);
- p->searchExtensionEndCount --;
+ p->searchExtensionEndCount--;
}
}
}
diff --git a/gtkhtml/htmlundo.c b/gtkhtml/htmlundo.c
index 7f9180e..8540ac4 100644
--- a/gtkhtml/htmlundo.c
+++ b/gtkhtml/htmlundo.c
@@ -163,7 +163,7 @@ action_do_and_destroy_undo (HTMLEngine *engine, HTMLUndo *undo, HTMLUndoDirectio
undo->undo.stack = g_list_remove (first, first->data);
if (undo->level == 0) {
undo->undo_used.stack = g_list_prepend (undo->undo_used.stack, action);
- undo->step_counter --;
+ undo->step_counter--;
html_engine_emit_undo_changed (engine);
}
@@ -186,10 +186,10 @@ html_undo_do_undo (HTMLUndo *undo,
DEBUG (undo);
}
#endif
- engine->block_events ++;
+ engine->block_events++;
action_do_and_destroy_undo (engine, undo, HTML_UNDO_UNDO);
undo->undo.size--;
- engine->block_events --;
+ engine->block_events--;
#ifdef UNDO_DEBUG
if (!undo->level) {
DEBUG (undo);
@@ -216,12 +216,12 @@ html_undo_do_redo (HTMLUndo *undo,
DEBUG (undo);
}
#endif
- undo->in_redo ++;
- engine->block_events ++;
+ undo->in_redo++;
+ engine->block_events++;
action_do_and_destroy_redo (engine, undo, &undo->redo.stack, HTML_UNDO_REDO);
undo->redo.size--;
- engine->block_events --;
- undo->in_redo --;
+ engine->block_events--;
+ undo->in_redo--;
#ifdef UNDO_DEBUG
if (!undo->level) {
@@ -278,13 +278,13 @@ html_undo_add_undo_action (HTMLUndo *undo, HTMLEngine *engine, HTMLUndoAction *
undo->undo.size--;
}
- undo->step_counter ++;
+ undo->step_counter++;
html_engine_emit_undo_changed (engine);
}
undo->undo.stack = g_list_prepend (undo->undo.stack, action);
- undo->undo.size ++;
+ undo->undo.size++;
#ifdef UNDO_DEBUG
if (!undo->level) {
@@ -305,7 +305,7 @@ html_undo_add_redo_action (HTMLUndo *undo,
return;
undo->redo.stack = g_list_prepend (undo->redo.stack, action);
- undo->redo.size ++;
+ undo->redo.size++;
}
void
@@ -323,13 +323,13 @@ html_undo_add_action (HTMLUndo *undo, HTMLEngine *engine, HTMLUndoAction *actio
void
html_undo_freeze (HTMLUndo *undo)
{
- undo->freeze_count ++;
+ undo->freeze_count++;
}
void
html_undo_thaw (HTMLUndo *undo)
{
- undo->freeze_count --;
+ undo->freeze_count--;
}
/*
@@ -405,7 +405,7 @@ html_undo_level_begin (HTMLUndo *undo, const gchar *undo_desription, const gchar
undo->undo.stack = NULL;
undo->undo.size = 0;
- undo->level ++;
+ undo->level++;
}
static void
@@ -416,7 +416,7 @@ redo_level_begin (HTMLUndo *undo, const gchar *redo_desription, const gchar *und
undo->redo.stack = NULL;
undo->redo.size = 0;
- undo->level ++;
+ undo->level++;
}
static void
@@ -428,7 +428,7 @@ redo_level_end (HTMLUndo *undo)
g_assert (undo->redo_levels);
- undo->level --;
+ undo->level--;
/* preserve current redo stack */
stack_copy (&undo->redo, &save_redo);
@@ -532,14 +532,14 @@ undo_step_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection dir, guin
/* set this level */
stack_dup (&level->stack, stack);
- undo->level ++;
+ undo->level++;
if (dir == HTML_UNDO_UNDO)
while (undo->undo.size)
html_undo_do_undo (undo, e);
else
while (undo->redo.size)
html_undo_do_redo (undo, e);
- undo->level --;
+ undo->level--;
/* restore current undo/redo stack */
stack_copy (&save, stack);
@@ -563,7 +563,7 @@ html_undo_data_ref (HTMLUndoData *data)
{
g_assert (data);
- data->ref_count ++;
+ data->ref_count++;
}
void
@@ -572,7 +572,7 @@ html_undo_data_unref (HTMLUndoData *data)
g_assert (data);
g_assert (data->ref_count > 0);
- data->ref_count --;
+ data->ref_count--;
if (data->ref_count == 0) {
if (data->destroy)
diff --git a/gtkhtml/test-stress.c b/gtkhtml/test-stress.c
index 2c7ca81..5e8d4c0 100644
--- a/gtkhtml/test-stress.c
+++ b/gtkhtml/test-stress.c
@@ -85,11 +85,11 @@ static gint test_level_1 (GtkHTML *html)
srand (2);
- for (i = 0; i < 200; i ++) {
+ for (i = 0; i < 200; i++) {
gint j, len = 1 + (gint) (10.0*rand()/(RAND_MAX+1.0));
gchar word [12];
- for (j = 0; j < len; j ++)
+ for (j = 0; j < len; j++)
word [j] = 'a' + (gint) (26.0*rand()/(RAND_MAX+1.0));
word [len] = ' ';
word [len + 1] = 0;
@@ -104,7 +104,7 @@ static gint test_level_1 (GtkHTML *html)
if (html->engine->cursor->position != 0 || html->engine->cursor->offset != 0)
return FALSE;
- for (i = 0; i < 1000; i ++) {
+ for (i = 0; i < 1000; i++) {
gint j, new_pos, pos, len;
len = 1 + (gint) (120.0*rand()/(RAND_MAX+1.0));
@@ -130,7 +130,7 @@ static gint test_level_1 (GtkHTML *html)
/* insert text */
printf ("insert text\n");
html_cursor_jump_to_position (html->engine->cursor, html->engine, pos);
- for (j = 0; j < len; j ++) {
+ for (j = 0; j < len; j++) {
gint et = (gint) (10.0*rand()/(RAND_MAX+1.0));
if (et == 0)
gtk_html_command (html, "insert-tab");
@@ -159,14 +159,14 @@ static gint test_level_1 (GtkHTML *html)
case 3:
/* undo */
printf ("undo\n");
- for (j = 0; j < len; j ++) {
+ for (j = 0; j < len; j++) {
html_engine_undo (html->engine);
}
break;
case 4:
/* redo */
printf ("redo\n");
- for (j = 0; j < len; j ++) {
+ for (j = 0; j < len; j++) {
html_engine_redo (html->engine);
}
break;
@@ -186,14 +186,14 @@ static gint test_level_1 (GtkHTML *html)
case 6:
/* left */
printf ("left\n");
- for (j = 0; j < 5*len; j ++) {
+ for (j = 0; j < 5*len; j++) {
html_cursor_left (html->engine->cursor, html->engine);
}
break;
case 7:
/* right */
printf ("right\n");
- for (j = 0; j < 5*len; j ++) {
+ for (j = 0; j < 5*len; j++) {
html_cursor_right (html->engine->cursor, html->engine);
}
break;
@@ -254,19 +254,19 @@ gint main (gint argc, gchar *argv[])
fprintf (stderr, "\nGtkHTML test suite\n");
fprintf (stderr, "--------------------------------------------------------------------------------\n");
- for (i = 0; tests [i].name; i ++) {
+ for (i = 0; tests [i].name; i++) {
gint j, result;
if (tests [i].test_function) {
fprintf (stderr, " %s ", tests [i].name);
- for (j = strlen (tests [i].name); j < 69; j ++)
+ for (j = strlen (tests [i].name); j < 69; j++)
fputc ('.', stderr);
result = (*tests [i].test_function) (html);
fprintf (stderr, " %s\n", result ? "passed" : "failed");
- n_all ++;
+ n_all++;
if (result)
- n_successful ++;
+ n_successful++;
} else {
fprintf (stderr, "* %s\n", tests [i].name);
}
diff --git a/gtkhtml/test-suite.c b/gtkhtml/test-suite.c
index 23bd3d4..f2f5f31 100644
--- a/gtkhtml/test-suite.c
+++ b/gtkhtml/test-suite.c
@@ -748,19 +748,19 @@ gint main (gint argc, gchar *argv[])
fprintf (stderr, "\nGtkHTML test suite\n");
fprintf (stderr, "--------------------------------------------------------------------------------\n");
- for (i = 0; tests [i].name; i ++) {
+ for (i = 0; tests [i].name; i++) {
gint j, result;
if (tests [i].test_function) {
fprintf (stderr, " %s ", tests [i].name);
- for (j = strlen (tests [i].name); j < 69; j ++)
+ for (j = strlen (tests [i].name); j < 69; j++)
fputc ('.', stderr);
result = (*tests [i].test_function) (html);
fprintf (stderr, " %s\n", result ? "passed" : "failed");
- n_all ++;
+ n_all++;
if (result)
- n_successful ++;
+ n_successful++;
} else {
fprintf (stderr, "* %s\n", tests [i].name);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
