fix header guards

src/actions.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _ACTIONS_H
-#define _ACTIONS_H
+#ifndef NCMPCPP_ACTIONS_H
+#define NCMPCPP_ACTIONS_H
 
 #include <map>
 #include <string>
@@ -1140,4 +1140,4 @@ protected:
 	virtual void Run();
 };
 
-#endif // _ACTIONS_H
+#endif // NCMPCPP_ACTIONS_H

src/bindings.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _BINDINGS_H
-#define _BINDINGS_H
+#ifndef NCMPCPP_BINDINGS_H
+#define NCMPCPP_BINDINGS_H
 
 #include <cassert>
 #include <unordered_map>
@@ -192,4 +192,4 @@ private:
 
 extern BindingsConfiguration Bindings;
 
-#endif // _BINDINGS_H
+#endif // NCMPCPP_BINDINGS_H

src/browser.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _BROWSER_H
-#define _BROWSER_H
+#ifndef NCMPCPP_BROWSER_H
+#define NCMPCPP_BROWSER_H
 
 #include "interfaces.h"
 #include "mpdpp.h"
@@ -90,5 +90,5 @@ private:
 
 extern Browser *myBrowser;
 
-#endif
+#endif // NCMPCPP_BROWSER_H
 

src/charset.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _CHARSET_H
-#define _CHARSET_H
+#ifndef NCMPCPP_CHARSET_H
+#define NCMPCPP_CHARSET_H
 
 #include "config.h"
 #include <string>
@@ -50,5 +50,5 @@ inline void localeToUtf8_(std::string &) { }
 
 }
 
-#endif
+#endif // NCMPCPP_CHARSET_H
 

src/clock.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _CLOCK_H
-#define _CLOCK_H
+#ifndef NCMPCPP_CLOCK_H
+#define NCMPCPP_CLOCK_H
 
 #include "config.h"
 
@@ -68,4 +68,4 @@ extern Clock *myClock;
 
 #endif // ENABLE_CLOCK
 
-#endif
+#endif // NCMPCPP_CLOCK_H

src/curl_handle.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _CURL_HANDLE_H
-#define _CURL_HANDLE_H
+#ifndef NCMPCPP_CURL_HANDLE_H
+#define NCMPCPP_CURL_HANDLE_H
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -39,5 +39,5 @@ namespace Curl
 
 #endif // HAVE_CURL_CURL_H
 
-#endif
+#endif // NCMPCPP_CURL_HANDLE_H
 

src/display.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _DISPLAY_H
-#define _DISPLAY_H
+#ifndef NCMPCPP_DISPLAY_H
+#define NCMPCPP_DISPLAY_H
 
 #include "interfaces.h"
 #include "menu.h"
@@ -50,5 +50,5 @@ void Items(NC::Menu<MPD::Item> &menu, const ProxySongList &pl);
 
 }
 
-#endif
+#endif // NCMPCPP_DISPLAY_H
 

src/error.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _ERROR_H
-#define _ERROR_H
+#ifndef NCMPCPP_ERROR_H
+#define NCMPCPP_ERROR_H
 
 #include <string>
 #include "gcc.h"
@@ -28,4 +28,4 @@
 
 void FatalError(const std::string &msg) GNUC_NORETURN;
 
-#endif
+#endif // NCMPCPP_ERROR_H

src/exec_item.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _EXEC_ITEM_H
-#define _EXEC_ITEM_H
+#ifndef NCMPCPP_EXEC_ITEM_H
+#define NCMPCPP_EXEC_ITEM_H
 
 #include <functional>
 
@@ -42,4 +42,4 @@ private:
 	Function m_exec;
 };
 
-#endif // _EXEC_ITEM_H
+#endif // NCMPCPP_EXEC_ITEM_H

src/global.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _GLOBAL_H
-#define _GLOBAL_H
+#ifndef NCMPCPP_GLOBAL_H
+#define NCMPCPP_GLOBAL_H
 
 #include <sys/time.h>
 
@@ -64,4 +64,4 @@ extern timeval Timer;
 
 }
 
-#endif
+#endif // NCMPCPP_GLOBAL_H

src/help.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _HELP_H
-#define _HELP_H
+#ifndef NCMPCPP_HELP_H
+#define NCMPCPP_HELP_H
 
 #include "actions.h"
 #include "interfaces.h"
@@ -59,5 +59,5 @@ private:
 
 extern Help *myHelp;
 
-#endif
+#endif // NCMPCPP_HELP_H
 

src/helpers.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _HELPERS_H
-#define _HELPERS_H
+#ifndef NCMPCPP_HELPERS_H
+#define NCMPCPP_HELPERS_H
 
 #include "interfaces.h"
 #include "mpdpp.h"
@@ -490,4 +490,4 @@ void markSongsInPlaylist(ProxySongList pl);
 
 std::wstring Scroller(const std::wstring &str, size_t &pos, size_t width);
 
-#endif
+#endif // NCMPCPP_HELPERS_H

src/interfaces.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _INTERFACES_H
-#define _INTERFACES_H
+#ifndef NCMPCPP_INTERFACES_H
+#define NCMPCPP_INTERFACES_H
 
 #include <string>
 #include "gcc.h"
@@ -79,4 +79,4 @@ private:
 	BaseScreen *m_previous_screen;
 };
 
-#endif // _INTERFACES_H
+#endif // NCMPCPP_INTERFACES_H

src/lastfm.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _H_LASTFM
-#define _H_LASTFM
+#ifndef NCMPCPP_LASTFM_H
+#define NCMPCPP_LASTFM_H
 
 #include "config.h"
 
@@ -86,5 +86,5 @@ extern Lastfm *myLastfm;
 
 #endif // HAVE_CURL_CURL_H
 
-#endif
+#endif // NCMPCPP_LASTFM_H
 

src/lastfm_service.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _LASTFM_SERVICE_H
-#define _LASTFM_SERVICE_H
+#ifndef NCMPCPP_LASTFM_SERVICE_H
+#define NCMPCPP_LASTFM_SERVICE_H
 
 #include "config.h"
 
@@ -68,4 +68,4 @@ protected:
 
 #endif // HAVE_CURL_CURL_H
 
-#endif
+#endif // NCMPCPP_LASTFM_SERVICE_H

src/lyrics.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _LYRICS_H
-#define _LYRICS_H
+#ifndef NCMPCPP_LYRICS_H
+#define NCMPCPP_LYRICS_H
 
 #include <pthread.h>
 #include <queue>
@@ -99,5 +99,5 @@ private:
 
 extern Lyrics *myLyrics;
 
-#endif
+#endif // NCMPCPP_LYRICS_H
 

src/lyrics_fetcher.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _LYRICS_FETCHER_H
-#define _LYRICS_FETCHER_H
+#ifndef NCMPCPP_LYRICS_FETCHER_H
+#define NCMPCPP_LYRICS_FETCHER_H
 
 #include "config.h"
 
@@ -210,4 +210,4 @@ extern LyricsFetcher *lyricsPlugins[];
 
 #endif // HAVE_CURL_CURL_H
 
-#endif
+#endif // NCMPCPP_LYRICS_FETCHER_H

src/macro_utilities.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _MACRO_UTILITIES
-#define _MACRO_UTILITIES
+#ifndef NCMPCPP_MACRO_UTILITIES_H
+#define NCMPCPP_MACRO_UTILITIES_H
 
 #include <cassert>
 #include "actions.h"
@@ -64,4 +64,4 @@ private:
 	ScreenType m_screen_type;
 };
 
-#endif // _MACRO_UTILITIES
+#endif // NCMPCPP_MACRO_UTILITIES_H

src/media_library.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _H_MEDIA_LIBRARY
-#define _H_MEDIA_LIBRARY
+#ifndef NCMPCPP_MEDIA_LIBRARY_H
+#define NCMPCPP_MEDIA_LIBRARY_H
 
 #include "interfaces.h"
 #include "screen.h"
@@ -138,5 +138,5 @@ private:
 
 extern MediaLibrary *myLibrary;
 
-#endif
+#endif // NCMPCPP_MEDIA_LIBRARY_H
 

src/menu.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _MENU_H
-#define _MENU_H
+#ifndef NCMPCPP_MENU_H
+#define NCMPCPP_MENU_H
 
 #include <cassert>
 #include <functional>
@@ -855,4 +855,4 @@ template <typename T> void Menu<T>::prevFound(bool wrap)
 
 }
 
-#endif
+#endif // NCMPCPP_MENU_H

src/mpdpp.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _MPDPP_H
-#define _MPDPP_H
+#ifndef NCMPCPP_MPDPP_H
+#define NCMPCPP_MPDPP_H
 
 #include <cassert>
 #include <set>
@@ -280,4 +280,4 @@ private:
 
 extern MPD::Connection Mpd;
 
-#endif
+#endif // NCMPCPP_MPDPP_H

src/mutable_song.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _EDITABLE_SONG_H
-#define _EDITABLE_SONG_H
+#ifndef NCMPCPP_EDITABLE_SONG_H
+#define NCMPCPP_EDITABLE_SONG_H
 
 #include <map>
 #include "song.h"
@@ -109,4 +109,4 @@ private:
 
 }
 
-#endif // _EDITABLE_SONG_H
+#endif // NCMPCPP_EDITABLE_SONG_H

src/outputs.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _OUTPUTS_H
-#define _OUTPUTS_H
+#ifndef NCMPCPP_OUTPUTS_H
+#define NCMPCPP_OUTPUTS_H
 
 #include "config.h"
 
@@ -60,5 +60,5 @@ extern Outputs *myOutputs;
 
 #endif // ENABLE_OUTPUTS
 
-#endif
+#endif // NCMPCPP_OUTPUTS_H
 

src/playlist.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _PLAYLIST_H
-#define _PLAYLIST_H
+#ifndef NCMPCPP_PLAYLIST_H
+#define NCMPCPP_PLAYLIST_H
 
 #include <unordered_map>
 
@@ -104,5 +104,5 @@ private:
 
 extern Playlist *myPlaylist;
 
-#endif
+#endif // NCMPCPP_PLAYLIST_H
 

src/playlist_editor.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _PLAYLIST_EDITOR_H
-#define _PLAYLIST_EDITOR_H
+#ifndef NCMPCPP_PLAYLIST_EDITOR_H
+#define NCMPCPP_PLAYLIST_EDITOR_H
 
 #include "interfaces.h"
 #include "screen.h"
@@ -91,5 +91,5 @@ private:
 
 extern PlaylistEditor *myPlaylistEditor;
 
-#endif
+#endif // NCMPCPP_PLAYLIST_EDITOR_H
 

src/proxy_song_list.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _PROXY_SONG_LIST
-#define _PROXY_SONG_LIST
+#ifndef NCMPCPP_PROXY_SONG_LIST_H
+#define NCMPCPP_PROXY_SONG_LIST_H
 
 #include "menu.h"
 #include "song.h"
@@ -127,4 +127,4 @@ public:
 	operator bool() const { return m_impl.get() != 0; }
 };
 
-#endif
+#endif // NCMPCPP_PROXY_SONG_LIST_H

src/regex_filter.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _REGEX_FILTER
-#define _REGEX_FILTER
+#ifndef NCMPCPP_REGEX_FILTER_H
+#define NCMPCPP_REGEX_FILTER_H
 
 #include "menu.h"
 
@@ -85,4 +85,4 @@ private:
 	FilterFunction m_filter;
 };
 
-#endif
+#endif // NCMPCPP_REGEX_FILTER_H

src/regexes.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _REGEXES_H
-#define _REGEXES_H
+#ifndef NCMPCPP_REGEXES_H
+#define NCMPCPP_REGEXES_H
 
 #include <regex.h>
 #include <string>
@@ -62,4 +62,4 @@ private:
 	bool m_compiled;
 };
 
-#endif // _REGEXES_H
+#endif // NCMPCPP_REGEXES_H

src/screen.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _SCREEN_H
-#define _SCREEN_H
+#ifndef NCMPCPP_SCREEN_H
+#define NCMPCPP_SCREEN_H
 
 #include "menu.h"
 #include "scrollpad.h"
@@ -199,5 +199,5 @@ template <> inline void Screen<NC::Scrollpad>::mouseButtonPressed(MEVENT me) {
 	scrollpadMouseButtonPressed(w, me);
 }
 
-#endif
+#endif // NCMPCPP_SCREEN_H
 

src/screen_switcher.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _SCREEN_SWITCHER_H
-#define _SCREEN_SWITCHER_H
+#ifndef NCMPCPP_SCREEN_SWITCHER_H
+#define NCMPCPP_SCREEN_SWITCHER_H
 
 #include "global.h"
 
@@ -57,4 +57,4 @@ public:
 	}
 };
 
-#endif // _SCREEN_SWITCHER_H
+#endif // NCMPCPP_SCREEN_SWITCHER_H

src/scrollpad.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _SCROLLPAD_H
-#define _SCROLLPAD_H
+#ifndef NCMPCPP_SCROLLPAD_H
+#define NCMPCPP_SCROLLPAD_H
 
 #include "window.h"
 #include "strbuffer.h"
@@ -129,5 +129,5 @@ private:
 
 }
 
-#endif
+#endif // NCMPCPP_SCROLLPAD_H
 

src/search_engine.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _SEARCH_ENGINE_H
-#define _SEARCH_ENGINE_H
+#ifndef NCMPCPP_SEARCH_ENGINE_H
+#define NCMPCPP_SEARCH_ENGINE_H
 
 #include <cassert>
 
@@ -137,5 +137,5 @@ private:
 
 extern SearchEngine *mySearcher;
 
-#endif
+#endif // NCMPCPP_SEARCH_ENGINE_H
 

src/sel_items_adder.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _SEL_ITEMS_ADDER_H
-#define _SEL_ITEMS_ADDER_H
+#ifndef NCMPCPP_SEL_ITEMS_ADDER_H
+#define NCMPCPP_SEL_ITEMS_ADDER_H
 
 #include "exec_item.h"
 #include "interfaces.h"
@@ -80,5 +80,5 @@ private:
 
 extern SelectedItemsAdder *mySelectedItemsAdder;
 
-#endif
+#endif // NCMPCPP_SEL_ITEMS_ADDER_H
 

src/server_info.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _SERVER_INFO
-#define _SERVER_INFO
+#ifndef NCMPCPP_SERVER_INFO_H
+#define NCMPCPP_SERVER_INFO_H
 
 #include "interfaces.h"
 #include "screen.h"
@@ -57,5 +57,5 @@ private:
 
 extern ServerInfo *myServerInfo;
 
-#endif
+#endif // NCMPCPP_SERVER_INFO_H
 

src/settings.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _SETTINGS_H
-#define _SETTINGS_H
+#ifndef NCMPCPP_SETTINGS_H
+#define NCMPCPP_SETTINGS_H
 
 #include <cassert>
 #include <vector>
@@ -222,5 +222,5 @@ extern Configuration Config;
 
 void CreateDir(const std::string &dir);
 
-#endif
+#endif // NCMPCPP_SETTINGS_H
 

src/song.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _SONG_H
-#define _SONG_H
+#ifndef NCMPCPP_SONG_H
+#define NCMPCPP_SONG_H
 
 #include <functional>
 #include <memory>
@@ -96,5 +96,5 @@ typedef std::vector<Song> SongList;
 
 }
 
-#endif
+#endif // NCMPCPP_SONG_H
 

src/song_info.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _SONG_INFO_H
-#define _SONG_INFO_H
+#ifndef NCMPCPP_SONG_INFO_H
+#define NCMPCPP_SONG_INFO_H
 
 #include "interfaces.h"
 #include "mutable_song.h"
@@ -62,5 +62,5 @@ private:
 
 extern SongInfo *mySongInfo;
 
-#endif
+#endif // NCMPCPP_SONG_INFO_H
 

src/sort_playlist.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _SORT_PLAYLIST
-#define _SORT_PLAYLIST
+#ifndef NCMPCPP_SORT_PLAYLIST_H
+#define NCMPCPP_SORT_PLAYLIST_H
 
 #include "exec_item.h"
 #include "interfaces.h"
@@ -65,4 +65,4 @@ private:
 
 extern SortPlaylistDialog *mySortPlaylistDialog;
 
-#endif // _SORT_PLAYLIST
+#endif // NCMPCPP_SORT_PLAYLIST_H

src/status.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _STATUS_CHECKER_H
-#define _STATUS_CHECKER_H
+#ifndef NCMPCPP_STATUS_CHECKER_H
+#define NCMPCPP_STATUS_CHECKER_H
 
 #include "interfaces.h"
 #include "mpdpp.h"
@@ -54,4 +54,4 @@ void outputs();
 
 }
 
-#endif
+#endif // NCMPCPP_STATUS_CHECKER_H

src/statusbar.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _STATUSBAR_H
-#define _STATUSBAR_H
+#ifndef NCMPCPP_STATUSBAR_H
+#define NCMPCPP_STATUSBAR_H
 
 #include "gcc.h"
 #include "interfaces.h"
@@ -98,4 +98,4 @@ private:
 
 }
 
-#endif // _STATUSBAR_H
+#endif // NCMPCPP_STATUSBAR_H

src/strbuffer.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _STRBUFFER_H
-#define _STRBUFFER_H
+#ifndef NCMPCPP_STRBUFFER_H
+#define NCMPCPP_STRBUFFER_H
 
 #include <list>
 #include "utility/numeric_conversions.h"
@@ -399,4 +399,4 @@ template <typename CharT> BasicBuffer<CharT> &BasicBuffer<CharT>::operator<<(con
 
 }
 
-#endif
+#endif // NCMPCPP_STRBUFFER_H

src/tag_editor.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _TAG_EDITOR_H
-#define _TAG_EDITOR_H
+#ifndef NCMPCPP_TAG_EDITOR_H
+#define NCMPCPP_TAG_EDITOR_H
 
 #include "config.h"
 
@@ -105,7 +105,7 @@ private:
 
 extern TagEditor *myTagEditor;
 
-#endif
+#endif // HAVE_TAGLIB_H
 
-#endif
+#endif // NCMPCPP_TAG_EDITOR_H
 

src/tags.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _TAGS_H
-#define _TAGS_H
+#ifndef NCMPCPP_TAGS_H
+#define NCMPCPP_TAGS_H
 
 #include "config.h"
 
@@ -39,4 +39,4 @@ bool write(MPD::MutableSong &);
 
 #endif // HAVE_TAGLIB_H
 
-#endif // _TAGS_H
+#endif // NCMPCPP_TAGS_H

src/tiny_tag_editor.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _TINY_TAG_EDITOR_H
-#define _TINY_TAG_EDITOR_H
+#ifndef NCMPCPP_TINY_TAG_EDITOR_H
+#define NCMPCPP_TINY_TAG_EDITOR_H
 
 #include "config.h"
 
@@ -64,5 +64,5 @@ extern TinyTagEditor *myTinyTagEditor;
 
 #endif // HAVE_TAGLIB_H
 
-#endif
+#endif // NCMPCPP_TINY_TAG_EDITOR_H
 

src/title.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _TITLE_H
-#define _TITLE_H
+#ifndef NCMPCPP_TITLE_H
+#define NCMPCPP_TITLE_H
 
 #include "window.h"
 
@@ -27,4 +27,4 @@ void windowTitle(const std::string &title);
 
 void drawHeader();
 
-#endif
+#endif // NCMPCPP_TITLE_H

src/utility/comparators.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _UTILITY_COMPARATORS
-#define _UTILITY_COMPARATORS
+#ifndef NCMPCPP_UTILITY_COMPARATORS_H
+#define NCMPCPP_UTILITY_COMPARATORS_H
 
 #include <string>
 #include "exec_item.h"
@@ -81,4 +81,4 @@ public:
 	}
 };
 
-#endif // _UTILITY_COMPARATORS
+#endif // NCMPCPP_UTILITY_COMPARATORS_H

src/utility/html.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _UTILITY_HTML
-#define _UTILITY_HTML
+#ifndef NCMPCPP_UTILITY_HTML_H
+#define NCMPCPP_UTILITY_HTML_H
 
 #include <string>
 
@@ -27,4 +27,4 @@ std::string unescapeHtmlUtf8(const std::string &s);
 
 void stripHtmlTags(std::string &s);
 
-#endif // _UTILITY_HTML
+#endif // NCMPCPP_UTILITY_HTML_H

src/utility/numeric_conversions.h

@@ -21,8 +21,8 @@
 #include <string>
 #include "string.h"
 
-#ifndef _UTILITY_NUMERIC_CONVERSIONS_H
-#define _UTILITY_NUMERIC_CONVERSIONS_H
+#ifndef NCMPCPP_UTILITY_NUMERIC_CONVERSIONS_H
+#define NCMPCPP_UTILITY_NUMERIC_CONVERSIONS_H
 
 template <typename R> struct intTo { };
 template <> struct intTo<std::string> {
@@ -72,4 +72,4 @@ template <> struct unsignedLongIntTo<std::wstring> {
 	}
 };
 
-#endif // _UTILITY_NUMERIC_CONVERSIONS_H
+#endif // NCMPCPP_UTILITY_NUMERIC_CONVERSIONS_H

src/utility/string.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _UTILITY_STRING
-#define _UTILITY_STRING
+#ifndef NCMPCPP_UTILITY_STRING_H
+#define NCMPCPP_UTILITY_STRING_H
 
 #include <cstdarg>
 #include <locale>
@@ -80,4 +80,4 @@ std::string getEnclosedString(const std::string &s, char a, char b, size_t *pos)
 
 void removeInvalidCharsFromFilename(std::string &filename);
 
-#endif // _UTILITY_STRING
+#endif // NCMPCPP_UTILITY_STRING_H

src/utility/type_conversions.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _UTILITY_TYPE_CONVERSIONS
-#define _UTILITY_TYPE_CONVERSIONS
+#ifndef NCMPCPP_UTILITY_TYPE_CONVERSIONS_H
+#define NCMPCPP_UTILITY_TYPE_CONVERSIONS_H
 
 #include "mpdpp.h"
 #include "mutable_song.h"
@@ -32,4 +32,4 @@ MPD::Song::GetFunction charToGetFunction(char c);
 
 std::string itemTypeToString(MPD::ItemType type);
 
-#endif // _UTILITY_TYPE_CONVERSIONS
+#endif // NCMPCPP_UTILITY_TYPE_CONVERSIONS_H

src/utility/wide_string.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _UTILITY_WIDE_STRING
-#define _UTILITY_WIDE_STRING
+#ifndef NCMPCPP_UTILITY_WIDE_STRING_H
+#define NCMPCPP_UTILITY_WIDE_STRING_H
 
 #include <string>
 
@@ -31,4 +31,4 @@ size_t wideLength(const std::wstring &ws);
 void wideCut(std::wstring &ws, size_t max_length);
 std::wstring wideShorten(const std::wstring &ws, size_t max_length);
 
-#endif // _UTILITY_WIDE_STRING
+#endif // NCMPCPP_UTILITY_WIDE_STRING_h

src/visualizer.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _VISUALIZER_H
-#define _VISUALIZER_H
+#ifndef NCMPCPP_VISUALIZER_H
+#define NCMPCPP_VISUALIZER_H
 
 #include "config.h"
 
@@ -86,5 +86,5 @@ extern Visualizer *myVisualizer;
 
 #endif // ENABLE_VISUALIZER
 
-#endif
+#endif // NCMPCPP_VISUALIZER_H
 

src/window.h

@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _WINDOW_H
-#define _WINDOW_H
+#ifndef NCMPCPP_WINDOW_H
+#define NCMPCPP_WINDOW_H
 
 #include "config.h"
 
@@ -521,4 +521,4 @@ private:
 
 }
 
-#endif
+#endif // NCMPCPP_WINDOW_H