From 8090f6ea60d386560aec843a38e6930ad7170a3e Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 1 Feb 2024 17:06:41 +0100 Subject: [PATCH] ClearCase: 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: I002f09d968b61318e125c5af1e90a03e24a70082 Reviewed-by: Orgad Shaneh --- src/plugins/clearcase/clearcaseplugin.cpp | 21 ++++++++++----------- src/plugins/clearcase/clearcaseplugin.h | 3 +-- src/plugins/clearcase/clearcasesync.cpp | 2 +- src/plugins/clearcase/clearcasesync.h | 4 ++-- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 7b797f92dd4..39a15984b0b 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -65,7 +65,6 @@ #include #include #include -#include #include #include #include @@ -317,7 +316,7 @@ public: QAction *m_menuAction = nullptr; QMutex m_activityMutex; QList m_activities; - QSharedPointer m_statusMap; + std::shared_ptr m_statusMap; ClearCaseSettingsPage m_settingsPage; @@ -1812,7 +1811,7 @@ bool ClearCasePluginPrivate::vcsCheckIn(const FilePath &messageFile, const QStri if (files.isEmpty()) return true; const QString title = QString::fromLatin1("Checkin %1").arg(files.join(QLatin1String("; "))); - using FCBPointer = QSharedPointer; + using FCBPointer = std::shared_ptr; replaceActivity &= (activity != QLatin1String(Constants::KEEP_ACTIVITY)); if (replaceActivity && !vcsSetActivity(m_checkInView, title, activity)) return false; @@ -2479,7 +2478,7 @@ void setSettings(const ClearCaseSettings &s) dd->setSettings(s); } -QSharedPointer statusMap() +std::shared_ptr statusMap() { return dd->m_statusMap; } @@ -2580,7 +2579,7 @@ void ClearCaseTest::testFileStatusParsing_data() void ClearCaseTest::testFileStatusParsing() { - dd->m_statusMap = QSharedPointer(new StatusMap); + dd->m_statusMap = std::shared_ptr(new StatusMap); QFETCH(QString, filename); QFETCH(QString, cleartoolLsLine); @@ -2592,14 +2591,14 @@ void ClearCaseTest::testFileStatusParsing() void ClearCaseTest::testFileNotManaged() { - dd->m_statusMap = QSharedPointer(new StatusMap); + dd->m_statusMap = std::shared_ptr(new StatusMap); ClearCaseSync ccSync(dd->m_statusMap); ccSync.verifyFileNotManaged(); } void ClearCaseTest::testFileCheckedOutDynamicView() { - dd->m_statusMap = QSharedPointer(new StatusMap); + dd->m_statusMap = std::shared_ptr(new StatusMap); ClearCaseSync ccSync(dd->m_statusMap); ccSync.verifyFileCheckedOutDynamicView(); @@ -2607,14 +2606,14 @@ void ClearCaseTest::testFileCheckedOutDynamicView() void ClearCaseTest::testFileCheckedInDynamicView() { - dd->m_statusMap = QSharedPointer(new StatusMap); + dd->m_statusMap = std::shared_ptr(new StatusMap); ClearCaseSync ccSync(dd->m_statusMap); ccSync.verifyFileCheckedInDynamicView(); } void ClearCaseTest::testFileNotManagedDynamicView() { - dd->m_statusMap = QSharedPointer(new StatusMap); + dd->m_statusMap = std::shared_ptr(new StatusMap); ClearCaseSync ccSync(dd->m_statusMap); ccSync.verifyFileNotManagedDynamicView(); } @@ -2725,7 +2724,7 @@ void ClearCaseTest::testVcsStatusDynamicReadonlyNotManaged() { // File is not in map, and is read-only ClearCasePluginPrivate::instance(); - dd->m_statusMap = QSharedPointer(new StatusMap); + dd->m_statusMap = std::shared_ptr(new StatusMap); const QString fileName = QDir::currentPath() + QLatin1String("/readonly_notmanaged_file.cpp"); @@ -2747,7 +2746,7 @@ void ClearCaseTest::testVcsStatusDynamicReadonlyNotManaged() void ClearCaseTest::testVcsStatusDynamicNotManaged() { ClearCasePluginPrivate::instance(); - dd->m_statusMap = QSharedPointer(new StatusMap); + dd->m_statusMap = std::shared_ptr(new StatusMap); const QString fileName = QDir::currentPath() + QLatin1String("/notmanaged_file.cpp"); diff --git a/src/plugins/clearcase/clearcaseplugin.h b/src/plugins/clearcase/clearcaseplugin.h index 740b021028b..2070c181c81 100644 --- a/src/plugins/clearcase/clearcaseplugin.h +++ b/src/plugins/clearcase/clearcaseplugin.h @@ -8,7 +8,6 @@ #include #include #include -#include namespace ClearCase::Internal { @@ -56,6 +55,6 @@ const ViewData viewData(); void setStatus(const QString &file, FileStatus::Status status, bool update); const ClearCaseSettings &settings(); void setSettings(const ClearCaseSettings &s); -QSharedPointer statusMap(); +std::shared_ptr statusMap(); } // ClearCase::Internal diff --git a/src/plugins/clearcase/clearcasesync.cpp b/src/plugins/clearcase/clearcasesync.cpp index bf26b683860..71682126a67 100644 --- a/src/plugins/clearcase/clearcasesync.cpp +++ b/src/plugins/clearcase/clearcasesync.cpp @@ -51,7 +51,7 @@ static void runProcess(QPromise &promise, const ClearCaseSettings &setting processLine(buffer, ++processed); } -ClearCaseSync::ClearCaseSync(QSharedPointer statusMap) : +ClearCaseSync::ClearCaseSync(std::shared_ptr statusMap) : m_statusMap(statusMap) { } diff --git a/src/plugins/clearcase/clearcasesync.h b/src/plugins/clearcase/clearcasesync.h index 7a303e6593b..c52a965f308 100644 --- a/src/plugins/clearcase/clearcasesync.h +++ b/src/plugins/clearcase/clearcasesync.h @@ -19,7 +19,7 @@ class ClearCaseSync : public QObject { Q_OBJECT public: - explicit ClearCaseSync(QSharedPointer statusMap); + explicit ClearCaseSync(std::shared_ptr statusMap); void run(QPromise &promise, QStringList &files); QStringList updateStatusHotFiles(const QString &viewRoot, int &total); @@ -38,7 +38,7 @@ signals: void updateStreamAndView(); private: - QSharedPointer m_statusMap; + std::shared_ptr m_statusMap; #ifdef WITH_TESTS public slots: