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

[irc/gameservirc.git] / gameserv / news.cpp

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;