#
#
# patch "src/model/Keys.cpp"
#  from [4fc764b9241d0fcdd8745c96a32dc7504ed26565]
#    to [ea0d9c254b9aea58699644b2b0c9745a58fedc58]
# 
# patch "src/model/Keys.h"
#  from [ec91d41ed02623eb0faeb9fa38cf0d58d956f617]
#    to [a9e62309d1c81bfbe903b13ec2b02d36ba2cf47e]
#
============================================================
--- src/model/Keys.cpp	4fc764b9241d0fcdd8745c96a32dc7504ed26565
+++ src/model/Keys.cpp	ea0d9c254b9aea58699644b2b0c9745a58fedc58
@@ -19,36 +19,29 @@
  ***************************************************************************/
  
 #include "Keys.h"
-#include "Monotone.h"
 #include "BasicIOParser.h"
 
 const int Key::Database = 1;
 const int Key::Keystore = 2;
 
-Keys::Keys(QObject *parent) : QAbstractItemModel(parent)
-{
-    mtnDelegate = new MonotoneDelegate(this);
-}
+Keys::Keys(QObject * parent, const QString & db) 
+  : QAbstractItemModel(parent), AutomateCommand(db)
+{}
 
-Keys::~Keys()
-{
-    delete mtnDelegate;
-}
+Keys::~Keys() {}
 
-bool Keys::readKeys()
+void Keys::readKeys()
 {
     keys.clear();
     reset();
     
-    QStringList cmd;
-    cmd << "keys";
-    
-    return mtnDelegate->triggerCommand(cmd);
+    MonotoneTask task(QStringList() << "keys");
+    AutomateCommand::enqueueTask(task);
 }
 
-void Keys::parseOutput()
+void Keys::processTaskResult(const MonotoneTask & task)
 {
-    BasicIOParser parser(AutomateCommand::data);
+    BasicIOParser parser(task.getOutputUtf8());
     I(parser.parse());
     StanzaList list = parser.getStanzas();
     
@@ -143,12 +136,13 @@ void Keys::parseOutput()
     emit keysRead();
 }
 
-int Keys::columnCount(const QModelIndex &parent) const
+int Keys::columnCount(const QModelIndex & parent) const
 {
+    Q_UNUSED(parent);
 	return 5;
 }
 
-QVariant Keys::data(const QModelIndex &index, int role) const
+QVariant Keys::data(const QModelIndex & index, int role) const
 {
 	if (!index.isValid())
 	{
@@ -187,8 +181,9 @@ QString Keys::getLocationString(int loc)
     return str.join(", ");
 }
 
-Qt::ItemFlags Keys::flags(const QModelIndex &index) const
-{    
+Qt::ItemFlags Keys::flags(const QModelIndex & index) const
+{
+    Q_UNUSED(index);
 	return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
 }
 
@@ -208,12 +203,13 @@ QVariant Keys::headerData(int section, Q
     return QVariant();
 }
 
-int Keys::rowCount(const QModelIndex& parent) const
+int Keys::rowCount(const QModelIndex & parent) const
 {
+    Q_UNUSED(parent);
 	return keys.size();
 }
 
-QModelIndex Keys::index(int row, int column, const QModelIndex& parent) const
+QModelIndex Keys::index(int row, int column, const QModelIndex & parent) const
 {
     if (!hasIndex(row, column, parent))
     {
@@ -225,8 +221,9 @@ QModelIndex Keys::index(int row, int col
     return createIndex(row, column, &key);
 }
 
-QModelIndex Keys::parent(const QModelIndex& index) const
+QModelIndex Keys::parent(const QModelIndex & index) const
 {
+    Q_UNUSED(index);
     return QModelIndex();
 }
 
============================================================
--- src/model/Keys.h	ec91d41ed02623eb0faeb9fa38cf0d58d956f617
+++ src/model/Keys.h	a9e62309d1c81bfbe903b13ec2b02d36ba2cf47e
@@ -22,7 +22,6 @@
 #define KEYS_H
 
 #include "AutomateCommand.h"
-#include "MonotoneDelegate.h"
 
 #include <QAbstractItemModel>
 
@@ -42,29 +41,29 @@ public:
 {
     Q_OBJECT
 public:
-    Keys(QObject*);
+    Keys(QObject *, const QString &);
     virtual ~Keys();
      
     // needed Qt Model methods
-    QVariant data(const QModelIndex&, int) const;
-    Qt::ItemFlags flags(const QModelIndex&) const;
+    QVariant data(const QModelIndex &, int) const;
+    Qt::ItemFlags flags(const QModelIndex &) const;
     QVariant headerData(int, Qt::Orientation, int) const;
-    QModelIndex index(int, int, const QModelIndex&) const;
-    QModelIndex parent(const QModelIndex&) const;
-    int rowCount(const QModelIndex&) const;
-    int columnCount(const QModelIndex&) const; 
+    QModelIndex index(int, int, const QModelIndex &) const;
+    QModelIndex parent(const QModelIndex &) const;
+    int rowCount(const QModelIndex &) const;
+    int columnCount(const QModelIndex &) const; 
 
 public slots:
-    bool readKeys();
+    void readKeys();
 
 signals:
     void keysRead();
 
 private:
-    void parseOutput();
+    void processTaskResult(const MonotoneTask &);
     QString getLocationString(int) const;
     KeyList keys;
-    MonotoneDelegate * mtnDelegate;
 };
 
 #endif
+