Core (lv-tool): Use std::string_view for string arguments.

Author: kaixiong

libvisual/tools/lv-tool/display/display.cpp

@@ -28,6 +28,8 @@
 #include <stdexcept>
 #include <string>
 
+using namespace std::string_literals;
+
 class Display::Impl
 {
 public:
@@ -42,13 +44,14 @@ class Display::Impl
     {}
 };
 
-Display::Display (std::string const& driver_name)
+Display::Display (std::string_view driver_name)
   : m_impl (new Impl)
 {
     m_impl->driver.reset (DisplayDriverFactory::instance().make (driver_name, *this));
 
     if (!m_impl->driver) {
-        throw std::runtime_error ("Failed to load display driver '" + driver_name + "'. Valid driver set? (\"--driver\" parameter)");
+        std::string const driver_name_str {driver_name};
+        throw std::runtime_error {"Failed to load display driver '"s + driver_name_str + "'. Valid driver set? (\"--driver\" parameter)"};
     }
 }
 
@@ -80,9 +83,9 @@ void Display::close ()
     m_impl->driver->close ();
 }
 
-void Display::set_title(std::string const& title)
+void Display::set_title(std::string_view title)
 {
-    m_impl->driver->set_title(title);
+    m_impl->driver->set_title (title);
 }
 
 void Display::lock ()

libvisual/tools/lv-tool/display/display.hpp

@@ -27,15 +27,15 @@
 
 #include <libvisual/libvisual.h>
 #include <memory>
-#include <string>
+#include <string_view>
 
 class DisplayDriver;
 
 class Display final
 {
 public:
 
-    explicit Display (std::string const& driver_name);
+    explicit Display (std::string_view driver_name);
 
     Display (Display const&) = delete;
 
@@ -61,7 +61,7 @@ class Display final
 
     LV::VideoPtr get_video () const;
 
-    void set_title(std::string const& title);
+    void set_title(std::string_view title);
 
     bool is_fullscreen () const;
 

libvisual/tools/lv-tool/display/display_driver.hpp

@@ -25,7 +25,7 @@
 #ifndef _LV_TOOL_DISPLAY_DRIVER_HPP
 #define _LV_TOOL_DISPLAY_DRIVER_HPP
 
-#include <string>
+#include <string_view>
 #include <libvisual/libvisual.h>
 
 class Display;
@@ -55,7 +55,7 @@ class DisplayDriver {
 
     virtual LV::VideoPtr get_video () const = 0;
 
-    virtual void set_title(std::string const& title) = 0;
+    virtual void set_title (std::string_view title) = 0;
 
     virtual ~DisplayDriver () {}
 };

libvisual/tools/lv-tool/display/display_driver_factory.cpp

@@ -57,14 +57,16 @@ DisplayDriverFactory::~DisplayDriverFactory ()
     // nothing to do
 }
 
-void DisplayDriverFactory::add_driver (std::string const& name, Creator const& creator)
+void DisplayDriverFactory::add_driver (std::string_view name, Creator const& creator)
 {
-    m_impl->creators[name] = creator;
+    std::string const name_str {name};
+    m_impl->creators[name_str] = creator;
 }
 
-DisplayDriver* DisplayDriverFactory::make (std::string const& name, Display& display)
+DisplayDriver* DisplayDriverFactory::make (std::string_view name, Display& display)
 {
-    auto entry = m_impl->creators.find (name);
+    std::string const name_str {name};
+    auto entry = m_impl->creators.find (name_str);
 
     if (entry == m_impl->creators.end ()) {
         return nullptr;
@@ -73,9 +75,10 @@ DisplayDriver* DisplayDriverFactory::make (std::string const& name, Display& dis
     return entry->second (display);
 }
 
-bool DisplayDriverFactory::has_driver (std::string const& name) const
+bool DisplayDriverFactory::has_driver (std::string_view name) const
 {
-    return (m_impl->creators.find (name) != m_impl->creators.end ());
+    std::string const name_str {name};
+    return (m_impl->creators.find (name_str) != m_impl->creators.end ());
 }
 
 DisplayDriverList DisplayDriverFactory::get_driver_list () const

libvisual/tools/lv-tool/display/display_driver_factory.hpp

@@ -28,6 +28,7 @@
 #include "display_driver.hpp"
 #include <memory>
 #include <functional>
+#include <string_view>
 #include <vector>
 
 typedef std::function<DisplayDriver* (Display& display)> DisplayDriverCreator;
@@ -46,11 +47,11 @@ class DisplayDriverFactory final
 	    return m_instance;
     }
 
-    DisplayDriver* make (std::string const& name, Display& display);
+    DisplayDriver* make (std::string_view name, Display& display);
 
-    void add_driver (std::string const& name, Creator const& creator);
+    void add_driver (std::string_view name, Creator const& creator);
 
-    bool has_driver (std::string const& name) const;
+    bool has_driver (std::string_view name) const;
 
     DisplayDriverList get_driver_list () const;
 

libvisual/tools/lv-tool/display/sdl_driver.cpp

@@ -216,9 +216,10 @@ namespace {
           return m_screen_video;
       }
 
-      void set_title(std::string const& title) override
+      void set_title (std::string_view title) override
       {
-          SDL_WM_SetCaption (title.c_str(), nullptr);
+          std::string const title_str {title};
+          SDL_WM_SetCaption (title_str.c_str (), nullptr);
       }
 
       void update_rect (LV::Rect const& rect) override

libvisual/tools/lv-tool/display/stdout_driver.cpp

@@ -104,7 +104,7 @@ namespace {
           return m_screen_video;
       }
 
-      void set_title(std::string const& title) override
+      void set_title (std::string_view title) override
       {
           (void)title;
 

libvisual/tools/lv-tool/display/stdout_sdl_driver.cpp

@@ -233,9 +233,10 @@ namespace {
           return m_screen_video;
       }
 
-      void set_title(std::string const& title) override
+      void set_title (std::string_view title) override
       {
-          SDL_WM_SetCaption (title.c_str(), nullptr);
+          std::string title_str {title};
+          SDL_WM_SetCaption (title_str.c_str (), nullptr);
       }
 
       void update_rect (LV::Rect const& rect) override

libvisual/tools/lv-tool/lv-tool.cpp

@@ -32,8 +32,9 @@
 #include <atomic>
 #include <stdexcept>
 #include <iostream>
-#include <unordered_set>
 #include <string>
+#include <string_view>
+#include <unordered_set>
 #include <cstdio>
 #include <cstdlib>
 #include <csignal>
@@ -211,8 +212,9 @@ namespace {
   }
 
   /** print commandline help */
-  void print_help(std::string const& name)
+  void print_help (std::string_view name)
   {
+      std::string const name_str {name};
       printf("Usage: %s [options]\n\n"
                   "Valid options:\n"
                   "\t--help\t\t\t-h\t\tThis help text\n"
@@ -230,7 +232,7 @@ namespace {
                   "\t--switch <n>\t\t-S <n>\t\tSwitch actor after n frames.\n"
                   "\t--exclude <actors>\t-x <actors>\tProvide a list of actors to exclude.\n"
                   "\n",
-                  name.c_str (),
+                  name_str.c_str (),
                   width, height,
                   driver_name.c_str (),
                   input_name.c_str (),
@@ -244,7 +246,6 @@ namespace {
         {
             printf("\t%s\n", driver_name.c_str());
         }
-
   }