Improve the TimedActivityLogger

- Get rid of the debug level parameter. Either we want to log the
  elapsed time or we don't. Enabling timing in verbose mode only
  is dubious anyway, as the debug output can influence the result.
- Log the time in more sensible places.

Change-Id: I1ced2a1d30cd015a9562d46079933db5ea69641c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

2 files changed, 7 insertions, 16 deletions

diff --git a/src/lib/corelib/logging/logger.cpp b/src/lib/corelib/logging/logger.cpp
index 866ad8b00..9a7811fb5 100644
--- a/src/lib/corelib/logging/logger.cpp
+++ b/src/lib/corelib/logging/logger.cpp
@@ -43,6 +43,8 @@
 
 #include "logger.h"
 
+#include "translator.h"
+
 #include <QByteArray>
 #include <QElapsedTimer>
 #include <QMutex>
@@ -230,27 +232,20 @@ class TimedActivityLogger::TimedActivityLoggerPrivate
 {
 public:
     Logger logger;
-    QString prefix;
     QString activity;
-    LoggerLevel logLevel;
     QElapsedTimer timer;
-    bool alwaysLog;
 };
 
 TimedActivityLogger::TimedActivityLogger(const Logger &logger, const QString &activity,
-        const QString &prefix, LoggerLevel logLevel, bool alwaysLog)
+        bool enabled)
     : d(0)
 {
-    if (!alwaysLog && !logger.logSink()->willPrint(logLevel))
+    if (!enabled)
         return;
     d = new TimedActivityLoggerPrivate;
     d->logger = logger;
-    d->prefix = prefix;
     d->activity = activity;
-    d->logLevel = logLevel;
-    d->alwaysLog = alwaysLog;
-    d->logger.qbsLog(logLevel, alwaysLog) << QString::fromLocal8Bit("%1Starting activity '%2'.")
-            .arg(prefix, activity);
+    d->logger.qbsLog(LoggerInfo) << Tr::tr("Starting activity '%2'.").arg(activity);
     d->timer.start();
 }
 
@@ -272,9 +267,7 @@ void TimedActivityLogger::finishActivity()
         timeString.prepend(QString::fromLocal8Bit("%1m, ").arg(m));
     if (h)
         timeString.prepend(QString::fromLocal8Bit("%1h, ").arg(h));
-    d->logger.qbsLog(d->logLevel, d->alwaysLog)
-            << QString::fromLocal8Bit("%1Activity '%2' took %3.")
-               .arg(d->prefix, d->activity, timeString);
+    d->logger.qbsLog(LoggerInfo) << Tr::tr("Activity '%2' took %3.").arg(d->activity, timeString);
     delete d;
     d = 0;
 }
diff --git a/src/lib/corelib/logging/logger.h b/src/lib/corelib/logging/logger.h
index 2e3edc880..e587f8325 100644
--- a/src/lib/corelib/logging/logger.h
+++ b/src/lib/corelib/logging/logger.h
@@ -138,9 +138,7 @@ private:
 class TimedActivityLogger
 {
 public:
-    TimedActivityLogger(const Logger &logger, const QString &activity,
-                        const QString &prefix = QString(), LoggerLevel logLevel = LoggerDebug,
-                        bool alwaysLog = false);
+    TimedActivityLogger(const Logger &logger, const QString &activity, bool enabled);
     void finishActivity();
     ~TimedActivityLogger();