More tokenizers

diff --git a/daphne/send_express.cpp b/daphne/send_express.cpp
index 97a1e3c22516328114844bd9729150b47b3c9696..eb38a1838d3db646b135026f7f26aef5eef3ca66 100644 (file)
--- a/daphne/send_express.cpp
+++ b/daphne/send_express.cpp
@@ -168,9 +168,10 @@ SendExpress::SendExpress(  CitClient *sock,
                ToWhom->Append(touser);
                ToWhom->SetSelection(0, TRUE);
        } else {
-               while (pos = xferbuf.Find('\n', FALSE),  (pos >= 0) ) {
-                       buf = xferbuf.Left(pos);
-                       xferbuf = xferbuf.Mid(pos+1);
+               wxStringTokenizer *wl =
+                       new wxStringTokenizer(xferbuf, "\n", FALSE);
+               while (wl->HasMoreToken()) {
+                       buf = wl->NextToken();
                        extract(user, buf, 1);
                        ToWhom->Append(user);
                }

diff --git a/daphne/who.cpp b/daphne/who.cpp
index d54725c0c700f7695ea3cbc2b5bc90da71221d9e..ca1c0e211e574e9e816c8d008bd6db1828e7dcce 100644 (file)
--- a/daphne/who.cpp
+++ b/daphne/who.cpp
@@ -90,14 +90,15 @@ void who::LoadWholist(void) {
        wxString rwho;
        int i, pos;
        wxString sess, user, room, host;
+       wxStringTokenizer *wl;
 
        sendcmd = "RWHO";
        if (citsock->serv_trans(sendcmd, recvcmd, rwho) != 1) return;
        wholist->DeleteAllItems();
 
-       while (pos = rwho.Find('\n', FALSE), (pos >= 0)) {
-               buf = rwho.Left(pos);
-               rwho = rwho.Mid(pos+1);
+       wl = new wxStringTokenizer(rwho, "\n", FALSE);
+       while (wl->HasMoreToken()) {
+               buf = wl->NextToken();
                extract(sess, buf, 0);
                extract(user, buf, 1);
                extract(room, buf, 2);