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

bindings: remove deprecation warnings

Browse Source
This commit is contained in:
Andrzej Rybczak
2016-12-08 01:31:42 +01:00
parent 9926718cf0
commit 612f8c3145
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/bindings.cpp
View File

@@ -40,10 +40,8 @@ NC::Key::Type stringToKey(const std::string &s);
NC::Key::Type stringToSpecialKey(const std::string &s)
{
NC::Key::Type result = NC::Key::None;
if (!s.compare(0, 4, "ctrl") && s.length() == 6 && (s[4] == '_' || s[4] == '-'))
if (!s.compare(0, 4, "ctrl") && s.length() == 6 && s[4] == '-')
{
if (s[4] == '_')
warning("prefix 'ctrl_' is deprecated and will be removed in 0.8, use 'ctrl-' instead.");
if (s[5] >= 'a' && s[5] <= 'z')
result = NC::Key::Ctrl_A + (s[5] - 'a');
else if (s[5] == '[')
@@ -57,22 +55,16 @@ NC::Key::Type stringToSpecialKey(const std::string &s)
else if (s[5] == '_')
result = NC::Key::Ctrl_Underscore;
}
else if (!s.compare(0, 3, "alt") && s.length() > 3 && (s[3] == '_' || s[3] == '-'))
else if (!s.compare(0, 3, "alt") && s.length() > 3 && s[3] == '-')
{
if (s[3] == '_')
warning("prefix 'alt_' is deprecated and will be removed in 0.8, use 'alt-' instead.");
result = NC::Key::Alt | stringToKey(s.substr(4));
}
else if (!s.compare(0, 4, "ctrl") && s.length() > 4 && (s[4] == '_' || s[4] == '-'))
else if (!s.compare(0, 4, "ctrl") && s.length() > 4 && s[4] == '-')
{
if (s[4] == '_')
warning("prefix 'ctrl_' is deprecated and will be removed in 0.8, use 'ctrl-' instead.");
result = NC::Key::Ctrl | stringToKey(s.substr(5));
}
else if (!s.compare(0, 5, "shift") && s.length() > 5 && (s[5] == '_' || s[5] == '-'))
else if (!s.compare(0, 5, "shift") && s.length() > 5 && s[5] == '-')
{
if (s[5] == '_')
warning("prefix 'shift_' is deprecated and will be removed in 0.8, use 'shift-' instead.");
result = NC::Key::Shift | stringToKey(s.substr(6));
}
else if (!s.compare("escape"))
@@ -113,11 +105,6 @@ NC::Key::Type stringToSpecialKey(const std::string &s)
}
else if (!s.compare("backspace"))
result = NC::Key::Backspace;
else if (!s.compare("backspace_2"))
{
warning("'backspace_2' is deprecated and will be removed in 0.8, use 'backspace' instead.");
result = NC::Key::Backspace;
}
return result;
}