bindings: move some code from .h to .cpp file

master
Andrzej Rybczak 11 years ago
parent 043e309e24
commit 11735b42b3
  1. 24
      src/bindings.cpp
  2. 26
      src/bindings.h

@ -592,3 +592,27 @@ void BindingsConfiguration::generateDefaults()
if (notBound(k = stringToKey("-")))
bind(k, Actions::Type::VolumeDown);
}
const Command *BindingsConfiguration::findCommand(const std::string &name)
{
const Command *ptr = nullptr;
auto it = m_commands.find(name);
if (it != m_commands.end())
ptr = &it->second;
return ptr;
}
BindingsConfiguration::BindingIteratorPair BindingsConfiguration::get(const Key &k)
{
std::pair<BindingIterator, BindingIterator> result;
auto it = m_bindings.find(k);
if (it != m_bindings.end()) {
result.first = it->second.begin();
result.second = it->second.end();
} else {
auto list_end = m_bindings.begin()->second.end();
result.first = list_end;
result.second = list_end;
}
return result;
}

@ -132,31 +132,13 @@ class BindingsConfiguration
public:
typedef BindingsMap::value_type::second_type::iterator BindingIterator;
typedef BindingsMap::value_type::second_type::const_iterator ConstBindingIterator;
typedef std::pair<BindingIterator, BindingIterator> BindingIteratorPair;
bool read(const std::string &file);
void generateDefaults();
const Command *findCommand(const std::string &name) {
const Command *ptr = 0;
auto it = m_commands.find(name);
if (it != m_commands.end())
ptr = &it->second;
return ptr;
}
std::pair<BindingIterator, BindingIterator> get(const Key &k) {
std::pair<BindingIterator, BindingIterator> result;
auto it = m_bindings.find(k);
if (it != m_bindings.end()) {
result.first = it->second.begin();
result.second = it->second.end();
} else {
auto list_end = m_bindings.begin()->second.end();
result.first = list_end;
result.second = list_end;
}
return result;
}
const Command *findCommand(const std::string &name);
BindingIteratorPair get(const Key &k);
BindingsMap::const_iterator begin() const { return m_bindings.begin(); }
BindingsMap::const_iterator end() const { return m_bindings.end(); }

Loading…
Cancel
Save