[neon/kde/incidenceeditor/Neon/unstable] debian/patches: new version of patch

Carlos De Maine null at kde.org
Sat Jun 14 23:47:56 BST 2025


Git commit 05d4e37dcc8bfc1886116133bfe951af34cda207 by Carlos De Maine.
Committed on 14/06/2025 at 22:47.
Pushed by carlosdem into branch 'Neon/unstable'.

new version of patch

M  +67   -7    debian/patches/neon_qsignalblocker.diff

https://invent.kde.org/neon/kde/incidenceeditor/-/commit/05d4e37dcc8bfc1886116133bfe951af34cda207

diff --git a/debian/patches/neon_qsignalblocker.diff b/debian/patches/neon_qsignalblocker.diff
index 3f7970d..809963d 100644
--- a/debian/patches/neon_qsignalblocker.diff
+++ b/debian/patches/neon_qsignalblocker.diff
@@ -1,30 +1,90 @@
 diff --git a/src/combinedincidenceeditor.cpp b/src/combinedincidenceeditor.cpp
-index fc1122e..4df04c5 100644
+index fc1122e1a17cfff4f251507c6eb66b396b692688..66707370971cad8132e36cf2e1325a7c3f720a00 100644
 --- a/src/combinedincidenceeditor.cpp
 +++ b/src/combinedincidenceeditor.cpp
-@@ -79,9 +79,10 @@ void CombinedIncidenceEditor::load(const KCalendarCore::Incidence::Ptr &incidenc
+@@ -79,9 +79,8 @@ void CombinedIncidenceEditor::load(const KCalendarCore::Incidence::Ptr &incidenc
      for (IncidenceEditor *editor : std::as_const(mCombinedEditors)) {
          // load() may fire dirtyStatusChanged(), reset mDirtyEditorCount to make sure
          // we don't end up with an invalid dirty count.
 -        editor->blockSignals(true);
 +        const QSignalBlocker blocker(editor);
-+        //editor->blockSignals(true);
          editor->load(incidence);
 -        editor->blockSignals(false);
-+        //editor->blockSignals(false);
  
          if (editor->isDirty()) {
              // We are going to crash due to assert. Print some useful info before crashing.
-@@ -104,9 +105,10 @@ void CombinedIncidenceEditor::load(const Akonadi::Item &item)
+@@ -104,9 +103,8 @@ void CombinedIncidenceEditor::load(const Akonadi::Item &item)
      for (IncidenceEditor *editor : std::as_const(mCombinedEditors)) {
          // load() may fire dirtyStatusChanged(), reset mDirtyEditorCount to make sure
          // we don't end up with an invalid dirty count.
 -        editor->blockSignals(true);
 +        const QSignalBlocker blocker(editor);
-+        //editor->blockSignals(true);
          editor->load(item);
 -        editor->blockSignals(false);
-+        //editor->blockSignals(false);
  
          if (editor->isDirty()) {
              // We are going to crash due to assert. Print some useful info before crashing.
+diff --git a/src/incidencecategories.cpp b/src/incidencecategories.cpp
+index e486907f443f975d63b577a41c379f964c066a7e..f89884bae093fb450ccf41c31eabbabd02adb482 100644
+--- a/src/incidencecategories.cpp
++++ b/src/incidencecategories.cpp
+@@ -59,9 +59,8 @@ void IncidenceCategories::load(const Akonadi::Item &item)
+             }
+         }
+         createMissingCategories();
+-        mUi->mTagWidget->blockSignals(true);
++        const QSignalBlocker blocker(mUi->mTagWidget);
+         mUi->mTagWidget->setSelection(selectedTags);
+-        mUi->mTagWidget->blockSignals(false);
+     }
+ }
+ 
+@@ -131,9 +130,10 @@ void IncidenceCategories::onMissingTagCreated(KJob *job)
+ 
+     // If the created tag was one of the instance's missing categories,
+     // adding it to the widget doesn't make it dirty.
+-    mUi->mTagWidget->blockSignals(count > 0);
++    if (count > 0) {
++        const QSignalBlocker blocker(mUi->mTagWidget);
++    }
+     mUi->mTagWidget->setSelection(selectedTags);
+-    mUi->mTagWidget->blockSignals(false);
+ }
+ 
+ #include "moc_incidencecategories.cpp"
+diff --git a/src/incidencecompletionpriority.cpp b/src/incidencecompletionpriority.cpp
+index 0eb541a58fed24f2ca07bc1e5e0d2193d880502f..08ab0cc9eafbf3e9c0429a92b7e24be88ea2a204 100644
+--- a/src/incidencecompletionpriority.cpp
++++ b/src/incidencecompletionpriority.cpp
+@@ -82,14 +82,12 @@ void IncidenceCompletionPriority::load(const KCalendarCore::Incidence::Ptr &inci
+     d->mUi->mTaskSeparator->show();
+ 
+     d->mOrigPercentCompleted = todo->percentComplete();
+-    d->mUi->mCompletionSlider->blockSignals(true);
++    const QSignalBlocker sliderBlocker(d->mUi->mCompletionSlider);
+     d->mUi->mCompletionSlider->setValue(todo->percentComplete());
+     d->sliderValueChanged(d->mUi->mCompletionSlider->value());
+-    d->mUi->mCompletionSlider->blockSignals(false);
+ 
+-    d->mUi->mPriorityCombo->blockSignals(true);
++    const QSignalBlocker comboBlocker(d->mUi->mPriorityCombo);
+     d->mUi->mPriorityCombo->setCurrentIndex(todo->priority());
+-    d->mUi->mPriorityCombo->blockSignals(false);
+ 
+     mWasDirty = false;
+ }
+diff --git a/src/incidencedatetime.cpp b/src/incidencedatetime.cpp
+index cddea973b3bd38ce24e2133235324c5de313d0b0..6af151ee05b0528258764a25b319cf89147bbd1c 100644
+--- a/src/incidencedatetime.cpp
++++ b/src/incidencedatetime.cpp
+@@ -778,9 +778,8 @@ void IncidenceDateTime::setTimes(const QDateTime &start, const QDateTime &end)
+ {
+     // like setDateTimes(), but it set only the start/end time, not the date
+     // it is used while applying a template to an event.
+-    mUi->mStartTimeEdit->blockSignals(true);
++    const QSignalBlocker blocker(mUi->mStartTimeEdit);
+     mUi->mStartTimeEdit->setTime(start.time());
+-    mUi->mStartTimeEdit->blockSignals(false);
+ 
+     mUi->mEndTimeEdit->setTime(end.time());
+ 


More information about the Neon-commits mailing list