summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulb23 <p_batty@hotmail.co.uk>2016-04-05 14:30:00 +0100
committerPaulb23 <p_batty@hotmail.co.uk>2016-04-05 14:30:00 +0100
commit971c3be52deddb163e90f17126d462e4f3900799 (patch)
tree8cab8c6ca34553611090ab8195a5c3a121ce5dde
parent15f43149e179f754f48b59ac08002d5c4c0a5bc0 (diff)
Fixed 'complex' typo in method name
-rw-r--r--scene/gui/text_edit.cpp24
-rw-r--r--scene/gui/text_edit.h4
2 files changed, 14 insertions, 14 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 3524cd5b0d..425a88fc0e 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -1132,7 +1132,7 @@ void TextEdit::_consume_pair_symbol(CharType ch) {
int new_column,new_line;
- _begin_compex_operation();
+ _begin_complex_operation();
_insert_text(get_selection_from_line(), get_selection_from_column(),
ch_single,
&new_line, &new_column);
@@ -1145,7 +1145,7 @@ void TextEdit::_consume_pair_symbol(CharType ch) {
get_selection_to_column() + to_col_offset,
ch_single_pair,
&new_line,&new_column);
- _end_compex_operation();
+ _end_complex_operation();
cursor_set_line(get_selection_to_line());
cursor_set_column(get_selection_to_column() + to_col_offset);
@@ -1599,7 +1599,7 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
// remove the old character if in insert mode
if (insert_mode) {
- _begin_compex_operation();
+ _begin_complex_operation();
// make sure we don't try and remove empty space
if (cursor.column < get_line(cursor.line).length()) {
@@ -1610,7 +1610,7 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
_insert_text_at_cursor(chr);
if (insert_mode) {
- _end_compex_operation();
+ _end_complex_operation();
}
}
}
@@ -1686,10 +1686,10 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
cursor_set_line(selection.from_line);
cursor_set_column(selection.from_column);
- _begin_compex_operation();
+ _begin_complex_operation();
_remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
_insert_text_at_cursor(txt);
- _end_compex_operation();
+ _end_complex_operation();
selection.active=true;
selection.from_column=sel_column;
selection.from_line=sel_line;
@@ -1747,7 +1747,7 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
}
if (clear) {
- _begin_compex_operation();
+ _begin_complex_operation();
selection.active=false;
update();
_remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
@@ -2396,7 +2396,7 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
// remove the old character if in insert mode and no selection
if (insert_mode && !had_selection) {
- _begin_compex_operation();
+ _begin_complex_operation();
// make sure we don't try and remove empty space
if (cursor.column < get_line(cursor.line).length()) {
@@ -2416,11 +2416,11 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
}
if (insert_mode && !had_selection) {
- _end_compex_operation();
+ _end_complex_operation();
}
if (selection.active != had_selection) {
- _end_compex_operation();
+ _end_complex_operation();
}
accept_event();
} else {
@@ -3613,12 +3613,12 @@ void TextEdit::clear_undo_history() {
}
-void TextEdit::_begin_compex_operation() {
+void TextEdit::_begin_complex_operation() {
_push_current_op();
next_operation_is_complex=true;
}
-void TextEdit::_end_compex_operation() {
+void TextEdit::_end_complex_operation() {
_push_current_op();
ERR_FAIL_COND(undo_stack.size() == 0);
diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h
index 22071640a2..43a24bf3c0 100644
--- a/scene/gui/text_edit.h
+++ b/scene/gui/text_edit.h
@@ -265,8 +265,8 @@ class TextEdit : public Control {
void _cursor_changed_emit();
void _text_changed_emit();
- void _begin_compex_operation();
- void _end_compex_operation();
+ void _begin_complex_operation();
+ void _end_complex_operation();
void _push_current_op();
/* super internal api, undo/redo builds on it */