From b015ede7cbde5f161d83115d5eef04481f885386 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Sun, 10 Jan 2016 11:18:54 +0100 Subject: use the filter helper in utils, where it moved --- akonadish/akonadish_utils.cpp | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/akonadish/akonadish_utils.cpp b/akonadish/akonadish_utils.cpp index 070d788..140c741 100644 --- a/akonadish/akonadish_utils.cpp +++ b/akonadish/akonadish_utils.cpp @@ -22,6 +22,8 @@ #include "common/clientapi.h" +#include "utils.h" + namespace AkonadishUtils { @@ -98,40 +100,24 @@ QStringList resourceIds(State &state) return resources; } -QStringList filtered(const QStringList &list, const QString &fragment) -{ - if (fragment.isEmpty()) { - return list; - } - - QStringList filtered; - for (auto item: list) { - if (item.startsWith(fragment)) { - filtered << item; - } - } - - return filtered; -} - QStringList resourceCompleter(const QStringList &, const QString &fragment, State &state) { - return filtered(resourceIds(state), fragment); + return Utils::filteredCompletions(resourceIds(state), fragment); } QStringList resourceOrTypeCompleter(const QStringList &commands, const QString &fragment, State &state) { static QStringList types = QStringList() << "resource" << "folder" << "mail" << "event"; if (commands.count() == 1) { - return filtered(s_types, fragment); + return Utils::filteredCompletions(s_types, fragment); } - return filtered(resourceIds(state), fragment); + return Utils::filteredCompletions(resourceIds(state), fragment); } QStringList typeCompleter(const QStringList &commands, const QString &fragment, State &state) { - return filtered(s_types, fragment); + return Utils::filteredCompletions(s_types, fragment); } QMap keyValueMapFromArgs(const QStringList &args) -- cgit v1.2.3