diff options
| -rw-r--r-- | DESIGN | 6 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | command.c | 2 | ||||
| -rw-r--r-- | input_win.c | 2 | ||||
| -rw-r--r-- | jabber.c | 2 | ||||
| -rw-r--r-- | profanity.c | 2 | ||||
| -rw-r--r-- | status_bar.c | 2 | ||||
| -rw-r--r-- | title_bar.c | 3 | ||||
| -rw-r--r-- | ui.h (renamed from windows.h) | 2 | ||||
| -rw-r--r-- | windows.c | 2 |
10 files changed, 18 insertions, 17 deletions
diff --git a/DESIGN b/DESIGN index bce5f884..168f516f 100644 --- a/DESIGN +++ b/DESIGN @@ -37,11 +37,11 @@ These represent the different windows in Ncurses. | INPUT_WIN | +----------------------------------------------+ -The interface to the UI is all through windows.h, all UI modules share this +The interface to the UI is all through ui.h, all UI modules share this header: - windows.h + ui.h | | -------------------------------------------------- @@ -50,7 +50,7 @@ header: -So any calls to the UI are through windows.h +So any calls to the UI are through ui.h title_bar.c and status_bar.c are relatively trivial. diff --git a/Makefile b/Makefile index 744c91ed..3bb14787 100644 --- a/Makefile +++ b/Makefile @@ -17,12 +17,12 @@ profanity: $(OBJS) common.o: common.h log.o: log.h -windows.o: windows.h util.h contact_list.h preferences.h -title_bar.o: windows.h -status_bar.o: windows.h util.h -input_win.o: windows.h preferences.h -jabber.o: jabber.h log.h windows.h contact_list.h -profanity.o: log.h windows.h jabber.h command.h preferences.h \ +windows.o: ui.h util.h contact_list.h preferences.h +title_bar.o: ui.h +status_bar.o: ui.h util.h +input_win.o: ui.h preferences.h +jabber.o: jabber.h log.h ui.h contact_list.h +profanity.o: log.h ui.h jabber.h command.h preferences.h \ contact_list.h util.o: util.h command.o: command.h util.h history.h contact_list.h diff --git a/command.c b/command.c index d963b1eb..2d5ebf3b 100644 --- a/command.c +++ b/command.c @@ -29,7 +29,7 @@ #include "contact_list.h" #include "history.h" #include "jabber.h" -#include "windows.h" +#include "ui.h" #include "util.h" #include "preferences.h" diff --git a/input_win.c b/input_win.c index 115fc0e8..b4e14aa1 100644 --- a/input_win.c +++ b/input_win.c @@ -41,7 +41,7 @@ #include <ncurses.h> -#include "windows.h" +#include "ui.h" #include "history.h" #include "preferences.h" diff --git a/jabber.c b/jabber.c index 6d55d620..9e61b1f5 100644 --- a/jabber.c +++ b/jabber.c @@ -26,7 +26,7 @@ #include "jabber.h" #include "log.h" #include "contact_list.h" -#include "windows.h" +#include "ui.h" #include "util.h" #include "preferences.h" diff --git a/profanity.c b/profanity.c index 7cbf5d0f..bd93467c 100644 --- a/profanity.c +++ b/profanity.c @@ -26,7 +26,7 @@ #include "profanity.h" #include "log.h" -#include "windows.h" +#include "ui.h" #include "jabber.h" #include "command.h" #include "preferences.h" diff --git a/status_bar.c b/status_bar.c index 84d6b306..cf8aad53 100644 --- a/status_bar.c +++ b/status_bar.c @@ -25,7 +25,7 @@ #include <ncurses.h> -#include "windows.h" +#include "ui.h" #include "util.h" #include "preferences.h" diff --git a/title_bar.c b/title_bar.c index 113895d8..2b0e08b5 100644 --- a/title_bar.c +++ b/title_bar.c @@ -23,7 +23,8 @@ #include <stdlib.h> #include <string.h> #include <ncurses.h> -#include "windows.h" + +#include "ui.h" static WINDOW *title_bar; static char *current_title = NULL; diff --git a/windows.h b/ui.h index 920142d7..42d2b764 100644 --- a/windows.h +++ b/ui.h @@ -1,5 +1,5 @@ /* - * windows.h + * ui.h * * Copyright (C) 2012 James Booth <boothj5@gmail.com> * diff --git a/windows.c b/windows.c index 2bc8a175..ae6f381f 100644 --- a/windows.c +++ b/windows.c @@ -26,7 +26,7 @@ #include <ncurses.h> #include <glib.h> -#include "windows.h" +#include "ui.h" #include "util.h" #include "contact.h" #include "preferences.h" |