From d7e26a524a082c9e0e148bebfcdcb1df5f1444c1 Mon Sep 17 00:00:00 2001 From: eidheim Date: Sat, 10 Aug 2019 19:16:21 +0200 Subject: [PATCH] Removed redundant newline checks --- src/source.cc | 12 ++++++------ src/tooltips.cc | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/source.cc b/src/source.cc index bf12c33..67613e1 100644 --- a/src/source.cc +++ b/src/source.cc @@ -1723,13 +1723,13 @@ void Source::View::place_cursor_at_next_diagnostic() { } bool Source::View::backward_to_code(Gtk::TextIter &iter) { - while((*iter == ' ' || *iter == '\t' || *iter == '\n' || iter.ends_line() || !is_code_iter(iter)) && iter.backward_char()) { + while((*iter == ' ' || *iter == '\t' || iter.ends_line() || !is_code_iter(iter)) && iter.backward_char()) { } return !iter.is_start() || is_code_iter(iter); } bool Source::View::forward_to_code(Gtk::TextIter &iter) { - while((*iter == ' ' || *iter == '\t' || *iter == '\n' || iter.ends_line() || !is_code_iter(iter)) && iter.forward_char()) { + while((*iter == ' ' || *iter == '\t' || iter.ends_line() || !is_code_iter(iter)) && iter.forward_char()) { } return !iter.is_end(); } @@ -2103,9 +2103,9 @@ bool Source::View::on_key_press_event(GdkEventKey *key) { break; if(iter.starts_line()) empty_line = true; - if(empty_line && !iter.ends_line() && *iter != '\n' && *iter != ' ' && *iter != '\t') + if(empty_line && !iter.ends_line() && *iter != ' ' && *iter != '\t') empty_line = false; - if(!text_found && !iter.ends_line() && *iter != '\n' && *iter != ' ' && *iter != '\t') + if(!text_found && !iter.ends_line() && *iter != ' ' && *iter != '\t') text_found = true; if(empty_line && text_found && iter.ends_line()) break; @@ -2132,9 +2132,9 @@ bool Source::View::on_key_press_event(GdkEventKey *key) { break; if(iter.ends_line()) empty_line = true; - if(empty_line && !iter.ends_line() && *iter != '\n' && *iter != ' ' && *iter != '\t') + if(empty_line && !iter.ends_line() && *iter != ' ' && *iter != '\t') empty_line = false; - if(!text_found && !iter.ends_line() && *iter != '\n' && *iter != ' ' && *iter != '\t') + if(!text_found && !iter.ends_line() && *iter != ' ' && *iter != '\t') text_found = true; if(empty_line && text_found && iter.starts_line()) break; diff --git a/src/tooltips.cc b/src/tooltips.cc index 9754215..8859758 100644 --- a/src/tooltips.cc +++ b/src/tooltips.cc @@ -268,7 +268,7 @@ void Tooltip::wrap_lines() { } if(*iter == ' ') last_space = iter; - if(*iter == '\n') { + if(iter.ends_line()) { end = true; iter.forward_char(); break;