Renamed String.h and String.cpp to ZNCString.h and ZNCString.cpp

and updated all references to these files.

This became neccessary to solve problems on case-insensitive file-systems like Windows and MacOS X.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1202 726aef4b-f618-498e-8847-2d620e286838

Buffer.h

@@ -9,7 +9,7 @@
 #ifndef _BUFFER_H
 #define _BUFFER_H
 
-#include "String.h"
+#include "ZNCString.h"
 #include <vector>
 
 using std::vector;

Chan.h

@@ -11,7 +11,7 @@
 
 #include "FileUtils.h"
 #include "Nick.h"
-#include "String.h"
+#include "ZNCString.h"
 #include <map>
 #include <set>
 #include <vector>

FileUtils.h

@@ -10,7 +10,7 @@
 #define _FILEUTILS_H
 
 #include "Csocket.h"
-#include "String.h"
+#include "ZNCString.h"
 #include <dirent.h>
 #include <map>
 #include <signal.h>

Makefile.in

@@ -13,7 +13,7 @@ LDFLAGS  := @LDFLAGS@
 INCLUDES := @INCLUDES@
 LIBS     := @LIBS@
 
-SRCS := String.cpp Csocket.cpp main.cpp znc.cpp User.cpp IRCSock.cpp Client.cpp DCCBounce.cpp \
+SRCS := ZNCString.cpp Csocket.cpp main.cpp znc.cpp User.cpp IRCSock.cpp Client.cpp DCCBounce.cpp \
 	DCCSock.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp MD5.cpp Buffer.cpp Utils.cpp \
 	FileUtils.cpp HTTPSock.cpp Template.cpp ClientCommand.cpp
 OBJS := $(patsubst %cpp,%o,$(SRCS))

Nick.h

@@ -9,7 +9,7 @@
 #ifndef _NICK_H
 #define _NICK_H
 
-#include "String.h"
+#include "ZNCString.h"
 #include <set>
 #include <vector>
 

Server.h

@@ -9,7 +9,7 @@
 #ifndef _SERVER_H
 #define _SERVER_H
 
-#include "String.h"
+#include "ZNCString.h"
 
 class CServer {
 public:

Utils.h

@@ -9,7 +9,7 @@
 #ifndef _UTILS_H
 #define _UTILS_H
 
-#include "String.h"
+#include "ZNCString.h"
 #include <assert.h>
 #include <map>
 #include <sys/file.h>

ZNCString.cpp

@@ -6,7 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "String.h"
+#include "ZNCString.h"
 #include "FileUtils.h"
 #include "MD5.h"
 #include "Utils.h"
@@ -1102,17 +1102,3 @@ CString& MCString::Decode(CString& sValue) {
 	sValue = sTmp;
 	return sValue;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-

ZNCString.h

@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#ifndef X_STRING_H
-#define X_STRING_H
+#ifndef ZNCSTRING_H
+#define ZNCSTRING_H
 
 #include <map>
 #include <set>
@@ -181,4 +181,4 @@ public:
 	virtual CString& Decode(CString& sValue);
 };
 
-#endif // !X_STRING_H
+#endif // !ZNCSTRING_H

main.h

@@ -68,6 +68,6 @@ using std::endl;
 #warning PATH_MAX is undefined
 #endif
 
-#include "String.h"
+#include "ZNCString.h"
 
 #endif // !_MAIN_H