Remove explicit calls to curses.h in other files

7 files changed, 4 insertions, 7 deletions

diff --git a/CPUMeter.c b/CPUMeter.c
index b9d888ce..4ce47849 100644
--- a/CPUMeter.c
+++ b/CPUMeter.c
@@ -12,7 +12,6 @@ in the source distribution for its full text.
 
 #include <assert.h>
 #include <stdlib.h>
-#include <curses.h>
 #include <string.h>
 #include <math.h>
 
diff --git a/CRT.c b/CRT.c
index 3a1eb913..64a38120 100644
--- a/CRT.c
+++ b/CRT.c
@@ -9,8 +9,9 @@ in the source distribution for its full text.
 
 #include "config.h"
 #include "String.h"
+#include "RichString.h"
 
-#include <curses.h>
+#include <stdio.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdlib.h>
diff --git a/FunctionBar.c b/FunctionBar.c
index fb62823b..66b9843f 100644
--- a/FunctionBar.c
+++ b/FunctionBar.c
@@ -13,7 +13,6 @@ in the source distribution for its full text.
 #include <string.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include <curses.h>
 
 /*{
 #include "Object.h"
diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c
index f4f37c7e..b8fbfa64 100644
--- a/LoadAverageMeter.c
+++ b/LoadAverageMeter.c
@@ -9,7 +9,6 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 
-#include <curses.h>
 #include <assert.h>
 
 /*{
diff --git a/MemoryMeter.c b/MemoryMeter.c
index eca0442e..47f28af4 100644
--- a/MemoryMeter.c
+++ b/MemoryMeter.c
@@ -11,7 +11,6 @@ in the source distribution for its full text.
 #include "ProcessList.h"
 
 #include <stdlib.h>
-#include <curses.h>
 #include <string.h>
 #include <math.h>
 #include <sys/param.h>
diff --git a/Panel.c b/Panel.c
index 8a40ab61..70e84e20 100644
--- a/Panel.c
+++ b/Panel.c
@@ -18,7 +18,6 @@ in the source distribution for its full text.
 #include <ctype.h>
 #include <string.h>
 #include <assert.h>
-#include <curses.h>
 
 //#link curses
 
@@ -295,6 +294,7 @@ void Panel_draw(Panel* this, bool focus) {
 
       for(int i = first, j = 0; j < this->h && i < last; i++, j++) {
          Object* itemObj = Vector_get(this->items, i);
+         assert(itemObj); if(!itemObj) continue;
          RichString_begin(item);
          Object_display(itemObj, &item);
          int itemLen = RichString_sizeVal(item);
@@ -319,6 +319,7 @@ void Panel_draw(Panel* this, bool focus) {
 
    } else {
       Object* oldObj = Vector_get(this->items, this->oldSelected);
+      assert(oldObj);
       RichString_begin(old);
       Object_display(oldObj, &old);
       int oldLen = RichString_sizeVal(old);
diff --git a/SwapMeter.c b/SwapMeter.c
index df6dd666..ff229d3e 100644
--- a/SwapMeter.c
+++ b/SwapMeter.c
@@ -11,7 +11,6 @@ in the source distribution for its full text.
 #include "ProcessList.h"
 
 #include <stdlib.h>
-#include <curses.h>
 #include <string.h>
 #include <math.h>
 #include <sys/param.h>