diff --git a/DESCRIPTION b/DESCRIPTION index 0936379..4f0a6d1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -29,7 +29,8 @@ Imports: lavaan, zoo, brms, - testthat (>= 3.1.0) + testthat (>= 3.1.0), + reformulas Suggests: covr, knitr, diff --git a/NAMESPACE b/NAMESPACE index 69498c2..7e57eaf 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -75,7 +75,6 @@ importFrom(grDevices,dev.interactive) importFrom(grDevices,devAskNewPage) importFrom(lavaan,parameterEstimates) importFrom(lavaan,sem) -importFrom(lme4,findbars) importFrom(lme4,fixef) importFrom(lme4,glmer) importFrom(lme4,glmerControl) @@ -86,7 +85,6 @@ importFrom(lme4,isREML) importFrom(lme4,lmer) importFrom(lme4,lmerControl) importFrom(lme4,ngrps) -importFrom(lme4,nobars) importFrom(lme4,refitML) importFrom(lmerTest,lsmeansLT) importFrom(nlme,VarCorr) @@ -94,6 +92,8 @@ importFrom(nlme,fixef) importFrom(nlme,getGroupsFormula) importFrom(nlme,random.effects) importFrom(nlme,ranef) +importFrom(reformulas,findbars) +importFrom(reformulas,nobars) importFrom(scales,breaks_log) importFrom(scales,label_math) importFrom(scales,log_trans) diff --git a/R/models.R b/R/models.R index 0907eac..29c9fe7 100644 --- a/R/models.R +++ b/R/models.R @@ -486,8 +486,9 @@ if(getRversion() >= "2.15.1") utils::globalVariables(c("var1", "var2", "sdcor", #' @param ... Additional arguments passed to \code{confint} #' @importFrom JWileymisc modelTest as.na as.modelTest #' @importFrom data.table as.data.table := setnames -#' @importFrom lme4 isGLMM isNLMM isLMM isREML nobars findbars +#' @importFrom lme4 isGLMM isNLMM isLMM isREML #' @importFrom lme4 ngrps lmer glmer refitML lmerControl glmerControl +#' @importFrom reformulas nobars findbars #' @importFrom stats family formula nobs update #' @importFrom lmerTest lsmeansLT #' @method modelTest merMod