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

Removed use of deprecated boost::property_tree::get_child

merge-requests/413/merge
eidheim 2 years ago
parent
284cc068ff
commit
0889806b52
1 changed files with 48 additions and 44 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. 92
      src/source.cpp

92
src/source.cpp
Unescape View File

@ -1193,57 +1193,61 @@ void Source::View::setup_format_style(bool is_generic_view) {
try { try {
boost::property_tree::ptree pt; boost::property_tree::ptree pt;
boost::property_tree::xml_parser::read_xml(stdout_stream, pt); boost::property_tree::xml_parser::read_xml(stdout_stream, pt);
auto replacements_pt = pt.get_child("replacements", boost::property_tree::ptree()); for(auto it_root = pt.begin(); it_root != pt.end(); ++it_root) {
for(auto it = replacements_pt.rbegin(); it != replacements_pt.rend(); ++it) { if(it_root->first == "replacements") {
if(it->first == "replacement") { for(auto it = it_root->second.rbegin(); it != it_root->second.rend(); ++it) {
auto offset = it->second.get<size_t>("<xmlattr>.offset"); if(it->first == "replacement") {
auto length = it->second.get<size_t>("<xmlattr>.length"); auto offset = it->second.get<size_t>("<xmlattr>.offset");
auto replacement_str = it->second.get<std::string>(""); auto length = it->second.get<size_t>("<xmlattr>.length");
auto replacement_str = it->second.get<std::string>("");
size_t bytes = 0;
for(size_t c = 0; c < bytes_in_lines.size(); ++c) { size_t bytes = 0;
auto previous_bytes = bytes; for(size_t c = 0; c < bytes_in_lines.size(); ++c) {
bytes += bytes_in_lines[c]; auto previous_bytes = bytes;
if(offset < bytes || (c == bytes_in_lines.size() - 1 && offset == bytes)) { bytes += bytes_in_lines[c];
std::pair<size_t, size_t> line_index(c, offset - previous_bytes); if(offset < bytes || (c == bytes_in_lines.size() - 1 && offset == bytes)) {
auto start = get_buffer()->get_iter_at_line_index(line_index.first, line_index.second); std::pair<size_t, size_t> line_index(c, offset - previous_bytes);
auto start = get_buffer()->get_iter_at_line_index(line_index.first, line_index.second);
// Use left gravity insert to avoid moving cursor from end of line
bool left_gravity_insert = false; // Use left gravity insert to avoid moving cursor from end of line
if(get_buffer()->get_insert()->get_iter() == start) { bool left_gravity_insert = false;
auto iter = start; if(get_buffer()->get_insert()->get_iter() == start) {
do { auto iter = start;
if(*iter != ' ' && *iter != '\t') { do {
left_gravity_insert = iter.ends_line(); if(*iter != ' ' && *iter != '\t') {
break; left_gravity_insert = iter.ends_line();
break;
}
} while(iter.forward_char());
} }
} while(iter.forward_char());
}
if(length > 0) { if(length > 0) {
auto offset_end = offset + length; auto offset_end = offset + length;
size_t bytes = 0; size_t bytes = 0;
for(size_t c = 0; c < bytes_in_lines.size(); ++c) { for(size_t c = 0; c < bytes_in_lines.size(); ++c) {
auto previous_bytes = bytes; auto previous_bytes = bytes;
bytes += bytes_in_lines[c]; bytes += bytes_in_lines[c];
if(offset_end < bytes || (c == bytes_in_lines.size() - 1 && offset_end == bytes)) { if(offset_end < bytes || (c == bytes_in_lines.size() - 1 && offset_end == bytes)) {
auto end = get_buffer()->get_iter_at_line_index(c, offset_end - previous_bytes); auto end = get_buffer()->get_iter_at_line_index(c, offset_end - previous_bytes);
get_buffer()->erase(start, end); get_buffer()->erase(start, end);
start = get_buffer()->get_iter_at_line_index(line_index.first, line_index.second); start = get_buffer()->get_iter_at_line_index(line_index.first, line_index.second);
break; break;
}
}
}
if(left_gravity_insert) {
Mark mark(start);
get_buffer()->insert(start, replacement_str);
get_buffer()->place_cursor(mark->get_iter());
} }
else
get_buffer()->insert(start, replacement_str);
break;
} }
} }
if(left_gravity_insert) {
Mark mark(start);
get_buffer()->insert(start, replacement_str);
get_buffer()->place_cursor(mark->get_iter());
}
else
get_buffer()->insert(start, replacement_str);
break;
} }
} }
break;
} }
} }
} }

Write Preview
Loading…
Cancel
Save