Changeset 2348 for trunk/rms

Timestamp:

11/03/00 02:57:58 (8 years ago)

Author:

graham

Message:

Removed CICQEventTag class and just use event ids from the event. Much
much better this way.

Location:

trunk/rms/src

Files:

• rms.cpp (modified) (5 diffs)
• rms.h (modified) (1 diff)

trunk/rms/src/rms.cpp

@@ -381 +381 @@
   for (iter = tags.begin(); iter != tags.end(); iter++)
   {
-    if ( (*iter)->Equals(e) ) break;
+    if ( e->Equals(*iter) ) break;
   }
   if (iter == tags.end()) return false;
 
-  CICQEventTag *tag = *iter;
+  unsigned long tag = *iter;
   tags.erase(iter);
 
@@ -414 +414 @@
       break;
   }
-  fprintf(fs, "%d [%ld] Event %s.\n", nCode, tag->EventId(), szr);
+  fprintf(fs, "%d [%ld] Event %s.\n", nCode, tag, szr);
   fflush(fs);
-  delete tag;
 
   return true;
@@ -642 +641 @@
   bool b = o->StatusOffline();
   gUserManager.DropOwner();
-  CICQEventTag *tag = NULL;
+  unsigned long tag = 0;
   if (b)
   {
     tag = licqDaemon->icqLogon(nStatus);
-    fprintf(fs, "%d [%ld] Logging on.\n", CODE_COMMANDxSTART, tag->EventId());
+    fprintf(fs, "%d [%ld] Logging on.\n", CODE_COMMANDxSTART, tag);
   }
   else
   {
     tag = licqDaemon->icqSetStatus(nStatus);
-    fprintf(fs, "%d [%ld] Setting status.\n", CODE_COMMANDxSTART, tag->EventId());
+    fprintf(fs, "%d [%ld] Setting status.\n", CODE_COMMANDxSTART, tag);
   }
   tags.push_back(tag);
@@ -827 +826 @@
 int CRMSClient::Process_MESSAGE_text()
 {
-  CICQEventTag *tag = licqDaemon->icqSendMessage(m_nUin, m_szText, false, ICQ_TCPxMSG_NORMAL);
+  unsigned long tag = licqDaemon->icqSendMessage(m_nUin, m_szText, false, ICQ_TCPxMSG_NORMAL);
 
   fprintf(fs, "%d [%ld] Sending message to %ld.\n", CODE_COMMANDxSTART,
-     tag->EventId(), m_nUin);
+     tag, m_nUin);
 
   tags.push_back(tag);
@@ -894 +893 @@
 int CRMSClient::Process_URL_text()
 {
-  CICQEventTag *tag = licqDaemon->icqSendUrl(m_nUin, m_szLine, m_szText, false, ICQ_TCPxMSG_NORMAL);
+  unsigned long tag = licqDaemon->icqSendUrl(m_nUin, m_szLine, m_szText, false, ICQ_TCPxMSG_NORMAL);
 
   fprintf(fs, "%d [%ld] Sending URL to %ld.\n", CODE_COMMANDxSTART,
-     tag->EventId(), m_nUin);
+     tag, m_nUin);
 
   tags.push_back(tag);

trunk/rms/src/rms.h

@@ -21 +21 @@
 
 typedef list<class CRMSClient *> ClientList;
-typedef list<class CICQEventTag *> TagList;
+typedef list<unsigned long> TagList;
 
 class CLicqRMS