remove gtable_ggplot() in favour of ggplot_gtable()

Author: teunbrand

NAMESPACE

@@ -59,7 +59,6 @@ S3method(fortify,tbl_df)
 S3method(ggplot,"function")
 S3method(ggplot,default)
 S3method(ggplot_add,default)
-S3method(ggplot_gtable,default)
 S3method(grid.draw,absoluteGrob)
 S3method(grobHeight,absoluteGrob)
 S3method(grobHeight,zeroGrob)
@@ -443,7 +442,6 @@ export(ggproto)
 export(ggproto_parent)
 export(ggsave)
 export(ggtitle)
-export(gtable_ggplot)
 export(guide_axis)
 export(guide_axis_logticks)
 export(guide_axis_stack)

R/plot-build.R

@@ -196,12 +196,12 @@ layer_grob <- get_layer_grob
 #' @keywords internal
 #' @param data plot data generated by [ggplot_build()]
 #' @export
-gtable_ggplot <- S7::new_generic("gtable_ggplot", "data", function(data) {
+ggplot_gtable <- function(data) {
   attach_plot_env(data@plot@plot_env)
-  S7::S7_dispatch()
-})
+  UseMethod("ggplot_gtable")
+}
 
-S7::method(gtable_ggplot, class_ggplot_built) <- function(data) {
+S7::method(ggplot_gtable, class_ggplot_built) <- function(data) {
   plot <- data@plot
   layout <- data@layout
   data <- data@data
@@ -302,18 +302,6 @@ S7::method(gtable_ggplot, class_ggplot_built) <- function(data) {
   plot_table
 }
 
-# TODO: the S3 generic should be phased out once S7 is adopted more widely
-#' @rdname gtable_ggplot
-#' @export
-ggplot_gtable <- function(data) {
-  UseMethod("ggplot_gtable")
-}
-
-#' @export
-ggplot_gtable.default <- function(data) {
-  gtable_ggplot(data)
-}
-
 #' Generate a ggplot2 plot grob.
 #'
 #' @param x ggplot2 object