Transfer JidDb to TrustDb

4 files changed, 8 insertions, 5 deletions

diff --git a/client.cpp b/client.cpp
index 849e1cf..d4d3f6f 100644
--- a/client.cpp
+++ b/client.cpp
@@ -4,7 +4,7 @@ Client::Client(const QString &jid, QObject *const parent) :
     QXmppClient(parent),
     jid(jid),
     db(jid),
-    trust_db(jid),
+    trust_db(jid, db),
     trust(&trust_db),
     omemo_db(jid),
     omemo(&omemo_db)
diff --git a/jiddb.h b/jiddb.h
index 6d6860a..a9f9c8b 100644
--- a/jiddb.h
+++ b/jiddb.h
@@ -32,7 +32,7 @@ public:
 
     JidDb(const QString &jid);
     QStringList roster() const;
-    const QString jid;
+    const QString &jid;
 
 public Q_SLOTS:
     QList<Conversation> conversations() const;
diff --git a/trust_db.cpp b/trust_db.cpp
index d61397c..138c028 100644
--- a/trust_db.cpp
+++ b/trust_db.cpp
@@ -7,8 +7,9 @@
 #include <QtConcurrent>
 #include <iostream>
 
-TrustDb::TrustDb(const QString &jid) :
-    jid(jid)
+TrustDb::TrustDb(const QString &jid, const JidDb &db) :
+    jid(jid),
+    db(db)
 {
 }
 
diff --git a/trust_db.h b/trust_db.h
index d5d070a..7d0e58c 100644
--- a/trust_db.h
+++ b/trust_db.h
@@ -1,6 +1,7 @@
 #ifndef TRUST_DB_H
 #define TRUST_DB_H
 
+#include "jiddb.h"
 #include <QXmppClient.h>
 #include <QXmppTask.h>
 #include <QXmppTrustLevel.h>
@@ -14,7 +15,7 @@
 class TrustDb : virtual public QXmppTrustStorage
 {
 public:
-    TrustDb(const QString &jid);
+    TrustDb(const QString &jid, const JidDb &db);
 
     QXmppTask<void> setSecurityPolicy(const QString &encryption,
         QXmpp::TrustSecurityPolicy securityPolicy) override;
@@ -64,6 +65,7 @@ public:
 
 private:
     const QString &jid;
+    const JidDb &db;
     QString service() const;
 };