diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-12-28 22:51:43 +0100 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-12-28 22:51:43 +0100 |
commit | 1998b8d35478205118cea5cc215c682b235434f1 (patch) | |
tree | 7a0f04f8b52843d9cbdb622d476a90604c48ff7a /akonadish/akonadish_utils.h | |
parent | ac0e1de3a3895b0e62231364499a2c3327fd74f0 (diff) | |
parent | cc5363fe4b0cd4ea95ac98d9d37f2028fe226145 (diff) | |
download | sink-1998b8d35478205118cea5cc215c682b235434f1.tar.gz sink-1998b8d35478205118cea5cc215c682b235434f1.zip |
Merge branch 'develop' of git://anongit.kde.org/akonadi-next into develop
Diffstat (limited to 'akonadish/akonadish_utils.h')
-rw-r--r-- | akonadish/akonadish_utils.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/akonadish/akonadish_utils.h b/akonadish/akonadish_utils.h index 17b8ec7..5dd24f1 100644 --- a/akonadish/akonadish_utils.h +++ b/akonadish/akonadish_utils.h | |||
@@ -26,6 +26,8 @@ | |||
26 | #include "common/query.h" | 26 | #include "common/query.h" |
27 | #include "common/clientapi.h" | 27 | #include "common/clientapi.h" |
28 | 28 | ||
29 | #include "state.h" | ||
30 | |||
29 | namespace AkonadishUtils | 31 | namespace AkonadishUtils |
30 | { | 32 | { |
31 | 33 | ||
@@ -34,6 +36,10 @@ class StoreBase; | |||
34 | bool isValidStoreType(const QString &type); | 36 | bool isValidStoreType(const QString &type); |
35 | StoreBase &getStore(const QString &type); | 37 | StoreBase &getStore(const QString &type); |
36 | QSharedPointer<QAbstractItemModel> loadModel(const QString &type, Akonadi2::Query query); | 38 | QSharedPointer<QAbstractItemModel> loadModel(const QString &type, Akonadi2::Query query); |
39 | QStringList resourceIds(); | ||
40 | QStringList resourceCompleter(const QStringList &, const QString &fragment, State &state); | ||
41 | QStringList resourceOrTypeCompleter(const QStringList &commands, const QString &fragment, State &state); | ||
42 | QStringList typeCompleter(const QStringList &commands, const QString &fragment, State &state); | ||
37 | QMap<QString, QString> keyValueMapFromArgs(const QStringList &args); | 43 | QMap<QString, QString> keyValueMapFromArgs(const QStringList &args); |
38 | 44 | ||
39 | /** | 45 | /** |