From bd0cfffe237e6a0926b608dee807942a52c0fe9a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 26 Jan 2014 12:48:44 +0100 Subject: neighbor/Info: add constructor --- src/neighbor/Info.hxx | 5 +++++ src/neighbor/plugins/SmbclientNeighborPlugin.cxx | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/neighbor') diff --git a/src/neighbor/Info.hxx b/src/neighbor/Info.hxx index 3a34896e7..ac4806f14 100644 --- a/src/neighbor/Info.hxx +++ b/src/neighbor/Info.hxx @@ -25,6 +25,11 @@ struct NeighborInfo { std::string uri; std::string display_name; + + template + NeighborInfo(U &&_uri, DN &&_display_name) + :uri(std::forward(_uri)), + display_name(std::forward(_display_name)) {} }; #endif diff --git a/src/neighbor/plugins/SmbclientNeighborPlugin.cxx b/src/neighbor/plugins/SmbclientNeighborPlugin.cxx index 8dc537e94..f7085c03d 100644 --- a/src/neighbor/plugins/SmbclientNeighborPlugin.cxx +++ b/src/neighbor/plugins/SmbclientNeighborPlugin.cxx @@ -122,12 +122,7 @@ ReadServer(NeighborExplorer::List &list, const smbc_dirent &e) const std::string name(e.name, e.namelen); const std::string comment(e.comment, e.commentlen); - NeighborInfo info{ - "smb://" + name, - name + " (" + comment + ")", - }; - - list.emplace_front(std::move(info)); + list.emplace_front("smb://" + name, name + " (" + comment + ")"); } static void -- cgit v1.2.3