aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-01-26 12:48:44 +0100
committerMax Kellermann <max@duempel.org>2014-01-26 13:07:53 +0100
commitbd0cfffe237e6a0926b608dee807942a52c0fe9a (patch)
tree77eca406d1ed1ec57333e8f1ee7f7c08798982c2
parent8c5ea7ec557d0ffdbd6fb96ea4e76d6ce177ac1b (diff)
downloadmpd-bd0cfffe237e6a0926b608dee807942a52c0fe9a.tar.gz
mpd-bd0cfffe237e6a0926b608dee807942a52c0fe9a.tar.xz
mpd-bd0cfffe237e6a0926b608dee807942a52c0fe9a.zip
neighbor/Info: add constructor
Diffstat (limited to '')
-rw-r--r--src/neighbor/Info.hxx5
-rw-r--r--src/neighbor/plugins/SmbclientNeighborPlugin.cxx7
2 files changed, 6 insertions, 6 deletions
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<typename U, typename DN>
+ NeighborInfo(U &&_uri, DN &&_display_name)
+ :uri(std::forward<U>(_uri)),
+ display_name(std::forward<DN>(_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