String.h --> BString.h

24 files changed, 23 insertions, 22 deletions

diff --git a/include/String.h b/include/BString.h
index 948534e..948534e 100644
--- a/include/String.h
+++ b/include/BString.h
diff --git a/include/Confirm.h b/include/Confirm.h
index 3e215d3..ef1dabc 100644
--- a/include/Confirm.h
+++ b/include/Confirm.h
@@ -2,7 +2,7 @@
 #define __CONFIRM_H__
 
 #include <Action.h>
-#include <String.h>
+#include <BString.h>
 #include <Exceptions.h>
 
 class Confirm : public Action {
diff --git a/include/Exceptions.h b/include/Exceptions.h
index c9756c9..576f757 100644
--- a/include/Exceptions.h
+++ b/include/Exceptions.h
@@ -97,6 +97,6 @@ class Exit : public GeneralException {
     int code;
 };
 
-#include <String.h>
+#include <BString.h>
 
 #endif
diff --git a/include/Form.h b/include/Form.h
index b12e2b5..f0fa93f 100644
--- a/include/Form.h
+++ b/include/Form.h
@@ -2,7 +2,7 @@
 #define __FORM_H__
 
 #include <Action.h>
-#include <String.h>
+#include <BString.h>
 #include <Exceptions.h>
 
 class Form : public Action {
diff --git a/include/Handle.h b/include/Handle.h
index 920a634..998c126 100644
--- a/include/Handle.h
+++ b/include/Handle.h
@@ -6,7 +6,7 @@
 
 #include <zlib.h>
 #include <iostream>
-#include <String.h>
+#include <BString.h>
 #include <Exceptions.h>
 
 class Handle : public Base {
diff --git a/include/HttpServ.h b/include/HttpServ.h
index a0dd958..fc58246 100644
--- a/include/HttpServ.h
+++ b/include/HttpServ.h
@@ -2,7 +2,7 @@
 #define __HTTPSERV_H__
 
 #include <Socket.h>
-#include <String.h>
+#include <BString.h>
 #include <Variables.h>
 #include <Action.h>
 #include <Task.h>
diff --git a/include/IRC.h b/include/IRC.h
index 285d9bf..6823b21 100644
--- a/include/IRC.h
+++ b/include/IRC.h
@@ -3,6 +3,7 @@
 
 #include <Socket.h>
 #include <Exceptions.h>
+#include <BString.h>
 
 #define RPL_WELCOME		1
 #define RPL_YOURHOST		2
diff --git a/include/Input.h b/include/Input.h
index 80bd73e..bb740b0 100644
--- a/include/Input.h
+++ b/include/Input.h
@@ -3,7 +3,7 @@
 
 #include <sys/types.h>
 #include <time.h>
-#include <String.h>
+#include <BString.h>
 #include <Handle.h>
 
 class Input : public Handle {
diff --git a/include/Makefile.am b/include/Makefile.am
index 8f7579a..c8c5036 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,5 +1,5 @@
 pkginclude_HEADERS = \
-Exceptions.h Handle.h String.h Output.h Socket.h HttpServ.h Variables.h Menu.h \
+Exceptions.h Handle.h BString.h Output.h Socket.h HttpServ.h Variables.h Menu.h \
 Action.h Message.h Form.h Confirm.h Table.h IRC.h Task.h Buffer.h generic.h \
 CopyJob.h ReadJob.h Regex.h TaskMan.h InPipe.h OutPipe.h Input.h Image.h \
 Main.h Color.h
diff --git a/include/Menu.h b/include/Menu.h
index 461f5e2..91e1459 100644
--- a/include/Menu.h
+++ b/include/Menu.h
@@ -2,7 +2,7 @@
 #define __MENU_H__
 
 #include <Action.h>
-#include <String.h>
+#include <BString.h>
 #include <Exceptions.h>
 
 class Menu : public Action {
diff --git a/include/Message.h b/include/Message.h
index 2ee28e3..01c59da 100644
--- a/include/Message.h
+++ b/include/Message.h
@@ -2,7 +2,7 @@
 #define __MESSAGE_H__
 
 #include <Action.h>
-#include <String.h>
+#include <BString.h>
 #include <Exceptions.h>
 
 class Message : public Action {
diff --git a/include/Output.h b/include/Output.h
index 9e83845..3d97922 100644
--- a/include/Output.h
+++ b/include/Output.h
@@ -3,7 +3,7 @@
 
 #include <sys/types.h>
 #include <time.h>
-#include <String.h>
+#include <BString.h>
 #include <Handle.h>
 
 class Output : public Handle {
diff --git a/include/Regex.h b/include/Regex.h
index ce62028..b076342 100644
--- a/include/Regex.h
+++ b/include/Regex.h
@@ -2,7 +2,7 @@
 #define __REGEX_H__
 
 #include <Exceptions.h>
-#include <String.h>
+#include <BString.h>
 #include <regex.h>
 
 class Regex : public Base {
diff --git a/include/Socket.h b/include/Socket.h
index 055e512..245ed9e 100644
--- a/include/Socket.h
+++ b/include/Socket.h
@@ -2,7 +2,7 @@
 #define __SOCKET_H__
 
 #include <Handle.h>
-#include <String.h>
+#include <BString.h>
 #include <Output.h>
 #include <Input.h>
 #include <Exceptions.h>
diff --git a/include/Table.h b/include/Table.h
index 58336d0..c972fa3 100644
--- a/include/Table.h
+++ b/include/Table.h
@@ -2,7 +2,7 @@
 #define __TABLE_H__
 
 #include <Action.h>
-#include <String.h>
+#include <BString.h>
 #include <Exceptions.h>
 
 class Table : public Action {
diff --git a/include/Variables.h b/include/Variables.h
index 2bbc406..ac4ef58 100644
--- a/include/Variables.h
+++ b/include/Variables.h
@@ -2,7 +2,7 @@
 #define __VARIABLES_H__
 
 #include <vector>
-#include <String.h>
+#include <BString.h>
 #include <Handle.h>
 #include <Exceptions.h>
 
diff --git a/lib/Action.cc b/lib/Action.cc
index 72b6800..e5825b9 100644
--- a/lib/Action.cc
+++ b/lib/Action.cc
@@ -1,7 +1,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "String.h"
+#include "BString.h"
 #include "Action.h"
 #include "HttpServ.h"
 
diff --git a/lib/Exceptions.cc b/lib/Exceptions.cc
index 448d161..9fe52f6 100644
--- a/lib/Exceptions.cc
+++ b/lib/Exceptions.cc
@@ -14,7 +14,7 @@
 #ifdef HAVE_PIPE
 #include <unistd.h>
 #endif
-#include "String.h"
+#include "BString.h"
 #include "Exceptions.h"
 #include "generic.h"
 #include "gettext.h"
diff --git a/lib/IRC.cc b/lib/IRC.cc
index 7fc4c0f..f29b2c1 100644
--- a/lib/IRC.cc
+++ b/lib/IRC.cc
@@ -1,7 +1,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "String.h"
+#include "BString.h"
 #include "IRC.h"
 #include "HttpServ.h"
 
diff --git a/lib/Socket.cc b/lib/Socket.cc
index 5d09a1a..dd3d3fb 100644
--- a/lib/Socket.cc
+++ b/lib/Socket.cc
@@ -9,7 +9,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "String.h"
+#include "BString.h"
 #include "Socket.h"
 #include "Exceptions.h"
 #include "Input.h"
diff --git a/lib/String.cc b/lib/String.cc
index 510a84e..4367ebc 100644
--- a/lib/String.cc
+++ b/lib/String.cc
@@ -5,7 +5,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "String.h"
+#include "BString.h"
 #include "Exceptions.h"
 
 char ** gruikptr;
diff --git a/lib/Task.cc b/lib/Task.cc
index 88f17fa..afa697c 100644
--- a/lib/Task.cc
+++ b/lib/Task.cc
@@ -5,7 +5,7 @@
 #endif
 #include "TaskMan.h"
 #include "Task.h"
-#include "String.h"
+#include "BString.h"
 #include "gettext.h"
 
 Task::Task() : current(0), state(TASK_ON_HOLD), stopped(false), suspended(false), wbta(0) {
diff --git a/lib/Variables.cc b/lib/Variables.cc
index cc67396..94c4c27 100644
--- a/lib/Variables.cc
+++ b/lib/Variables.cc
@@ -3,7 +3,7 @@
 #endif
 #include "Variables.h"
 #include "HttpServ.h"
-#include "String.h"
+#include "BString.h"
 
 Variables::Variables(int nb) : Vars(nb), nbvars(nb) { }
 
diff --git a/lib/generic.cc b/lib/generic.cc
index 0eb5bb2..1f6b61d 100644
--- a/lib/generic.cc
+++ b/lib/generic.cc
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "String.h"
+#include "BString.h"
 
 char verbosity = 0;