C++11 tidying.

[dcpomatic.git] / src / lib / log.cc

diff --git a/src/lib/log.cc b/src/lib/log.cc
index e1716f1c65e5671abd9c7042b861faf084fa06a8..97b6498938cc1f0992c76829b3e4f1110b4a9f14 100644 (file)
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,10 +18,12 @@
 
 */
 
+
 /** @file src/log.cc
  *  @brief A very simple logging class.
  */
 
+
 #include "log.h"
 #include "cross.h"
 #include "config.h"
@@ -31,16 +33,19 @@
 
 #include "i18n.h"
 
+
 using std::string;
 using std::cout;
 using std::shared_ptr;
+using std::make_shared;
+
 
 Log::Log ()
-       : _types (0)
 {
 
 }
 
+
 void
 Log::log (shared_ptr<const LogEntry> e)
 {
@@ -53,6 +58,7 @@ Log::log (shared_ptr<const LogEntry> e)
        do_log (e);
 }
 
+
 /** @param n String to log */
 void
 Log::log (string message, int type)
@@ -63,27 +69,29 @@ Log::log (string message, int type)
                return;
        }
 
-       shared_ptr<StringLogEntry> e (new StringLogEntry (type, message));
+       auto e = make_shared<StringLogEntry>(type, message);
 
        do_log (e);
 }
 
+
 void
 Log::dcp_log (dcp::NoteType type, string m)
 {
        switch (type) {
-       case dcp::DCP_PROGRESS:
-               do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_GENERAL, m)));
+       case dcp::NoteType::PROGRESS:
+               do_log (make_shared<StringLogEntry>(LogEntry::TYPE_GENERAL, m));
                break;
-       case dcp::DCP_ERROR:
-               do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_ERROR, m)));
+       case dcp::NoteType::ERROR:
+               do_log (make_shared<StringLogEntry>(LogEntry::TYPE_ERROR, m));
                break;
-       case dcp::DCP_NOTE:
-               do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_WARNING, m)));
+       case dcp::NoteType::NOTE:
+               do_log (make_shared<StringLogEntry>(LogEntry::TYPE_WARNING, m));
                break;
        }
 }
 
+
 void
 Log::set_types (int t)
 {