[neon/kde/knewstuff/Neon/unstable] debian/patches: Revert "patches requested by maintainer"
Jonathan Riddell
null at kde.org
Tue Sep 28 11:52:55 BST 2021
Git commit 3570562ef65881de363976fd2d9e8532d7e5630c by Jonathan Riddell.
Committed on 28/09/2021 at 10:52.
Pushed by jriddell into branch 'Neon/unstable'.
Revert "patches requested by maintainer"
This reverts commit 311901702cf31c74db8e8cd0be57841b802a034b.
D +0 -79 debian/patches/constructor.diff
D +0 -21 debian/patches/constructor2.diff
D +0 -2 debian/patches/series
https://invent.kde.org/neon/kde/knewstuff/commit/3570562ef65881de363976fd2d9e8532d7e5630c
diff --git a/debian/patches/constructor.diff b/debian/patches/constructor.diff
deleted file mode 100644
index e1186c5..0000000
--- a/debian/patches/constructor.diff
+++ /dev/null
@@ -1,79 +0,0 @@
-commit 57b4b3f2882596d2577186c03e322f91361f0d9d
-Author: Ahmad Samir <a.samirh78 at gmail.com>
-Date: Sat Aug 28 13:01:50 2021 +0200
-
- Param name should be different from member var
-
- GIT_SILENT
-
-diff --git a/src/core/downloadmanager.cpp b/src/core/downloadmanager.cpp
-index e4a20f56..597c20eb 100644
---- a/src/core/downloadmanager.cpp
-+++ b/src/core/downloadmanager.cpp
-@@ -23,8 +23,8 @@ public:
- DownloadManager *const q;
- Engine *const engine;
-
-- DownloadManagerPrivate(DownloadManager *q)
-- : q(q)
-+ DownloadManagerPrivate(DownloadManager *qq)
-+ : q(qq)
- , engine(new Engine)
- {
- }
-diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
-index f75a550a..8b706c1a 100644
---- a/src/downloadmanager.cpp
-+++ b/src/downloadmanager.cpp
-@@ -22,8 +22,8 @@ public:
- DownloadManager *const q;
- KNSCore::Engine *const engine;
-
-- DownloadManagerPrivate(DownloadManager *q)
-- : q(q)
-+ DownloadManagerPrivate(DownloadManager *qq)
-+ : q(qq)
- , engine(new KNSCore::Engine)
- {
- }
-diff --git a/src/downloadwidget.cpp b/src/downloadwidget.cpp
-index cfbe15dc..c47391c9 100644
---- a/src/downloadwidget.cpp
-+++ b/src/downloadwidget.cpp
-@@ -96,7 +96,7 @@ Entry::List DownloadWidget::installedEntries()
- return entries;
- }
-
--DownloadWidgetPrivate::DownloadWidgetPrivate(DownloadWidget *q)
-+DownloadWidgetPrivate::DownloadWidgetPrivate(DownloadWidget *qq)
- : q(q)
- , engine(new KNSCore::Engine)
- , model(new KNSCore::ItemsModel(engine))
-diff --git a/src/downloadwidget_p.h b/src/downloadwidget_p.h
-index 0748db38..db0b391e 100644
---- a/src/downloadwidget_p.h
-+++ b/src/downloadwidget_p.h
-@@ -54,7 +54,7 @@ public:
- QString m_configFile;
- bool dialogMode;
-
-- explicit DownloadWidgetPrivate(DownloadWidget *q);
-+ explicit DownloadWidgetPrivate(DownloadWidget *qq);
- ~DownloadWidgetPrivate();
-
- void init(const QString &configFile);
-diff --git a/src/uploaddialog_p.h b/src/uploaddialog_p.h
-index 5de09660..7984bff7 100644
---- a/src/uploaddialog_p.h
-+++ b/src/uploaddialog_p.h
-@@ -22,8 +22,8 @@ namespace KNS3
- class UploadDialogPrivate
- {
- public:
-- UploadDialogPrivate(UploadDialog *q)
-- : q(q)
-+ UploadDialogPrivate(UploadDialog *qq)
-+ : q(qq)
- {
- }
-
diff --git a/debian/patches/constructor2.diff b/debian/patches/constructor2.diff
deleted file mode 100644
index 1b28d2e..0000000
--- a/debian/patches/constructor2.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-commit d09ba1917cb7e035a9aac6c27c86fc4df5da3194
-Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 27 20:05:09 2021 +0200
-
- Fix crash in DownloadWidget
-
- BUGS: 443025
-
-diff --git a/src/downloadwidget.cpp b/src/downloadwidget.cpp
-index 40df2e8c..36cfde37 100644
---- a/src/downloadwidget.cpp
-+++ b/src/downloadwidget.cpp
-@@ -97,7 +97,7 @@ Entry::List DownloadWidget::installedEntries()
- }
-
- DownloadWidgetPrivate::DownloadWidgetPrivate(DownloadWidget *qq)
-- : q(q)
-+ : q(qq)
- , engine(new KNSCore::Engine)
- , model(new KNSCore::ItemsModel(engine))
- , messageTimer(nullptr)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ba64a63..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-constructor.diff
-constructor2.diff
More information about the Neon-commits
mailing list