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/syntaxtree.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/syntaxtree.h')
-rw-r--r-- | akonadish/syntaxtree.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/akonadish/syntaxtree.h b/akonadish/syntaxtree.h index 884a10d..468aad3 100644 --- a/akonadish/syntaxtree.h +++ b/akonadish/syntaxtree.h | |||
@@ -47,7 +47,7 @@ public: | |||
47 | QString help; | 47 | QString help; |
48 | Interactivity interactivity; | 48 | Interactivity interactivity; |
49 | std::function<bool(const QStringList &, State &)> lambda; | 49 | std::function<bool(const QStringList &, State &)> lambda; |
50 | std::function<QStringList(const QStringList &, const QString &)> completer; | 50 | std::function<QStringList(const QStringList &, const QString &, State &state)> completer; |
51 | 51 | ||
52 | QVector<Syntax> children; | 52 | QVector<Syntax> children; |
53 | }; | 53 | }; |
@@ -63,7 +63,7 @@ public: | |||
63 | Syntax::List syntax() const; | 63 | Syntax::List syntax() const; |
64 | Command match(const QStringList &commands) const; | 64 | Command match(const QStringList &commands) const; |
65 | Syntax::List nearestSyntax(const QStringList &words, const QString &fragment) const; | 65 | Syntax::List nearestSyntax(const QStringList &words, const QString &fragment) const; |
66 | 66 | State &state(); | |
67 | bool run(const QStringList &commands); | 67 | bool run(const QStringList &commands); |
68 | 68 | ||
69 | static QStringList tokenize(const QString &text); | 69 | static QStringList tokenize(const QString &text); |