Removed myString class and replaced with use of the STL string class...

much cleaner code, and a smaller package altogether.

git-svn-id: https://svn.code.sf.net/p/gameservirc/code/trunk@296 bc333340-6410-0410-a689-9d09f3c113fa

diff --git a/gameserv/.depend b/gameserv/.depend
index 6e2412c7613f0e299749921a228fe0d23d2370d3..328cfae54855e6864f77b43209c2595fe359bddd 100644 (file)
--- a/gameserv/.depend
+++ b/gameserv/.depend
@@ -1,23 +1,33 @@
+# 1 "/home/wolfchat/gameserv//"
 aClient.o: aClient.cpp aClient.h options.h player.h pouch.h extern.h \
-  level.h list.h listnode.h config.h myString.h
+  level.h list.h listnode.h config.h
+# 1 "/home/wolfchat/gameserv//"
 config.o: config.cpp extern.h player.h aClient.h options.h pouch.h \
-  level.h list.h listnode.h config.h myString.h flags.h
+  level.h list.h listnode.h config.h flags.h
+# 1 "/home/wolfchat/gameserv//"
 c_forest.o: c_forest.cpp sockhelp.h aClient.h options.h player.h pouch.h \
-  list.h listnode.h extern.h level.h config.h myString.h flags.h
+  list.h listnode.h extern.h level.h config.h flags.h
+# 1 "/home/wolfchat/gameserv//"
 gameserv.o: gameserv.cpp aClient.h options.h player.h pouch.h config.h \
-  extern.h level.h list.h listnode.h myString.h flags.h sockhelp.h
+  extern.h level.h list.h listnode.h flags.h sockhelp.h
+# 1 "/home/wolfchat/gameserv//"
 hash.o: hash.cpp extern.h player.h aClient.h options.h pouch.h level.h \
-  list.h listnode.h config.h myString.h
+  list.h listnode.h config.h
+# 1 "/home/wolfchat/gameserv//"
 level.o: level.cpp extern.h player.h aClient.h options.h pouch.h level.h \
-  list.h listnode.h config.h myString.h
+  list.h listnode.h config.h
+# 1 "/home/wolfchat/gameserv//"
 log.o: log.cpp extern.h player.h aClient.h options.h pouch.h level.h \
-  list.h listnode.h config.h myString.h
-myString.o: myString.cpp myString.h
+  list.h listnode.h config.h
+# 1 "/home/wolfchat/gameserv//"
 news.o: news.cpp extern.h player.h aClient.h options.h pouch.h level.h \
-  list.h listnode.h config.h myString.h
+  list.h listnode.h config.h
+# 1 "/home/wolfchat/gameserv//"
 player.o: player.cpp player.h aClient.h options.h pouch.h extern.h \
-  level.h list.h listnode.h config.h myString.h flags.h
+  level.h list.h listnode.h config.h flags.h
+# 1 "/home/wolfchat/gameserv//"
 sockhelp.o: sockhelp.cpp sockhelp.h extern.h player.h aClient.h options.h \
-  pouch.h level.h list.h listnode.h config.h myString.h
+  pouch.h level.h list.h listnode.h config.h
+# 1 "/home/wolfchat/gameserv//"
 tcpclient.o: tcpclient.cpp sockhelp.h options.h list.h listnode.h \
-  aClient.h player.h pouch.h extern.h level.h config.h myString.h flags.h
+  aClient.h player.h pouch.h extern.h level.h config.h flags.h

diff --git a/gameserv/Makefile.in b/gameserv/Makefile.in
index 909227061e5fd18f2fa0a579962e15dbb1d4a910..ef1102a55214264e37a9af059b6910b4699bd0bd 100644 (file)
--- a/gameserv/Makefile.in
+++ b/gameserv/Makefile.in
@@ -25,7 +25,6 @@ SRCS =        aClient.cpp \
        hash.cpp \
        level.cpp \
        log.cpp \
-       myString.cpp \
        news.cpp \
        player.cpp \
        sockhelp.cpp \

diff --git a/gameserv/extern.h b/gameserv/extern.h
index fbf0b0047afe81b492caea0453aa93dd11e4403e..c800e17e5f3a533bfe9dd3c338028ff69b4cecd4 100644 (file)
--- a/gameserv/extern.h
+++ b/gameserv/extern.h
@@ -12,7 +12,6 @@
 #include "level.h"
 #include "list.h"
 #include "config.h"
-#include "myString.h"
 #include "options.h"
 
 #if TIME_WITH_SYS_TIME
@@ -84,7 +83,7 @@ E int idlecheckperiod;
 
 E List<aClient> players[U_TABLE_SIZE];
 E List<aClient> clients[U_TABLE_SIZE];
-E List<myString> todaysnews;
+E List<string> todaysnews;
 E Monster boss;
 
 /** tcpclient.cpp **/
@@ -109,12 +108,12 @@ E void notice(const char *source, const char *dest, const char *fmt, ...);
 E void raw(const char *fmt, ...);
 
 /** news.cpp **/
-E void addNews(List<myString> &news, const char *fmt, ...);
+E void addNews(List<string> &news, const char *fmt, ...);
 E void do_news(char *u);
-E void clearNews(List<myString> &news);
-E void loadNews(char *filename, List<myString> &news);
-E void saveNews(char *filename, List<myString> &news);
-E void showNews(char *nick, List<myString> &news);
+E void clearNews(List<string> &news);
+E void loadNews(char *filename, List<string> &news);
+E void saveNews(char *filename, List<string> &news);
+E void showNews(char *nick, List<string> &news);
 
 /** gameserv.cpp **/
 E void gameserv(char *source, char *buf);

diff --git a/gameserv/myString.cpp b/gameserv/myString.cpp
deleted file mode 100644 (file)
index 62637ab..0000000
--- a/gameserv/myString.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "myString.h"
-#include <iostream>
-using std::cout;
-using std::endl;
-
-myString::myString(char *s)
-{
-    setString(s);
-}
-
-myString::myString(const myString &right)
-{
-    setString(&right);
-}
-
-myString::~myString()
-{
-    if (string)
-       delete [] string;
-
-    string = NULL;
-}
-
-void myString::setString(char *s)
-{
-    if (!s)
-    {
-       if (string)
-           delete [] string;
-
-       string = NULL;
-    }
-    else
-    {
-       string = new char[strlen(s) + 1];
-       memset(string, 0, (strlen(s) + 1));
-       strcpy(string, s);
-    }    
-}
-
-void myString::setString(const myString *right)
-{
-    setString(right->string);
-}

diff --git a/gameserv/myString.h b/gameserv/myString.h
deleted file mode 100644 (file)
index 7a6268c..0000000
--- a/gameserv/myString.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef MYSTRING_H
-#define MYSTRING_H
-#include <string.h>
-
-class myString {
-public:
-    myString(char *s);
-    myString(const myString &right);
-    ~myString();
-    void setString(char *s);
-    void setString(const myString *right);
-    char *getString() { return string; };
-    unsigned int len() { return strlen(string); };
-    bool isNULL() { return string == NULL; };
-
-private:
-    char *string;
-};
-
-#endif

diff --git a/gameserv/news.cpp b/gameserv/news.cpp
index 57b7c561e1e3417edad4b206d089268f414c951b..ab51e6d6f95323ca4eb6880c32e567929b6c8ee9 100644 (file)
--- a/gameserv/news.cpp
+++ b/gameserv/news.cpp
@@ -1,18 +1,21 @@
 #include "extern.h"
 #include <fstream>
+#include <string>
 #include <stdio.h>
 
 using std::ofstream;
 using std::ifstream;
 
-List<myString> todaysnews;
-void addNews(List<myString> &news, const char *fmt, ...);
-void clearNews(List<myString> &news) {news.deleteNodes();};
-void showNews(char *nick, List<myString> &news);
-void saveNews(char *filename, List<myString> &news);
-void loadNews(char *filename, List<myString> &news);
+using namespace std;
 
-void addNews(List<myString> &news, const char *fmt, ...)
+List<string> todaysnews;
+void addNews(List<string> &news, const char *fmt, ...);
+void clearNews(List<string> &news) {news.deleteNodes();};
+void showNews(char *nick, List<string> &news);
+void saveNews(char *filename, List<string> &news);
+void loadNews(char *filename, List<string> &news);
+
+void addNews(List<string> &news, const char *fmt, ...)
 {
     if (fmt[0] == '\0')
         return;
@@ -49,8 +52,8 @@ void addNews(List<myString> &news, const char *fmt, ...)
     #endif
 
     notice(s_GameServ, c_Forest, "News Flash: %s", input);
-    myString *nstring;
-    nstring = new myString(input);
+    string *nstring;
+    nstring = new string(input);
     news.insertAtBack(nstring);
 
     delete [] input;
@@ -59,24 +62,24 @@ void addNews(List<myString> &news, const char *fmt, ...)
 va_end(args);
 }
 
-void showNews(char *nick, List<myString> &news)
+void showNews(char *nick, List<string> &news)
 {
     if (!news.isEmpty())
     {
-       ListNode<myString> *it;
+       ListNode<string> *it;
        it = news.First();
 
        notice(s_GameServ, nick, "The Daily Happenings: ");
        while (it)
        {
-           notice(s_GameServ, nick, "%s", it->getData()->getString());
+           notice(s_GameServ, nick, "%s", it->getData()->c_str());
            it = it->Next();
        }
        notice(s_GameServ, nick, "End of News");
     }
 }
 
-void saveNews(char *filename, List<myString> &news)
+void saveNews(char *filename, List<string> &news)
 {
     ofstream outfile;
     outfile.open(filename);
@@ -87,20 +90,20 @@ void saveNews(char *filename, List<myString> &news)
        return;
     }
 
-    ListNode<myString> *it;
+    ListNode<string> *it;
     it = news.First();
     while (it)
     {
-       outfile << it->getData()->getString() << endl;
+       outfile << it->getData()->c_str() << endl;
        it = it->Next();
     }
     outfile.close();
 }
 
-void loadNews(char *filename, List<myString> &news)
+void loadNews(char *filename, List<string> &news)
 {
     // First clear the old news out
-    ListNode<myString> *it, *temp;
+    ListNode<string> *it, *temp;
     it = news.First();
 
     while (it)
@@ -120,7 +123,7 @@ void loadNews(char *filename, List<myString> &news)
     }
 
     char *buf;
-    myString *string;
+    string *str;
     buf = new char [1024];
 
     while (infile.getline(buf, 1024, '\n'))
@@ -130,9 +133,9 @@ void loadNews(char *filename, List<myString> &news)
            delete [] buf;
            return;
        }
-       string = new myString(buf);
-       news.insertAtBack(string);
-       delete string;
+       str = new string(buf);
+       news.insertAtBack(str);
+       delete str;
     }
 
     delete [] buf;