colors: colors_update_pair(), colors_start() and colors_use() return void

[ncmpc.git] / src / colors.h

diff --git a/src/colors.h b/src/colors.h
index f7caae020c8d9c450a41cecc1900afdcf0c54aa6..c166c363be4378e7c774eff76cc099a1b50a78a0 100644 (file)
--- a/src/colors.h
+++ b/src/colors.h
@@ -1,38 +1,35 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #ifndef COLORS_H
 #define COLORS_H
 
 #include "config.h"
-
-#ifdef HAVE_NCURSESW_NCURSES_H
-#include <ncursesw/ncurses.h>
-#else
-#include <ncurses.h>
-#endif
+#include "ncmpc_curses.h"
+#include "Compiler.h"
 
 enum color {
        COLOR_TITLE = 1,
        COLOR_TITLE_BOLD,
        COLOR_LINE,
        COLOR_LINE_BOLD,
+       COLOR_LINE_FLAGS,
        COLOR_LIST,
        COLOR_LIST_BOLD,
        COLOR_PROGRESSBAR,
@@ -46,14 +43,18 @@ enum color {
        COLOR_END
 };
 
+gcc_pure
 int colors_str2color(const char *str);
 
 #ifdef ENABLE_COLORS
 int colors_assign(const char *name, const char *value);
 int colors_define(const char *name, short r, short g, short b);
-int colors_start(void);
+
+void
+colors_start(void);
 #endif
 
-int colors_use(WINDOW *w, enum color id);
+void
+colors_use(WINDOW *w, enum color id);
 
 #endif /* COLORS_H */