Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

actions: use namespace

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-10-06 18:28:14 +02:00
parent 6709219aac
commit 3bd02f6abf
9 changed files with 633 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bindings.h
View File

@@ -72,9 +72,9 @@ struct Key
/// Represents either single action or chain of actions bound to a certain key
struct Binding
{
typedef std::vector<Action *> ActionChain;
typedef std::vector<Actions::BaseAction *> ActionChain;
Binding(ActionType at) : m_is_single(true), m_action(Action::get(at)) { }
Binding(ActionType at) : m_is_single(true), m_action(Actions::get(at)) { }
Binding(const ActionChain &actions) {
assert(actions.size() > 0);
if (actions.size() == 1) {
@@ -107,7 +107,7 @@ struct Binding
assert(!m_is_single);
return m_chain;
}
Action *action() const {
Actions::BaseAction *action() const {
assert(m_is_single);
return m_action;
}
@@ -115,7 +115,7 @@ struct Binding
private:
bool m_is_single;
union {
Action *m_action;
Actions::BaseAction *m_action;
ActionChain *m_chain;
};
};