Merge remote-tracking branches 'neheb/j', 'neheb/f', 'neheb/qwe' and 'neheb/hgf'

src/CommandLine.cxx

@@ -78,7 +78,7 @@ constexpr auto USER_CONFIG_FILE_LOCATION1 = Path::FromFS(PATH_LITERAL(".mpdconf"
 constexpr auto USER_CONFIG_FILE_LOCATION2 = Path::FromFS(PATH_LITERAL(".mpd/mpd.conf"));
 constexpr auto USER_CONFIG_FILE_LOCATION_XDG = Path::FromFS(PATH_LITERAL("mpd/mpd.conf"));
 #endif
-}
+} // namespace
 
 enum Option {
 	OPTION_KILL,

src/command/StickerCommands.cxx

@@ -36,7 +36,7 @@ struct sticker_song_find_data {
 	Response &r;
 	const char *name;
 };
-}
+} // namespace
 
 static void
 sticker_song_find_print_cb(const LightSong &song, const char *value,

src/db/Helpers.cxx

@@ -34,7 +34,7 @@ struct StringLess {
 	}
 };
 
-typedef std::set<const char *, StringLess> StringSet;
+using StringSet = std::set<const char *, StringLess>;
 
 static void
 StatsVisitTag(DatabaseStats &stats, StringSet &artists, StringSet &albums,

src/db/plugins/ProxyDatabasePlugin.cxx

@@ -770,7 +770,7 @@ ReceiveEntities(struct mpd_connection *connection) noexcept
 	std::list<ProxyEntity> entities;
 	struct mpd_entity *entity;
 	while ((entity = mpd_recv_entity(connection)) != nullptr)
-		entities.push_back(ProxyEntity(entity));
+		entities.emplace_back(entity);
 
 	mpd_response_finish(connection);
 	return entities;

src/db/plugins/upnp/Directory.cxx

@@ -30,10 +30,8 @@
 
 #include <string.h>
 
-UPnPDirContent::~UPnPDirContent()
+/* this destructor exists here just so it won't get inlined */
-{
+UPnPDirContent::~UPnPDirContent() = default;
-	/* this destructor exists here just so it won't get inlined */
-}
 
 gcc_pure
 static UPnPDirObject::ItemClass

src/db/plugins/upnp/Object.cxx

@@ -19,7 +19,5 @@
 
 #include "Object.hxx"
 
-UPnPDirObject::~UPnPDirObject() noexcept
+/* this destructor exists here just so it won't get inlined */
-{
+UPnPDirObject::~UPnPDirObject() noexcept = default;
-	/* this destructor exists here just so it won't get inlined */
-}

src/encoder/plugins/OpusEncoderPlugin.cxx

@@ -387,7 +387,7 @@ OpusEncoder::SendTag(const Tag &tag)
 	GenerateHeaders(&tag);
 }
 
-}
+} // namespace
 
 const EncoderPlugin opus_encoder_plugin = {
 	"opus",

src/input/plugins/QobuzClient.cxx

@@ -44,7 +44,7 @@ public:
 	}
 };
 
-}
+} // namespace
 
 QobuzClient::QobuzClient(EventLoop &event_loop,
 			 const char *_base_url,

src/lib/dbus/Glue.cxx

@@ -56,4 +56,4 @@ Glue::OnDBusClosed() noexcept
 	// TODO: reconnect
 }
 
-}
+} // namespace ODBus

src/lib/upnp/ContentDirectoryService.cxx

@@ -44,10 +44,8 @@ ContentDirectoryService::ContentDirectoryService(const UPnPDevice &device,
 	}
 }
 
-ContentDirectoryService::~ContentDirectoryService() noexcept
+/* this destructor exists here just so it won't get inlined */
-{
+ContentDirectoryService::~ContentDirectoryService() noexcept = default;
-	/* this destructor exists here just so it won't get inlined */
-}
 
 std::forward_list<std::string>
 ContentDirectoryService::getSearchCapabilities(UpnpClient_Handle hdl) const

src/lib/upnp/Device.cxx

@@ -23,10 +23,8 @@
 
 #include <string.h>
 
-UPnPDevice::~UPnPDevice() noexcept
+/* this destructor exists here just so it won't get inlined */
-{
+UPnPDevice::~UPnPDevice() noexcept = default;
-	/* this destructor exists here just so it won't get inlined */
-}
 
 /**
  * An XML parser which constructs an UPnP device object from the

src/lib/upnp/ixmlwrap.cxx

@@ -38,4 +38,4 @@ getFirstElementValue(IXML_Document *doc, const char *name) noexcept
 	return ixmlNode_getNodeValue(dnode);
 }
 
-}
+} // namespace ixmlwrap

src/song/Filter.cxx

@@ -90,10 +90,8 @@ SongFilter::SongFilter(TagType tag, const char *value, bool fold_case)
 							   StringFilter(value, fold_case, fold_case, false)));
 }
 
-SongFilter::~SongFilter()
+/* this destructor exists here just so it won't get inlined */
-{
+SongFilter::~SongFilter() = default;
-	/* this destructor exists here just so it won't get inlined */
-}
 
 std::string
 SongFilter::ToExpression() const noexcept

src/sticker/SongSticker.cxx

@@ -82,7 +82,7 @@ struct sticker_song_find_data {
 		     void *user_data);
 	void *user_data;
 };
-}
+} // namespace
 
 static void
 sticker_song_find_cb(const char *uri, const char *value, void *user_data)