resolve gnarlyness in S3/S7 method conflicts

Author: teunbrand

NAMESPACE

@@ -55,8 +55,8 @@ S3method(fortify,sfg)
 S3method(fortify,summary.glht)
 S3method(fortify,tbl)
 S3method(fortify,tbl_df)
-S3method(get_alt_text,ggplot)
-S3method(get_alt_text,ggplot_built)
+S3method(get_alt_text,"ggplot2::ggplot")
+S3method(get_alt_text,"ggplot2::ggplot_built")
 S3method(get_alt_text,gtable)
 S3method(grid.draw,absoluteGrob)
 S3method(grobHeight,absoluteGrob)
@@ -91,7 +91,9 @@ S3method(predictdf,default)
 S3method(predictdf,glm)
 S3method(predictdf,locfit)
 S3method(predictdf,loess)
+S3method(print,"ggplot2::ggplot")
 S3method(print,"ggplot2::mapping")
+S3method(print,"ggplot2::theme")
 S3method(print,element)
 S3method(print,ggplot2_bins)
 S3method(print,ggproto)

R/labels.R

@@ -280,7 +280,7 @@ get_alt_text <- function(p, ...) {
   UseMethod("get_alt_text")
 }
 #' @export
-get_alt_text.ggplot <- function(p, ...) {
+`get_alt_text.ggplot2::ggplot` <- function(p, ...) {
   alt <- p@labels[["alt"]] %||% ""
   if (!is.function(alt)) {
     return(alt)
@@ -291,7 +291,7 @@ get_alt_text.ggplot <- function(p, ...) {
   get_alt_text(build)
 }
 #' @export
-get_alt_text.ggplot_built <- function(p, ...) {
+`get_alt_text.ggplot2::ggplot_built` <- function(p, ...) {
   alt <- p@plot@labels[["alt"]] %||% ""
   p@plot@labels[["alt"]] <- NULL
   if (is.function(alt)) alt(p@plot) else alt

R/plot.R

@@ -229,7 +229,8 @@ plot_clone <- function(plot) {
 #' @param ... other arguments not used by this method
 #' @keywords hplot
 #' @return Invisibly returns the original plot.
-#' @name print.ggplot
+#' @export
+#' @method print ggplot2::ggplot
 #' @usage
 #' print(x, newpage = is.null(vp), vp = NULL, ...)
 #' plot(x, newpage = is.null(vp), vp = NULL, ...)
@@ -247,7 +248,7 @@ plot_clone <- function(plot) {
 #'   print(ggplot(mpg, aes_(~ displ, ~ hwy, colour = colour)) +
 #'     geom_point())
 #' }
-S7::method(print, class_ggplot) <-
+`print.ggplot2::ggplot` <-
   S7::method(plot, class_ggplot) <-
   function(x, newpage = is.null(vp), vp = NULL, ...) {
   set_last_plot(x)

R/theme.R

@@ -959,4 +959,5 @@ combine_elements <- function(e1, e2) {
   .subset2(x, ...)
 }
 
-S7::method(print, theme) <- function(x, ...) utils::str(x)
+#' @export
+`print.ggplot2::theme` <- function(x, ...) utils::str(x)