From 1712f98b3ccf15ad853ce45ebf7cdd5575a1d6d0 Mon Sep 17 00:00:00 2001
From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Thu, 29 Jun 2023 11:02:33 +0200
Subject: [PATCH] make sure to pass shared pointer by const ref when possible

avoid unnecessary copies of shared pointers

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---
 src/libsync/clientsideencryption.cpp | 16 ++++++++--------
 src/libsync/clientsideencryption.h   | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp
index 220fbd000..2b69b10f3 100644
--- a/src/libsync/clientsideencryption.cpp
+++ b/src/libsync/clientsideencryption.cpp
@@ -1345,7 +1345,7 @@ void ClientSideEncryption::generateKeyPair(const AccountPtr &account)
     });
 }
 
-std::pair<QByteArray, ClientSideEncryption::PKey> ClientSideEncryption::generateCSR(AccountPtr account,
+std::pair<QByteArray, ClientSideEncryption::PKey> ClientSideEncryption::generateCSR(const AccountPtr &account,
                                                                                     PKey keyPair,
                                                                                     PKey privateKey)
 {
@@ -1416,7 +1416,7 @@ std::pair<QByteArray, ClientSideEncryption::PKey> ClientSideEncryption::generate
     return {result, std::move(keyPair)};
 }
 
-void ClientSideEncryption::sendSignRequestCSR(AccountPtr account,
+void ClientSideEncryption::sendSignRequestCSR(const AccountPtr &account,
                                               PKey keyPair,
                                               QByteArray csrContent)
 {
@@ -1452,7 +1452,7 @@ void ClientSideEncryption::sendSignRequestCSR(AccountPtr account,
     job->start();
 }
 
-void ClientSideEncryption::writeKeyPair(AccountPtr account,
+void ClientSideEncryption::writeKeyPair(const AccountPtr &account,
                                         PKey keyPair,
                                         QByteArray output)
 {
@@ -1516,7 +1516,7 @@ void ClientSideEncryption::writeKeyPair(AccountPtr account,
     privateKeyJob->start();
 }
 
-void ClientSideEncryption::checkServerHasSavedKeys(AccountPtr account)
+void ClientSideEncryption::checkServerHasSavedKeys(const AccountPtr &account)
 {
     const auto keyIsNotOnServer = [account, this] () {
         qCInfo(lcCse) << "server is missing keys. deleting local keys";
@@ -1537,7 +1537,7 @@ void ClientSideEncryption::checkServerHasSavedKeys(AccountPtr account)
 
 template <typename SUCCESS_CALLBACK, typename ERROR_CALLBACK>
 void ClientSideEncryption::checkUserKeyOnServer(const QString &keyType,
-                                                OCC::AccountPtr account,
+                                                const AccountPtr &account,
                                                 SUCCESS_CALLBACK nextCheck,
                                                 ERROR_CALLBACK onError)
 {
@@ -1556,7 +1556,7 @@ void ClientSideEncryption::checkUserKeyOnServer(const QString &keyType,
 }
 
 template <typename SUCCESS_CALLBACK, typename ERROR_CALLBACK>
-void ClientSideEncryption::checkUserPublicKeyOnServer(AccountPtr account,
+void ClientSideEncryption::checkUserPublicKeyOnServer(const AccountPtr &account,
                                                       SUCCESS_CALLBACK nextCheck,
                                                       ERROR_CALLBACK onError)
 {
@@ -1564,7 +1564,7 @@ void ClientSideEncryption::checkUserPublicKeyOnServer(AccountPtr account,
 }
 
 template <typename SUCCESS_CALLBACK, typename ERROR_CALLBACK>
-void ClientSideEncryption::checkUserPrivateKeyOnServer(AccountPtr account, SUCCESS_CALLBACK nextCheck, ERROR_CALLBACK onError)
+void ClientSideEncryption::checkUserPrivateKeyOnServer(const AccountPtr &account, SUCCESS_CALLBACK nextCheck, ERROR_CALLBACK onError)
 {
     checkUserKeyOnServer("private-key", account, nextCheck, onError);
 }
@@ -1759,7 +1759,7 @@ FolderMetadata::FolderMetadata(AccountPtr account,
                                RequiredMetadataVersion requiredMetadataVersion,
                                const QByteArray& metadata,
                                int statusCode)
-    : _account(account)
+    : _account(std::move(account))
     , _requiredMetadataVersion(requiredMetadataVersion)
 {
     if (metadata.isEmpty() || statusCode == 404) {
diff --git a/src/libsync/clientsideencryption.h b/src/libsync/clientsideencryption.h
index dda48275c..e95fc21bb 100644
--- a/src/libsync/clientsideencryption.h
+++ b/src/libsync/clientsideencryption.h
@@ -169,15 +169,15 @@ private slots:
 private:
     void generateMnemonic();
 
-    [[nodiscard]] std::pair<QByteArray, PKey> generateCSR(AccountPtr account,
+    [[nodiscard]] std::pair<QByteArray, PKey> generateCSR(const AccountPtr &account,
                                                           PKey keyPair,
                                                           PKey privateKey);
 
-    void sendSignRequestCSR(AccountPtr account,
+    void sendSignRequestCSR(const AccountPtr &account,
                             PKey keyPair,
                             QByteArray csrContent);
 
-    void writeKeyPair(AccountPtr account,
+    void writeKeyPair(const AccountPtr &account,
                       PKey keyPair,
                       QByteArray output);
 
@@ -185,21 +185,21 @@ private:
     void writeMnemonic(OCC::AccountPtr account,
                        L nextCall);
 
-    void checkServerHasSavedKeys(AccountPtr account);
+    void checkServerHasSavedKeys(const AccountPtr &account);
 
     template <typename SUCCESS_CALLBACK, typename ERROR_CALLBACK>
-    void checkUserPublicKeyOnServer(OCC::AccountPtr account,
+    void checkUserPublicKeyOnServer(const OCC::AccountPtr &account,
                                     SUCCESS_CALLBACK nextCheck,
                                     ERROR_CALLBACK onError);
 
     template <typename SUCCESS_CALLBACK, typename ERROR_CALLBACK>
-    void checkUserPrivateKeyOnServer(OCC::AccountPtr account,
+    void checkUserPrivateKeyOnServer(const OCC::AccountPtr &account,
                                      SUCCESS_CALLBACK nextCheck,
                                      ERROR_CALLBACK onError);
 
     template <typename SUCCESS_CALLBACK, typename ERROR_CALLBACK>
     void checkUserKeyOnServer(const QString &keyType,
-                              OCC::AccountPtr account,
+                              const OCC::AccountPtr &account,
                               SUCCESS_CALLBACK nextCheck,
                               ERROR_CALLBACK onError);
 
-- 
2.39.5