From de1d73216eb27ca500738511c1ec1a33db96ef26 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 1 Feb 2024 17:30:23 +0100
Subject: [PATCH] Perforce: Replace QSharedPointer with std::shared_ptr

According to https://wiki.qt.io/Things_To_Look_Out_For_In_Reviews
QSharedPointer impl is poor and it's going to be removed from Qt 7.

Change-Id: I6b48189134c741e6d8ab6bb0c94d27d4504c14b5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/perforce/perforceplugin.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index eeb83b1134f..198910ef538 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -296,8 +296,8 @@ public:
     void changelists(const FilePath &workingDir, const QString &fileName = QString());
     void cleanCommitMessageFile();
     bool isCommitEditorOpen() const;
-    static QSharedPointer<TempFileSaver> createTemporaryArgumentFile(const QStringList &extraArgs,
-                                                                            QString *errorString);
+    static std::shared_ptr<TempFileSaver> createTemporaryArgumentFile(const QStringList &extraArgs,
+                                                                      QString *errorString);
 
     QString pendingChangesData();
 
@@ -1066,19 +1066,18 @@ bool PerforcePluginPrivate::vcsMove(const FilePath &workingDir, const QString &f
 }
 
 // Write extra args to temporary file
-QSharedPointer<TempFileSaver>
-PerforcePluginPrivate::createTemporaryArgumentFile(const QStringList &extraArgs,
-                                            QString *errorString)
+std::shared_ptr<TempFileSaver> PerforcePluginPrivate::createTemporaryArgumentFile(
+    const QStringList &extraArgs, QString *errorString)
 {
     if (extraArgs.isEmpty())
-        return QSharedPointer<TempFileSaver>();
+        return std::shared_ptr<TempFileSaver>();
     // create pattern
     QString pattern = dd->m_tempFilePattern;
     if (pattern.isEmpty()) {
         pattern = TemporaryDirectory::masterDirectoryPath() + "/qtc_p4_XXXXXX.args";
         dd->m_tempFilePattern = pattern;
     }
-    QSharedPointer<TempFileSaver> rc(new TempFileSaver(pattern));
+    std::shared_ptr<TempFileSaver> rc(new TempFileSaver(pattern));
     rc->setAutoRemove(true);
     const int last = extraArgs.size() - 1;
     for (int i = 0; i <= last; i++) {
@@ -1087,7 +1086,7 @@ PerforcePluginPrivate::createTemporaryArgumentFile(const QStringList &extraArgs,
             rc->write("\n", 1);
     }
     if (!rc->finalize(errorString))
-        return QSharedPointer<TempFileSaver>();
+        return std::shared_ptr<TempFileSaver>();
     return rc;
 }
 
@@ -1237,8 +1236,8 @@ PerforceResponse PerforcePluginPrivate::runP4Cmd(const FilePath &workingDir,
     }
     QStringList actualArgs = settings().commonP4Arguments(workingDir.toString());
     QString errorMessage;
-    QSharedPointer<TempFileSaver> tempFile = createTemporaryArgumentFile(extraArgs, &errorMessage);
-    if (!tempFile.isNull())
+    std::shared_ptr<TempFileSaver> tempFile = createTemporaryArgumentFile(extraArgs, &errorMessage);
+    if (tempFile)
         actualArgs << QLatin1String("-x") << tempFile->filePath().toString();
     else if (!errorMessage.isEmpty())
         return {};