From 6f918091d99bdb3759017413c9efeb17b4dc3927 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Sun, 2 Sep 2012 23:24:46 +0200
Subject: [PATCH] remove warnings clang generates

---
 src/menu.h      | 4 ++--
 src/ncmpcpp.cpp | 2 +-
 src/song.h      | 2 ++
 src/status.cpp  | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/menu.h b/src/menu.h
index 093de1fc..9ca28124 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -39,7 +39,7 @@ template <typename T> struct Menu : public Window
 {
 	struct Item
 	{
-		friend class Menu<T>;
+		friend struct Menu<T>;
 		
 		Item()
 		: m_is_bold(false), m_is_selected(false), m_is_inactive(false), m_is_separator(false) { }
@@ -77,7 +77,7 @@ template <typename T> struct Menu : public Window
 	template <typename ValueT, typename BaseIterator> class ItemIterator
 		: public std::iterator<std::random_access_iterator_tag, ValueT>
 	{
-		friend class Menu<T>;
+		friend struct Menu<T>;
 		
 		BaseIterator m_it;
 		explicit ItemIterator(BaseIterator it) : m_it(it) { }
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index 48448f1e..760b4628 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -134,7 +134,7 @@ int main(int argc, char **argv)
 	cerr_buffer = std::cerr.rdbuf();
 	std::cerr.rdbuf(errorlog.rdbuf());
 	
-	NC::InitScreen("ncmpcpp ver. "VERSION, Config.colors_enabled);
+	NC::InitScreen("ncmpcpp ver. " VERSION, Config.colors_enabled);
 	
 	Action::OriginalStatusbarVisibility = Config.statusbar_visibility;
 	
diff --git a/src/song.h b/src/song.h
index 044de3c7..6ac19e7c 100644
--- a/src/song.h
+++ b/src/song.h
@@ -35,6 +35,8 @@ struct Song
 	typedef std::string (Song::*GetFunction)(unsigned) const;
 	
 	Song() { }
+	virtual ~Song() { }
+	
 	Song(mpd_song *s);
 	
 	virtual std::string getURI(unsigned idx = 0) const;
diff --git a/src/status.cpp b/src/status.cpp
index 39a4de0a..c0351a2a 100644
--- a/src/status.cpp
+++ b/src/status.cpp
@@ -339,7 +339,7 @@ void NcmpcppStatusChanged(MPD::Connection *, MPD::StatusChanges changed, void *)
 			}
 			case MPD::psStop:
 			{
-				WindowTitle("ncmpcpp ver. "VERSION);
+				WindowTitle("ncmpcpp ver. " VERSION);
 				if (!block_progressbar_update)
 					DrawProgressbar(0, 0);
 				Playlist::ReloadRemaining = true;