From b93fd0c9c6812bcfac20c29cae050f05bfec8283 Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 14 Aug 2023 20:31:08 +0200 Subject: [PATCH 1/6] [patchmanager.cpp] Fix-up release 3.2.10 This was introduced by https://github.com/sailfishos-patches/patchmanager/commit/e30292be22fc6644e8b5ba32ac9612395bb11aff#diff-df38830cae3d3051528c63a2740fe3b0b4ec2c6b59aadab35dce5a1b6e995dd4R1016-R1035 I still do not understand the purpose of this addition, specifically in the light of the comment(s) stating *"probably dead code, need to investigate"*: It sure is, as these two newly introduced classes do not contain any code at all. Likely this is a combination of my lack of understanding with these comments lacking information needed to understand the purpose. --- src/qml/patchmanager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qml/patchmanager.cpp b/src/qml/patchmanager.cpp index e34dea1f..45fd9506 100644 --- a/src/qml/patchmanager.cpp +++ b/src/qml/patchmanager.cpp @@ -1013,19 +1013,19 @@ bool PatchManagerTranslator::installTranslator(const QString &patch) return true; } -/*! void PatchManager::activation(const QString & patch, const QString & version); +/*! void PatchManager::activation(const QString &patch, const QString &version); \warning probably dead code, need to investigate probably \internal, using \a patch and \a version */ -void PatchManager::activation(const QString & patch, const QString & version) +void PatchManager::activation(const QString &patch, const QString &version) { } -/*! void PatchManager::easterReceived(const QString & easterText); +/*! void PatchManager::easterReceived(const QString &easterText); \warning probably dead code, need to investigate probably \internal, using \a easterText */ -void PatchManager::easterReceived(const QString & easterText); +void PatchManager::easterReceived(const QString &easterText); { } From db2e8f85fe6d492b79fd0423e97c1ef7242a21c6 Mon Sep 17 00:00:00 2001 From: nephros Date: Tue, 15 Aug 2023 00:09:56 +0200 Subject: [PATCH 2/6] Fix syntax / copypaste error --- src/qml/patchmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qml/patchmanager.cpp b/src/qml/patchmanager.cpp index 45fd9506..accec63e 100644 --- a/src/qml/patchmanager.cpp +++ b/src/qml/patchmanager.cpp @@ -1025,7 +1025,7 @@ void PatchManager::activation(const QString &patch, const QString &version) \warning probably dead code, need to investigate probably \internal, using \a easterText */ -void PatchManager::easterReceived(const QString &easterText); +void PatchManager::easterReceived(const QString &easterText) { } From ba6b989d5d7c5c202ff0df94269202fb976cb8d6 Mon Sep 17 00:00:00 2001 From: nephros Date: Tue, 15 Aug 2023 00:11:06 +0200 Subject: [PATCH 3/6] Remove empty/stub methods. --- src/qml/patchmanager.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/qml/patchmanager.cpp b/src/qml/patchmanager.cpp index accec63e..f6952c45 100644 --- a/src/qml/patchmanager.cpp +++ b/src/qml/patchmanager.cpp @@ -1013,22 +1013,6 @@ bool PatchManagerTranslator::installTranslator(const QString &patch) return true; } -/*! void PatchManager::activation(const QString &patch, const QString &version); - \warning probably dead code, need to investigate - probably \internal, using \a patch and \a version -*/ -void PatchManager::activation(const QString &patch, const QString &version) -{ -} - -/*! void PatchManager::easterReceived(const QString &easterText); - \warning probably dead code, need to investigate - probably \internal, using \a easterText -*/ -void PatchManager::easterReceived(const QString &easterText) -{ -} - /*! Returns \e true if \a filename exists, \e false otherwise. \sa https://doc.qt.io/qt-5/qfile.html#exists-1 From 054a5bc371bd4ac9a1d09a0d078df0b6673f39bb Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 15 Aug 2023 02:15:54 +0200 Subject: [PATCH 4/6] [patchmanager.h] Mark two definitions as "apparently unused": - public slots: void activation(const QString & patch, const QString & version); - signals: void easterReceived(const QString & easterText); --- src/qml/patchmanager.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qml/patchmanager.h b/src/qml/patchmanager.h index e980a67d..250f2ae4 100644 --- a/src/qml/patchmanager.h +++ b/src/qml/patchmanager.h @@ -66,7 +66,7 @@ class PatchManagerVersionCheck enum CheckMode { Strict, NoCheck, - //Relaxed, // TODO, Issue #322, also see https://github.com/sailfishos-patches/patchmanager/issues/333#issuecomment-1374118045 + //Relaxed, // TODO, see issue #322, also see https://github.com/sailfishos-patches/patchmanager/issues/333#issuecomment-1374118045 }; Q_ENUM(CheckMode) private: @@ -157,7 +157,7 @@ public slots: bool installTranslator(const QString & patch); bool removeTranslator(const QString & patch); - void activation(const QString & patch, const QString & version); + void activation(const QString & patch, const QString & version); // Apparently unused! int checkVote(const QString &patch) const; void doVote(const QString &patch, int action); void checkEaster(); @@ -185,7 +185,7 @@ public slots: void resolveFailure(); signals: - void easterReceived(const QString & easterText); + void easterReceived(const QString & easterText); // Apparently unused! void developerModeChanged(bool developerMode); void patchDevelModeChanged(bool patchDevelMode); void sfosVersionCheckChanged(bool sfosVersionCheck); From e12eef342db1963e22492e00873e74dd29789953 Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 15 Aug 2023 22:29:26 +0200 Subject: [PATCH 5/6] [patchmanager.h] Remove `Apparently unused!` comments Reverts most of https://github.com/sailfishos-patches/patchmanager/pull/451/commits/054a5bc371bd4ac9a1d09a0d078df0b6673f39bb Reference: https://github.com/sailfishos-patches/patchmanager/pull/451#issuecomment-1678283711 --- src/qml/patchmanager.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qml/patchmanager.h b/src/qml/patchmanager.h index 250f2ae4..5f1e72bf 100644 --- a/src/qml/patchmanager.h +++ b/src/qml/patchmanager.h @@ -157,7 +157,7 @@ public slots: bool installTranslator(const QString & patch); bool removeTranslator(const QString & patch); - void activation(const QString & patch, const QString & version); // Apparently unused! + void activation(const QString & patch, const QString & version); int checkVote(const QString &patch) const; void doVote(const QString &patch, int action); void checkEaster(); @@ -185,7 +185,7 @@ public slots: void resolveFailure(); signals: - void easterReceived(const QString & easterText); // Apparently unused! + void easterReceived(const QString & easterText); void developerModeChanged(bool developerMode); void patchDevelModeChanged(bool patchDevelMode); void sfosVersionCheckChanged(bool sfosVersionCheck); From 5027c0837e3ebfe597e3b18f47412d5d4a937df0 Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 15 Aug 2023 22:54:45 +0200 Subject: [PATCH 6/6] [patchmanager.spec] Pre-release version increase --- rpm/patchmanager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/patchmanager.spec b/rpm/patchmanager.spec index d01490fb..9e625730 100644 --- a/rpm/patchmanager.spec +++ b/rpm/patchmanager.spec @@ -23,7 +23,7 @@ Name: patchmanager Summary: Allows to manage Patches for SailfishOS -Version: 3.2.10 +Version: 3.2.11 Release: 1 # The Group tag should comprise one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS