8:10 a.m.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/tui/input.c | 5 ++---
src/tui/input.h | 2 --
src/tui/labels.c | 4 ++--
src/tui/labels.h | 2 --
src/tui/listbox.c | 6 ++----
src/tui/listbox.h | 2 --
src/tui/menurt.c | 7 ++-----
src/tui/msgboxes.c | 4 ++--
src/tui/txbox.c | 2 +-
src/tui/winops.c | 4 ----
src/tui/winops.h | 1 -
11 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/src/tui/input.c b/src/tui/input.c
index 40ec42a..ba4a0cf 100644
--- a/src/tui/input.c
+++ b/src/tui/input.c
@@ -6,9 +6,8 @@ input.c - a custom keyboard input module
***/
-#include <curses.h>
-#include <panel.h>
-#include <ctype.h>
+#include "iptraf-ng-compat.h"
+
#include "input.h"
void tx_initfields(struct FIELDLIST *list, int leny, int lenx, int begy,
diff --git a/src/tui/input.h b/src/tui/input.h
index 26d2912..f8a78b5 100644
--- a/src/tui/input.h
+++ b/src/tui/input.h
@@ -7,8 +7,6 @@ input.h - structure declarations and function prototypes for input.c
***/
-#include <string.h>
-#include <stdlib.h>
#include "winops.h"
#define CTRL_X 24
diff --git a/src/tui/labels.c b/src/tui/labels.c
index 654d026..8ce04b6 100644
--- a/src/tui/labels.c
+++ b/src/tui/labels.c
@@ -5,8 +5,8 @@
* user interface library
*/
-#include <curses.h>
-#include <panel.h>
+#include "iptraf-ng-compat.h"
+
#include "winops.h"
void tx_printkeyhelp(char *keytext, char *desc, WINDOW * win, int highattr,
diff --git a/src/tui/labels.h b/src/tui/labels.h
index 3073763..4be8232 100644
--- a/src/tui/labels.h
+++ b/src/tui/labels.h
@@ -1,8 +1,6 @@
#ifndef IPTRAF_NG_TUI_LABELS_H
#define IPTRAF_NG_TUI_LABELS_H
-#include <curses.h>
-
void tx_printkeyhelp(char *keytext, char *desc, WINDOW * win, int highattr,
int textattr);
void tx_menukeyhelp(int textattr, int highattr);
diff --git a/src/tui/listbox.c b/src/tui/listbox.c
index 7e1e336..a867d95 100644
--- a/src/tui/listbox.c
+++ b/src/tui/listbox.c
@@ -4,10 +4,8 @@
* listbox.c - scrollable listbox management module
*/
-#include <curses.h>
-#include <panel.h>
-#include <string.h>
-#include <stdlib.h>
+#include "iptraf-ng-compat.h"
+
#include "winops.h"
#include "labels.h"
#include "listbox.h"
diff --git a/src/tui/listbox.h b/src/tui/listbox.h
index 2ba8430..75637ff 100644
--- a/src/tui/listbox.h
+++ b/src/tui/listbox.h
@@ -1,8 +1,6 @@
#ifndef IPTRAF_NG_TUI_LISTBOX_H
#define IPTRAF_NG_TUI_LISTBOX_H
-#include <curses.h>
-
#define MAX_TEXT_LENGTH 240
struct textlisttype {
diff --git a/src/tui/menurt.c b/src/tui/menurt.c
index b64a4c1..aa7f654 100644
--- a/src/tui/menurt.c
+++ b/src/tui/menurt.c
@@ -6,11 +6,8 @@ menurt.c - ncurses-based menu definition module
***/
-#include <curses.h>
-#include <panel.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
+#include "iptraf-ng-compat.h"
+
#include "menurt.h"
#include "winops.h"
#include "labels.h"
diff --git a/src/tui/msgboxes.c b/src/tui/msgboxes.c
index cfd075e..9b17bc4 100644
--- a/src/tui/msgboxes.c
+++ b/src/tui/msgboxes.c
@@ -4,8 +4,8 @@
* msgboxes.c - message and error box display functions
*/
-#include <curses.h>
-#include <panel.h>
+#include "iptraf-ng-compat.h"
+
#include "winops.h"
int ERR_BORDER_ATTR;
diff --git a/src/tui/txbox.c b/src/tui/txbox.c
index 402c23a..c71e081 100644
--- a/src/tui/txbox.c
+++ b/src/tui/txbox.c
@@ -11,7 +11,7 @@
* The tx_box function is a drop-in replacement for box().
*/
-#include <curses.h>
+#include "iptraf-ng-compat.h"
void tx_box(WINDOW * win, int vline, int hline)
{
diff --git a/src/tui/winops.c b/src/tui/winops.c
index a0c0e6b..f130ab1 100644
--- a/src/tui/winops.c
+++ b/src/tui/winops.c
@@ -6,10 +6,6 @@ winops.c - screen configuration and setup functions
***/
-#include <curses.h>
-#include <stdlib.h>
-#include <string.h>
-
#include "iptraf-ng-compat.h"
void tx_stdwinset(WINDOW * win)
diff --git a/src/tui/winops.h b/src/tui/winops.h
index 53f7038..9036d6b 100644
--- a/src/tui/winops.h
+++ b/src/tui/winops.h
@@ -8,7 +8,6 @@ for IPTraf
***/
-#include <curses.h>
#define tx_coloreol() tx_wcoloreol(stdscr)
void tx_stdwinset(WINDOW * win);
--
1.7.8.4