various code style fixes

This commit is contained in:
Maxime Coste 2013-01-04 18:39:13 +01:00
parent b5418c94ca
commit 4b649d386c
12 changed files with 74 additions and 75 deletions

View File

@ -551,7 +551,6 @@ void exec_string(const CommandParameters& params, Context& context)
keys.insert(keys.end(), param_keys.begin(), param_keys.end()); keys.insert(keys.end(), param_keys.begin(), param_keys.end());
} }
Context& keys_context = parser.has_option("client") ? Context& keys_context = parser.has_option("client") ?
ClientManager::instance().get_client_context(parser.option_value("client")) ClientManager::instance().get_client_context(parser.option_value("client"))
: context; : context;

View File

@ -271,10 +271,10 @@ void highlight_selections(Window& window, DisplayBuffer& display_buffer)
const BufferIterator& last = sel.last(); const BufferIterator& last = sel.last();
highlight_range(display_buffer, last, utf8::next(last), false, highlight_range(display_buffer, last, utf8::next(last), false,
[](DisplayAtom& atom) { atom.attribute |= Attributes::Reverse; atom.attribute &= ~Attributes::Underline; }); [](DisplayAtom& atom) { atom.attribute |= Attributes::Reverse;
atom.attribute &= ~Attributes::Underline; });
} }
const Selection& back = window.selections().back(); const Selection& back = window.selections().back();
const BufferIterator& last = back.last();
highlight_range(display_buffer, back.begin(), back.end(), false, highlight_range(display_buffer, back.begin(), back.end(), false,
[](DisplayAtom& atom) { atom.attribute |= Attributes::Bold; }); [](DisplayAtom& atom) { atom.attribute |= Attributes::Bold; });
} }

View File

@ -126,8 +126,8 @@ void do_pipe(Context& context)
Editor& editor = context.editor(); Editor& editor = context.editor();
std::vector<String> strings; std::vector<String> strings;
for (auto& sel : const_cast<const Editor&>(context.editor()).selections()) for (auto& sel : context.editor().selections())
strings.push_back(ShellManager::instance().pipe(String(sel.begin(), sel.end()), strings.push_back(ShellManager::instance().pipe({sel.begin(), sel.end()},
cmdline, context, {}, {})); cmdline, context, {}, {}));
editor.insert(strings, InsertMode::Replace); editor.insert(strings, InsertMode::Replace);
}, context); }, context);