summaryrefslogtreecommitdiff
path: root/shortcuts
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2013-03-07 17:43:06 +0100
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2013-03-07 17:43:06 +0100
commitc5c588214074a38370c6c447ed1119dba7edc173 (patch)
tree9182b44221e322015bd1d0731e4d48314f9742ef /shortcuts
parent07391b49bd09666c23ab76629eb31968daffaf77 (diff)
parent45048fbb79c09b01561b1aa8c5f51053c0d8c03e (diff)
Merging with trunk
(bzr r3144.3.31)
Diffstat (limited to 'shortcuts')
-rw-r--r--shortcuts/ShortcutHintPrivate.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/shortcuts/ShortcutHintPrivate.cpp b/shortcuts/ShortcutHintPrivate.cpp
index 11e6b2388..8ca036298 100644
--- a/shortcuts/ShortcutHintPrivate.cpp
+++ b/shortcuts/ShortcutHintPrivate.cpp
@@ -35,10 +35,8 @@ namespace impl
std::string GetMetaKey(std::string const& scut)
{
size_t index = scut.find_last_of( ">");
- if (index >= 0)
- return std::string(scut.begin(), scut.begin() + index + 1);
- else
- return "";
+
+ return std::string(scut.begin(), scut.begin() + index + 1);
}
std::string FixShortcutFormat(std::string const& scut)