final s/sapply/vapply changes for grid (thanks to Kurt for doing most of them!)

git-svn-id: https://svn.r-project.org/R/trunk@88298 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: murrell

src/library/grid/R/grob.R

@@ -264,7 +264,7 @@ setChildren <- function(x, children) {
   }
   if (length(children)) {
     x$children <- children
-    childNames <- sapply(children, childName)
+    childNames <- vapply(children, childName, "")
     names(x$children) <- childNames
     x$childrenOrder <- childNames
   } else {
@@ -331,7 +331,7 @@ getName <- function(elt) {
 
 getNames <- function() {
   dl <- grid.Call(C_getDisplayList)[1L:grid.Call(C_getDLindex)]
-  names <- sapply(dl, getName)
+  names <- vapply(dl, getName, "")
   names[nzchar(names)]
 }
 

src/library/grid/R/ls.R

@@ -756,7 +756,7 @@ grobPathListing <- function(x, ...) {
 
 # Tidy up the vpPath from grid.ls() to remove ROOT if it is there
 clean <- function(paths) {
-    sapply(lapply(paths,
+    vapply(lapply(paths,
                   function(x) {
                       pieces <- explode(x)
                       if (length(pieces) && pieces[1] == "ROOT")
@@ -767,7 +767,8 @@ clean <- function(paths) {
                if (length(x))
                    as.character(vpPath(x))
                else ""
-           })
+           },
+           "")
 }
 
 # Given a gPath, return complete grob paths that match from the display list

src/library/grid/R/viewport.R

@@ -233,7 +233,7 @@ depth.vpList <- function(x, ...) {
 depth.vpStack <- function(x, ...) {
   # Elements in the stack may be vpStacks or vpLists or vpTrees
   # so need to sum all the depths
-  sum(sapply(x, depth, ..., simplify=TRUE))
+  sum(vapply(x, depth, 0, ...))
 }
 
 depth.vpTree <- function(x, ...) {