fix merge conflict

lgatto · Jun 25, 2023 · 7b666ad · 7b666ad
2 parents 66d8d8d + 274a3ed
commit 7b666ad
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: MSnbase
 Title: Base Functions and Classes for Mass Spectrometry and Proteomics
-Version: 2.27.0
+Version: 2.27.1
 Description: MSnbase provides infrastructure for manipulation,
              processing and visualisation of mass spectrometry and
              proteomics data, ranging from raw to quantitative and

diff --git a/NEWS.md b/NEWS.md
@@ -1,9 +1,20 @@
+# MSnbase 2.27
+
+## MSnbase 2.27.1
+
+- Fix declarations of centroided/smoothed setters for OnDiskMSnExp
+  objects (from Hervé Pagès via Github).
+
+## MSnbase 2.27.0
+
+- New devel
+
 # MSnbase 2.25
 
 ## MSnbase 2.25.2
 
 - Fix bug in descendPeaks (see [#583](https://github.com/lgatto/MSnbase/issues/583))
- 
+
 ## MSnbase 2.25.1
 
 - Fix remote mztab filename.

diff --git a/R/methods-OnDiskMSnExp.R b/R/methods-OnDiskMSnExp.R
@@ -184,7 +184,7 @@ setMethod("centroided", "OnDiskMSnExp",
 
 setReplaceMethod("centroided",
                  signature(object = "OnDiskMSnExp", value = "logical"),
-                 function(object, value, msLevel.) {
+                 function(object, msLevel., ..., value) {
                      if (missing(msLevel.)) {
                          if (length(value) == 1)
                              value <- rep(value, length(object))
@@ -223,7 +223,7 @@ setMethod("smoothed", "OnDiskMSnExp",
 
 setReplaceMethod("smoothed",
                  signature(object = "OnDiskMSnExp", value = "logical"),
-                 function(object, value, msLevel.) {
+                 function(object, msLevel., ..., value) {
                      if (missing(msLevel.)) {
                          if (length(value) == 1)
                              value <- rep(value, length(object))