From 0ad4e190ffbb85ea2db5a05d43cd4f81d98cfe63 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Fri, 9 Sep 2022 07:03:29 -0400 Subject: Make QPDFLogger() private and provide create method --- libtests/logger.cc | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'libtests') diff --git a/libtests/logger.cc b/libtests/logger.cc index b968422e..987e15d3 100644 --- a/libtests/logger.cc +++ b/libtests/logger.cc @@ -39,64 +39,64 @@ test2() { // First call saveToStandardOutput. Then use info, which then to // go stderr. - QPDFLogger l; - l.saveToStandardOutput(true); - l.info(std::string("info to stderr\n")); - *(l.getSave()) << "save to stdout\n"; - l.setInfo(nullptr); - l.info("info still to stderr\n"); - l.setSave(nullptr, false); - l.setInfo(nullptr); - l.info("info back to stdout\n"); + auto l = QPDFLogger::create(); + l->saveToStandardOutput(true); + l->info(std::string("info to stderr\n")); + *(l->getSave()) << "save to stdout\n"; + l->setInfo(nullptr); + l->info("info still to stderr\n"); + l->setSave(nullptr, false); + l->setInfo(nullptr); + l->info("info back to stdout\n"); } static void test3() { // Error/warning - QPDFLogger l; + auto l = QPDFLogger::create(); // Warning follows error when error is set explicitly. std::string errors; auto pl_error = std::make_shared("errors", nullptr, errors); - l.setError(pl_error); - l.warn("warn follows error\n"); + l->setError(pl_error); + l->warn("warn follows error\n"); assert(errors == "warn follows error\n"); - l.error("error too\n"); + l->error("error too\n"); assert(errors == "warn follows error\nerror too\n"); // Set warnings -- now they're separate std::string warnings; auto pl_warn = std::make_shared("warnings", nullptr, warnings); - l.setWarn(pl_warn); - l.warn(std::string("warning now separate\n")); - l.error(std::string("new error\n")); + l->setWarn(pl_warn); + l->warn(std::string("warning now separate\n")); + l->error(std::string("new error\n")); assert(warnings == "warning now separate\n"); assert(errors == "warn follows error\nerror too\nnew error\n"); std::string errors2; pl_error = std::make_shared("errors", nullptr, errors2); - l.setError(pl_error); - l.warn("new warning\n"); - l.error("another new error\n"); + l->setError(pl_error); + l->warn("new warning\n"); + l->error("another new error\n"); assert(warnings == "warning now separate\nnew warning\n"); assert(errors == "warn follows error\nerror too\nnew error\n"); assert(errors2 == "another new error\n"); // Restore warnings to default -- follows error again - l.setWarn(nullptr); - l.warn("warning 3\n"); - l.error("error 3\n"); + l->setWarn(nullptr); + l->warn("warning 3\n"); + l->error("error 3\n"); assert(warnings == "warning now separate\nnew warning\n"); assert(errors == "warn follows error\nerror too\nnew error\n"); assert(errors2 == "another new error\nwarning 3\nerror 3\n"); // Restore everything to default - l.setInfo(nullptr); - l.setWarn(nullptr); - l.setError(nullptr); - l.info("after reset, info to stdout\n"); - l.warn("after reset, warn to stderr\n"); - l.error("after reset, error to stderr\n"); + l->setInfo(nullptr); + l->setWarn(nullptr); + l->setError(nullptr); + l->info("after reset, info to stdout\n"); + l->warn("after reset, warn to stderr\n"); + l->error("after reset, error to stderr\n"); } int -- cgit v1.2.3-54-g00ecf