zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Replaced type Gtk::TextBuffer::iterator with Gtk::TextIter

pipelines/235045657
eidheim 6 years ago
parent
816418db40
commit
7aa3f3f323
10 changed files with 22 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/autocomplete.cpp
  2. 2
      src/grep.hpp
  3. 6
      src/notebook.cpp
  4. 2
      src/snippets.cpp
  5. 2
      src/source.cpp
  6. 10
      src/source_base.cpp
  7. 4
      src/source_diff.cpp
  8. 8
      src/source_generic.cpp
  9. 4
      src/source_language_protocol.cpp
  10. 4
      src/source_spellcheck.cpp

2
src/autocomplete.cpp
Unescape View File

@ -20,7 +20,7 @@ Autocomplete::Autocomplete(Gtk::TextView *view, bool &interactive_completion, gu
} }
}); });
view->get_buffer()->signal_mark_set().connect([this](const Gtk::TextBuffer::iterator &iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark> &mark) { view->get_buffer()->signal_mark_set().connect([this](const Gtk::TextIter &iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark> &mark) {
if(mark->get_name() == "insert") if(mark->get_name() == "insert")
stop(); stop();
}); });

2
src/grep.hpp
Unescape View File

@ -21,4 +21,4 @@ public:
boost::filesystem::path project_path; boost::filesystem::path project_path;
std::stringstream output; std::stringstream output;
}; };

6
src/notebook.cpp
Unescape View File

@ -339,7 +339,7 @@ bool Notebook::open(const boost::filesystem::path &file_path_, Position position
cursor_locations.erase(it); cursor_locations.erase(it);
} }
}; };
view->get_buffer()->signal_mark_set().connect([this, view, add_cursor_location](const Gtk::TextBuffer::iterator & /*iter*/, const Glib::RefPtr<Gtk::TextBuffer::Mark> &mark) { view->get_buffer()->signal_mark_set().connect([this, view, add_cursor_location](const Gtk::TextIter & /*iter*/, const Glib::RefPtr<Gtk::TextBuffer::Mark> &mark) {
if(mark->get_name() == "insert") { if(mark->get_name() == "insert") {
if(disable_next_update_cursor_locations) { if(disable_next_update_cursor_locations) {
disable_next_update_cursor_locations = false; disable_next_update_cursor_locations = false;
@ -373,11 +373,11 @@ bool Notebook::open(const boost::filesystem::path &file_path_, Position position
add_cursor_location(iter); add_cursor_location(iter);
} }
}); });
view->get_buffer()->signal_insert().connect([this, view, add_cursor_location](const Gtk::TextBuffer::iterator & /*iter*/, const Glib::ustring & /*text*/, int /*bytes*/) { view->get_buffer()->signal_insert().connect([this, view, add_cursor_location](const Gtk::TextIter & /*iter*/, const Glib::ustring & /*text*/, int /*bytes*/) {
if(current_cursor_location == cursor_locations.end() || current_cursor_location->view != view) if(current_cursor_location == cursor_locations.end() || current_cursor_location->view != view)
add_cursor_location(view->get_buffer()->get_insert()->get_iter()); add_cursor_location(view->get_buffer()->get_insert()->get_iter());
}); });
view->get_buffer()->signal_erase().connect([this, view, add_cursor_location](const Gtk::TextBuffer::iterator & /*start*/, const Gtk::TextBuffer::iterator & /*end*/) { view->get_buffer()->signal_erase().connect([this, view, add_cursor_location](const Gtk::TextIter & /*start*/, const Gtk::TextIter & /*end*/) {
if(current_cursor_location == cursor_locations.end() || current_cursor_location->view != view) if(current_cursor_location == cursor_locations.end() || current_cursor_location->view != view)
add_cursor_location(view->get_buffer()->get_insert()->get_iter()); add_cursor_location(view->get_buffer()->get_insert()->get_iter());

2
src/snippets.cpp
Unescape View File

@ -43,4 +43,4 @@ void Snippets::load() {
catch(const std::exception &e) { catch(const std::exception &e) {
Terminal::get().async_print(std::string("Error: ") + e.what() + "\n", true); Terminal::get().async_print(std::string("Error: ") + e.what() + "\n", true);
} }
} }

2
src/source.cpp
Unescape View File

@ -628,7 +628,7 @@ void Source::View::setup_signals() {
return false; return false;
}); });
get_buffer()->signal_mark_set().connect([this](const Gtk::TextBuffer::iterator &iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark> &mark) { get_buffer()->signal_mark_set().connect([this](const Gtk::TextIter &iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark> &mark) {
auto mark_name = mark->get_name(); auto mark_name = mark->get_name();
if(get_buffer()->get_has_selection() && mark_name == "selection_bound") if(get_buffer()->get_has_selection() && mark_name == "selection_bound")

10
src/source_base.cpp
Unescape View File

@ -181,7 +181,7 @@ Source::BaseView::BaseView(const boost::filesystem::path &file_path, const Glib:
extra_cursor_selection = get_buffer()->create_tag(); extra_cursor_selection = get_buffer()->create_tag();
get_buffer()->signal_mark_set().connect([this](const Gtk::TextBuffer::iterator &iter, const Glib::RefPtr<Gtk::TextBuffer::Mark> &mark) { get_buffer()->signal_mark_set().connect([this](const Gtk::TextIter &iter, const Glib::RefPtr<Gtk::TextBuffer::Mark> &mark) {
if(mark->get_name() == "insert") { if(mark->get_name() == "insert") {
keep_clipboard = false; keep_clipboard = false;
} }
@ -1207,7 +1207,7 @@ void Source::BaseView::setup_extra_cursor_signals() {
auto last_insert = get_buffer()->create_mark(get_buffer()->get_insert()->get_iter(), false); auto last_insert = get_buffer()->create_mark(get_buffer()->get_insert()->get_iter(), false);
auto last_selection_bound = get_buffer()->create_mark(get_buffer()->get_selection_bound()->get_iter(), false); auto last_selection_bound = get_buffer()->create_mark(get_buffer()->get_selection_bound()->get_iter(), false);
get_buffer()->signal_mark_set().connect([this, last_insert, last_selection_bound](const Gtk::TextBuffer::iterator &iter, const Glib::RefPtr<Gtk::TextBuffer::Mark> &mark) mutable { get_buffer()->signal_mark_set().connect([this, last_insert, last_selection_bound](const Gtk::TextIter &iter, const Glib::RefPtr<Gtk::TextBuffer::Mark> &mark) mutable {
auto is_insert = mark->get_name() == "insert"; auto is_insert = mark->get_name() == "insert";
if(is_insert && !keep_snippet_marks) if(is_insert && !keep_snippet_marks)
clear_snippet_marks(); clear_snippet_marks();
@ -1253,7 +1253,7 @@ void Source::BaseView::setup_extra_cursor_signals() {
} }
}); });
get_buffer()->signal_insert().connect([this](const Gtk::TextBuffer::iterator &iter, const Glib::ustring &text, int bytes) { get_buffer()->signal_insert().connect([this](const Gtk::TextIter &iter, const Glib::ustring &text, int bytes) {
if(enable_multiple_cursors && !extra_cursors.empty()) { if(enable_multiple_cursors && !extra_cursors.empty()) {
enable_multiple_cursors = false; enable_multiple_cursors = false;
auto offset = iter.get_offset() - get_buffer()->get_insert()->get_iter().get_offset(); auto offset = iter.get_offset() - get_buffer()->get_insert()->get_iter().get_offset();
@ -1278,7 +1278,7 @@ void Source::BaseView::setup_extra_cursor_signals() {
auto erase_backward_length = std::make_shared<int>(0); auto erase_backward_length = std::make_shared<int>(0);
auto erase_forward_length = std::make_shared<int>(0); auto erase_forward_length = std::make_shared<int>(0);
auto erase_selection = std::make_shared<bool>(false); auto erase_selection = std::make_shared<bool>(false);
get_buffer()->signal_erase().connect([this, erase_backward_length, erase_forward_length, erase_selection](const Gtk::TextBuffer::iterator &iter_start, const Gtk::TextBuffer::iterator &iter_end) { get_buffer()->signal_erase().connect([this, erase_backward_length, erase_forward_length, erase_selection](const Gtk::TextIter &iter_start, const Gtk::TextIter &iter_end) {
if(enable_multiple_cursors && (!extra_cursors.empty())) { if(enable_multiple_cursors && (!extra_cursors.empty())) {
auto insert_offset = get_buffer()->get_insert()->get_iter().get_offset(); auto insert_offset = get_buffer()->get_insert()->get_iter().get_offset();
*erase_backward_length = insert_offset - iter_start.get_offset(); *erase_backward_length = insert_offset - iter_start.get_offset();
@ -1298,7 +1298,7 @@ void Source::BaseView::setup_extra_cursor_signals() {
} }
} }
}, false); }, false);
get_buffer()->signal_erase().connect([this, erase_backward_length, erase_forward_length, erase_selection](const Gtk::TextBuffer::iterator & /*iter_start*/, const Gtk::TextBuffer::iterator & /*iter_end*/) { get_buffer()->signal_erase().connect([this, erase_backward_length, erase_forward_length, erase_selection](const Gtk::TextIter & /*iter_start*/, const Gtk::TextIter & /*iter_end*/) {
if(enable_multiple_cursors && (*erase_backward_length != 0 || *erase_forward_length != 0)) { if(enable_multiple_cursors && (*erase_backward_length != 0 || *erase_forward_length != 0)) {
enable_multiple_cursors = false; enable_multiple_cursors = false;
for(auto &extra_cursor : extra_cursors) { for(auto &extra_cursor : extra_cursors) {

4
src/source_diff.cpp
Unescape View File

@ -118,7 +118,7 @@ void Source::DiffView::configure() {
parse_stop = false; parse_stop = false;
monitor_changed = false; monitor_changed = false;
buffer_insert_connection = get_buffer()->signal_insert().connect([this](const Gtk::TextBuffer::iterator &iter, const Glib::ustring &text, int) { buffer_insert_connection = get_buffer()->signal_insert().connect([this](const Gtk::TextIter &iter, const Glib::ustring &text, int) {
//Do not perform git diff if no newline is added and line is already marked as added //Do not perform git diff if no newline is added and line is already marked as added
if(!iter.starts_line() && iter.has_tag(renderer->tag_added)) { if(!iter.starts_line() && iter.has_tag(renderer->tag_added)) {
bool newline = false; bool newline = false;
@ -147,7 +147,7 @@ void Source::DiffView::configure() {
}, 250); }, 250);
}, false); }, false);
buffer_erase_connection = get_buffer()->signal_erase().connect([this](const Gtk::TextBuffer::iterator &start_iter, const Gtk::TextBuffer::iterator &end_iter) { buffer_erase_connection = get_buffer()->signal_erase().connect([this](const Gtk::TextIter &start_iter, const Gtk::TextIter &end_iter) {
//Do not perform git diff if start_iter and end_iter is at the same line in addition to the line is tagged added //Do not perform git diff if start_iter and end_iter is at the same line in addition to the line is tagged added
if(start_iter.get_line() == end_iter.get_line() && start_iter.has_tag(renderer->tag_added)) if(start_iter.get_line() == end_iter.get_line() && start_iter.has_tag(renderer->tag_added))
return; return;

8
src/source_generic.cpp
Unescape View File

@ -112,7 +112,7 @@ void Source::GenericView::setup_buffer_words() {
} }
// Remove changed word at insert // Remove changed word at insert
get_buffer()->signal_insert().connect([this](const Gtk::TextBuffer::iterator &iter_, const Glib::ustring &text, int bytes) { get_buffer()->signal_insert().connect([this](const Gtk::TextIter &iter_, const Glib::ustring &text, int bytes) {
auto iter = iter_; auto iter = iter_;
if(!is_token_char(*iter)) if(!is_token_char(*iter))
iter.backward_char(); iter.backward_char();
@ -133,7 +133,7 @@ void Source::GenericView::setup_buffer_words() {
}, false); }, false);
// Add all words between start and end of insert // Add all words between start and end of insert
get_buffer()->signal_insert().connect([this](const Gtk::TextBuffer::iterator &iter, const Glib::ustring &text, int bytes) { get_buffer()->signal_insert().connect([this](const Gtk::TextIter &iter, const Glib::ustring &text, int bytes) {
auto start = iter; auto start = iter;
auto end = iter; auto end = iter;
start.backward_chars(text.size()); start.backward_chars(text.size());
@ -151,7 +151,7 @@ void Source::GenericView::setup_buffer_words() {
}); });
// Remove words within text that was removed // Remove words within text that was removed
get_buffer()->signal_erase().connect([this](const Gtk::TextBuffer::iterator &start_, const Gtk::TextBuffer::iterator &end_) { get_buffer()->signal_erase().connect([this](const Gtk::TextIter &start_, const Gtk::TextIter &end_) {
auto start = start_; auto start = start_;
auto end = end_; auto end = end_;
if(!is_token_char(*start)) if(!is_token_char(*start))
@ -171,7 +171,7 @@ void Source::GenericView::setup_buffer_words() {
}, false); }, false);
// Add new word resulting from erased text // Add new word resulting from erased text
get_buffer()->signal_erase().connect([this](const Gtk::TextBuffer::iterator &start_, const Gtk::TextBuffer::iterator & /*end*/) { get_buffer()->signal_erase().connect([this](const Gtk::TextIter &start_, const Gtk::TextIter & /*end*/) {
auto start = start_; auto start = start_;
if(!is_token_char(*start)) if(!is_token_char(*start))
start.backward_char(); start.backward_char();

4
src/source_language_protocol.cpp
Unescape View File

@ -1325,13 +1325,13 @@ Source::Offset Source::LanguageProtocolView::get_declaration(const Gtk::TextIter
void Source::LanguageProtocolView::setup_signals() { void Source::LanguageProtocolView::setup_signals() {
if(capabilities.text_document_sync == LanguageProtocol::Capabilities::TextDocumentSync::incremental) { if(capabilities.text_document_sync == LanguageProtocol::Capabilities::TextDocumentSync::incremental) {
get_buffer()->signal_insert().connect([this](const Gtk::TextBuffer::iterator &start, const Glib::ustring &text_, int bytes) { get_buffer()->signal_insert().connect([this](const Gtk::TextIter &start, const Glib::ustring &text_, int bytes) {
std::string text = text_; std::string text = text_;
escape_text(text); escape_text(text);
client->write_notification("textDocument/didChange", R"("textDocument":{"uri":")" + this->uri + R"(","version":)" + std::to_string(document_version++) + "},\"contentChanges\":[" + R"({"range":{"start":{"line": )" + std::to_string(start.get_line()) + ",\"character\":" + std::to_string(start.get_line_offset()) + R"(},"end":{"line":)" + std::to_string(start.get_line()) + ",\"character\":" + std::to_string(start.get_line_offset()) + R"(}},"text":")" + text + "\"}" + "]"); client->write_notification("textDocument/didChange", R"("textDocument":{"uri":")" + this->uri + R"(","version":)" + std::to_string(document_version++) + "},\"contentChanges\":[" + R"({"range":{"start":{"line": )" + std::to_string(start.get_line()) + ",\"character\":" + std::to_string(start.get_line_offset()) + R"(},"end":{"line":)" + std::to_string(start.get_line()) + ",\"character\":" + std::to_string(start.get_line_offset()) + R"(}},"text":")" + text + "\"}" + "]");
}, false); }, false);
get_buffer()->signal_erase().connect([this](const Gtk::TextBuffer::iterator &start, const Gtk::TextBuffer::iterator &end) { get_buffer()->signal_erase().connect([this](const Gtk::TextIter &start, const Gtk::TextIter &end) {
client->write_notification("textDocument/didChange", R"("textDocument":{"uri":")" + this->uri + R"(","version":)" + std::to_string(document_version++) + "},\"contentChanges\":[" + R"({"range":{"start":{"line": )" + std::to_string(start.get_line()) + ",\"character\":" + std::to_string(start.get_line_offset()) + R"(},"end":{"line":)" + std::to_string(end.get_line()) + ",\"character\":" + std::to_string(end.get_line_offset()) + R"(}},"text":""})" + "]"); client->write_notification("textDocument/didChange", R"("textDocument":{"uri":")" + this->uri + R"(","version":)" + std::to_string(document_version++) + "},\"contentChanges\":[" + R"({"range":{"start":{"line": )" + std::to_string(start.get_line()) + ",\"character\":" + std::to_string(start.get_line_offset()) + R"(},"end":{"line":)" + std::to_string(end.get_line()) + ",\"character\":" + std::to_string(end.get_line_offset()) + R"(}},"text":""})" + "]");
}, false); }, false);
} }

4
src/source_spellcheck.cpp
Unescape View File

@ -144,7 +144,7 @@ Source::SpellCheckView::SpellCheckView(const boost::filesystem::path &file_path,
} }
}, false); }, false);
get_buffer()->signal_mark_set().connect([this](const Gtk::TextBuffer::iterator &iter, const Glib::RefPtr<Gtk::TextBuffer::Mark> &mark) { get_buffer()->signal_mark_set().connect([this](const Gtk::TextIter &iter, const Glib::RefPtr<Gtk::TextBuffer::Mark> &mark) {
if(spellcheck_checker == nullptr) if(spellcheck_checker == nullptr)
return; return;
@ -182,7 +182,7 @@ Source::SpellCheckView::SpellCheckView(const boost::filesystem::path &file_path,
} }
}); });
get_buffer()->signal_mark_set().connect([](const Gtk::TextBuffer::iterator &iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark> &mark) { get_buffer()->signal_mark_set().connect([](const Gtk::TextIter &iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark> &mark) {
if(mark->get_name() == "insert") { if(mark->get_name() == "insert") {
if(SelectionDialog::get()) if(SelectionDialog::get())
SelectionDialog::get()->hide(); SelectionDialog::get()->hide();

Write Preview
Loading…
Cancel
Save