From 0f20fb028602016c718f4fd05cdb18b80442b3ca Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Tue, 7 Dec 2021 19:09:14 +0100
Subject: id -> matrixId

---
 lib/database.cpp | 16 ++++++++--------
 lib/database.h   |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/database.cpp b/lib/database.cpp
index ec285d22..e115b6c3 100644
--- a/lib/database.cpp
+++ b/lib/database.cpp
@@ -89,11 +89,11 @@ void Database::migrateTo1()
     commit();
 }
 
-QByteArray Database::accountPickle(const QString &id)
+QByteArray Database::accountPickle(const QString &matrixId)
 {
     QSqlQuery query;
     query.prepare(QStringLiteral("SELECT pickle FROM Accounts WHERE matrixId=:matrixId;"));
-    query.bindValue(":matrixId", id);
+    query.bindValue(":matrixId", matrixId);
     execute(query);
     if (query.next()) {
         return query.value(QStringLiteral("pickle")).toByteArray();
@@ -101,30 +101,30 @@ QByteArray Database::accountPickle(const QString &id)
     return {};
 }
 
-void Database::setAccountPickle(const QString &id, const QByteArray &pickle)
+void Database::setAccountPickle(const QString &matrixId, const QByteArray &pickle)
 {
     QSqlQuery query;
     query.prepare(QStringLiteral("INSERT INTO Accounts(matrixId, pickle) VALUES(:matrixId, :pickle) ON CONFLICT (matrixId) DO UPDATE SET pickle=:pickle WHERE matrixId=:matrixId;"));
-    query.bindValue(":matrixId", id);
+    query.bindValue(":matrixId", matrixId);
     query.bindValue(":pickle", pickle);
     transaction();
     execute(query);
     commit();
 }
 
-void Database::clear(const QString &id)
+void Database::clear(const QString &matrixId)
 {
     QSqlQuery query;
     query.prepare(QStringLiteral("DELETE FROM Accounts(matrixId, pickle) WHERE matrixId=:matrixId;"));
-    query.bindValue(":matrixId", id);
+    query.bindValue(":matrixId", matrixId);
 
     QSqlQuery sessionsQuery;
     sessionsQuery.prepare(QStringLiteral("DELETE FROM OlmSessions WHERE matrixId=:matrixId;"));
-    sessionsQuery.bindValue(":matrixId", id);
+    sessionsQuery.bindValue(":matrixId", matrixId);
 
     QSqlQuery megolmSessionsQuery;
     megolmSessionsQuery.prepare(QStringLiteral("DELETE FROM InboundMegolmSessions WHERE matrixId=:matrixId;"));
-    megolmSessionsQuery.bindValue(":matrixId", id);
+    megolmSessionsQuery.bindValue(":matrixId", matrixId);
 
     QSqlQuery groupSessionIndexRecordQuery;
     groupSessionIndexRecordQuery.prepare(QStringLiteral("DELETE FROM GroupSessionIndexRecord WHERE matrixId=:matrixId;"));
diff --git a/lib/database.h b/lib/database.h
index 8f8cd6cd..25af2833 100644
--- a/lib/database.h
+++ b/lib/database.h
@@ -27,9 +27,9 @@ public:
     QSqlQuery execute(const QString &queryString);
     QSqlQuery execute(QSqlQuery &query);
 
-    QByteArray accountPickle(const QString &id);
-    void setAccountPickle(const QString &id, const QByteArray &pickle);
-    void clear(const QString &id);
+    QByteArray accountPickle(const QString &matrixId);
+    void setAccountPickle(const QString &matrixId, const QByteArray &pickle);
+    void clear(const QString &matrixId);
     void saveOlmSession(const QString& matrixId, const QString& senderKey, const QString& sessionId, const QByteArray &pickle);
     UnorderedMap<QString, std::vector<QOlmSessionPtr>> loadOlmSessions(const QString& matrixId, const PicklingMode& picklingMode);
     UnorderedMap<QPair<QString, QString>, QOlmInboundGroupSessionPtr> loadMegolmSessions(const QString& matrixId, const QString& roomId, const PicklingMode& picklingMode);
-- 
cgit v1.2.3