Changeset 6419

Timestamp:

07/04/08 06:16:26 (3 months ago)

Author:

flynd

Message:

Marked deprecated functions in icqd and chat.

Location:

trunk/licq

Files:

• include/licq_chat.h (modified) (10 diffs)
• include/licq_icqd.h (modified) (12 diffs)
• src/icqd-chat.cpp (modified) (20 diffs)

trunk/licq/include/licq_chat.h

@@ -2 +2 @@
 #define CHAT_H
 
+#include <cstdlib>
 #include <deque>
 #include <list>
@@ -8 +9 @@
 #include "licq_socket.h"
 class CICQDaemon;
+
+// Define for marking functions as deprecated
+#ifndef LICQ_DEPRECATED
+# if defined(__GNUC__) && !defined(__INTEL_COMPILER) && (__GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2))
+#  define LICQ_DEPRECATED __attribute__ ((__deprecated__))
+# elif defined(_MSC_VER) && (_MSC_VER >= 1300)
+#  define LICQ_DEPRECATED __declspec(deprecated)
+# else
+#  define LICQ_DEPRECATED
+# endif
+#endif
 
 
@@ -201 +213 @@
   // Accessors
   const char *Name() { return m_szName; }
-  unsigned long Uin() { return m_nUin; }
   char *Id() { return m_szId; }
   unsigned long PPID() { return m_nPPID; }
@@ -214 +225 @@
   virtual ~CPChat_Color();
 
-protected:
-  unsigned long m_nUin;
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED unsigned long Uin() { return strtoul(m_szId, NULL, 10); }
+
+protected:
   char *m_szId;
   unsigned long m_nPPID;
@@ -250 +263 @@
   unsigned long m_nVersion;
   unsigned short m_nPort;
-  unsigned long m_nUin;
   char *m_szId;
   unsigned long m_nPPID;
@@ -292 +304 @@
   // Accessors
   const char *Name() { return m_szName; }
-  unsigned long Uin() { return m_nUin; }
   char *Id() { return m_szId; }
   unsigned long PPID() { return m_nPPID; }
@@ -314 +325 @@
   ChatClientList &ChatClients()  { return chatClients; }
 
-protected:
-  unsigned long m_nUin;
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED unsigned long Uin() { return strtoul(m_szId, NULL, 10); }
+
+protected:
   char *m_szId;
   unsigned long m_nPPID;
@@ -475 +488 @@
 {
 public:
-  unsigned long Uin()          { return uin; }
   char *Id()                   { return szId; }
   unsigned long PPID()         { return nPPID; }
@@ -495 +507 @@
   ~CChatUser();
 
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED unsigned long Uin()          { return strtoul(szId, NULL, 10); }
+
 protected:
   CChatUser();
 
-  unsigned long uin;
   char *szId;
   unsigned long nPPID;
@@ -621 +635 @@
   CICQDaemon *licqDaemon;
   int pipe_events[2], pipe_thread[2];
-  unsigned long m_nUin;
   char *m_szId;
   unsigned long m_nPPID;

trunk/licq/include/licq_icqd.h

@@ -37 +37 @@
 class CMSN;
 
+// Define for marking functions as deprecated
+#ifndef LICQ_DEPRECATED
+# if defined(__GNUC__) && !defined(__INTEL_COMPILER) && (__GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2))
+#  define LICQ_DEPRECATED __attribute__ ((__deprecated__))
+# elif defined(_MSC_VER) && (_MSC_VER >= 1300)
+#  define LICQ_DEPRECATED __declspec(deprecated)
+# else
+#  define LICQ_DEPRECATED
+# endif
+#endif
+
+
 #define FOR_EACH_PROTO_PLUGIN_START(d)                             \
     {                                                              \
@@ -331 +343 @@
      CICQColor *pColor = NULL);
 
-  unsigned long icqSendMessage(unsigned long nUin, const char *szMessage,
-     bool bOnline, unsigned short nLevel, bool bMultipleRecipients = false,
-     CICQColor *pColor = NULL);
   // Url
   unsigned long icqSendUrl(const char *szId, const char *szUrl,
@@ -343 +352 @@
      CICQColor *pColor = NULL);
 
-  unsigned long icqSendContactList(unsigned long nUin, UinList &uins,
-     bool bOnline, unsigned short nLevel, bool bMultipleRecipients = false,
-     CICQColor *pColor = NULL);
   // Auto Response
-  unsigned long icqFetchAutoResponse(unsigned long nUin, bool bServer = false) __attribute__ ((deprecated));
   unsigned long icqFetchAutoResponse(const char *_szId, unsigned long _nPPID, bool bServer = false);
   // Chat Request
   unsigned long icqChatRequest(const char* id, const char *szReason,
      unsigned short nLevel, bool bServer);
-  unsigned long icqChatRequest(unsigned long nUin, const char *szReason,
-     unsigned short nLevel, bool bServer);
   unsigned long icqMultiPartyChatRequest(const char* id,
-     const char *szReason, const char *szChatUsers, unsigned short nPort,
-     unsigned short nLevel, bool bServer);
-  unsigned long icqMultiPartyChatRequest(unsigned long nUin,
      const char *szReason, const char *szChatUsers, unsigned short nPort,
      unsigned short nLevel, bool bServer);
   void icqChatRequestRefuse(const char* id, const char* szReason,
       unsigned short nSequence, const unsigned long nMsgID[], bool bDirect);
-  void icqChatRequestRefuse(unsigned long nUin, const char *szReason,
-      unsigned short nSequence, const unsigned long nMsgID[], bool bDirect);
   void icqChatRequestAccept(const char* id, unsigned short nPort,
       const char* szClients, unsigned short nSequence,
       const unsigned long nMsgID[], bool bDirect);
-  void icqChatRequestAccept(unsigned long nUin, unsigned short nPort,
-      const char* szClients, unsigned short nSequence,
-      const unsigned long nMsgID[], bool bDirect);
   void icqChatRequestCancel(const char* id, unsigned short nSequence);
-  void icqChatRequestCancel(unsigned long nUin, unsigned short nSequence);
   // File Transfer
   unsigned long icqFileTransfer(const char *szId, const char *szFilename,
      const char *szDescription, ConstFileList &lFileList,
      unsigned short nLevel, bool bServer);
-  unsigned long icqFileTransfer(unsigned long nUin, const char *szFilename,
-     const char *szDescription, ConstFileList &lFileList,
-     unsigned short nLevel, bool bServer);
   void icqFileTransferRefuse(const char *szId, const char *szReason,
       unsigned short nSequence, const unsigned long nMsgID[], bool bDirect);
-  void icqFileTransferRefuse(unsigned long nUin, const char *szReason,
-      unsigned short nSequence, const unsigned long nMsgID[], bool bDirect);
   void icqFileTransferCancel(const char *szId, unsigned short nSequence);
-  void icqFileTransferCancel(unsigned long nUin, unsigned short nSequence);
   void icqFileTransferAccept(const char *szId, unsigned short nPort,
      unsigned short nSequence, const unsigned long nMsgID[], bool bDirect,
      const char *szDesc, const char *szFile, unsigned long nFileSize);  
-  void icqFileTransferAccept(unsigned long nUin, unsigned short nPort,
-     unsigned short nSequence, const unsigned long nMsgID[], bool bDirect,
-     const char *szDesc, const char *szFile, unsigned long nFileSize);
   unsigned long icqOpenSecureChannel(const char *szId);
-  unsigned long icqOpenSecureChannel(unsigned long nUin);
   unsigned long icqCloseSecureChannel(const char *szId);
-  unsigned long icqCloseSecureChannel(unsigned long nUin);
   void icqOpenSecureChannelCancel(const char *szId, unsigned short nSequence);
-  void icqOpenSecureChannelCancel(unsigned long nUin, unsigned short nSequence);
 
   // Plugins
@@ -415 +397 @@
   void icqVerify(const char *);
   unsigned long icqFetchAutoResponseServer(const char *);
-  unsigned long icqFetchAutoResponseServer(unsigned long);
   unsigned long icqLogon(unsigned short logonStatus);
   unsigned long icqRequestLogonSalt();
   unsigned long icqUserBasicInfo(const char *);
-  unsigned long icqUserBasicInfo(unsigned long);
   unsigned long icqUserExtendedInfo(const char *);
-  unsigned long icqUserExtendedInfo(unsigned long);
   unsigned long icqRequestMetaInfo(const char *);
-  unsigned long icqRequestMetaInfo(unsigned long);
 
   unsigned long icqUpdateBasicInfo(const char *, const char *, const char *,
@@ -475 +453 @@
   void postLogoff(int nSD, ICQEvent *cancelledEvent);
   void icqRelogon();
-  unsigned long icqAuthorizeGrant(unsigned long nUin, const char *szMessage);
   unsigned long icqAuthorizeGrant(const char *szId, const char *szMessage);
-  unsigned long icqAuthorizeRefuse(unsigned long nUin, const char *szMessage);
   unsigned long icqAuthorizeRefuse(const char *szId, const char *szMessage);
   void icqRequestAuth(const char* id, const char *_szMessage);
-  void icqRequestAuth(unsigned long _nUin, const char *_szMessage);
-  void icqAlertUser(unsigned long _nUin);
   void icqAlertUser(const char* id, unsigned long ppid);
-  void icqAddUser(unsigned long _nUin, bool _bAuthReq = false, unsigned short groupId = 0);
   void icqAddUser(const char *_szId, bool _bAuthReq = false, unsigned short groupId = 0);
   void icqAddUserServer(const char *_szId, bool _bAuthReq, unsigned short groupId = 0);
-  void icqAddUserServer(unsigned long _nUin, bool _bAuthReq, unsigned short groupId = 0);
   void icqAddGroup(const char *);
-  void icqRemoveUser(unsigned long _nUin);
   void icqRemoveUser(const char *);
   void icqRemoveGroup(const char *);
-  void icqChangeGroup(unsigned long _nUin, unsigned short _nNewGroup,
-                      unsigned short _nOldGSID, unsigned short _nNewType,
-                      unsigned short _nOldType);
   void icqChangeGroup(const char *_szId, unsigned long _nPPID,
                       unsigned short _nNewGroup, unsigned short _nOldGSID,
                       unsigned short _nNewType, unsigned short _nOldType);
   void icqRenameGroup(const char *_szNewName, unsigned short _nGSID);
-  void icqRenameUser(unsigned long _nUin);
   void icqRenameUser(const char *_szId);
   void icqExportUsers(UserStringList &, unsigned short);
@@ -599 +566 @@
   bool AddUserToList(const char *szId, unsigned long PPID, bool bNotify = true,
                      bool bTempUser = false, unsigned short groupId = 0);
-  bool AddUserToList(unsigned long _nUin, bool bNotify = true,
-                     bool bTempUser = false, unsigned short groupId = 0);
   void AddUserToList(ICQUser *);
-  void RemoveUserFromList(unsigned long _nUin);
   void RemoveUserFromList(const char *szId, unsigned long nPPID);
 
@@ -608 +572 @@
   unsigned long icqSendSms(const char* id, unsigned long ppid,
       const char* number, const char* message);
-  unsigned long icqSendSms(const char *szNumber, const char *szMessage,
-                           unsigned long nUin);
 
   // NOT MT SAFE
@@ -719 +681 @@
      TCPSocket *pSock);
   bool WaitForReverseConnection(unsigned short id, const char* userId);
+
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED unsigned long icqSendMessage(unsigned long nUin, const char *szMessage,
+     bool bOnline, unsigned short nLevel, bool bMultipleRecipients = false,
+     CICQColor *pColor = NULL);
+  LICQ_DEPRECATED unsigned long icqSendContactList(unsigned long nUin, UinList &uins,
+     bool bOnline, unsigned short nLevel, bool bMultipleRecipients = false,
+     CICQColor *pColor = NULL);
+  LICQ_DEPRECATED unsigned long icqFetchAutoResponse(unsigned long nUin, bool bServer = false);
+  LICQ_DEPRECATED unsigned long icqChatRequest(unsigned long nUin, const char *szReason,
+     unsigned short nLevel, bool bServer);
+  LICQ_DEPRECATED unsigned long icqMultiPartyChatRequest(unsigned long nUin,
+     const char *szReason, const char *szChatUsers, unsigned short nPort,
+     unsigned short nLevel, bool bServer);
+  LICQ_DEPRECATED void icqChatRequestRefuse(unsigned long nUin, const char *szReason,
+      unsigned short nSequence, const unsigned long nMsgID[], bool bDirect);
+  LICQ_DEPRECATED void icqChatRequestAccept(unsigned long nUin, unsigned short nPort,
+      const char* szClients, unsigned short nSequence,
+      const unsigned long nMsgID[], bool bDirect);
+  LICQ_DEPRECATED void icqChatRequestCancel(unsigned long nUin, unsigned short nSequence);
+  LICQ_DEPRECATED unsigned long icqFileTransfer(unsigned long nUin, const char *szFilename,
+     const char *szDescription, ConstFileList &lFileList,
+     unsigned short nLevel, bool bServer);
+  LICQ_DEPRECATED void icqFileTransferRefuse(unsigned long nUin, const char *szReason,
+      unsigned short nSequence, const unsigned long nMsgID[], bool bDirect);
+  LICQ_DEPRECATED void icqFileTransferCancel(unsigned long nUin, unsigned short nSequence);
+  LICQ_DEPRECATED void icqFileTransferAccept(unsigned long nUin, unsigned short nPort,
+     unsigned short nSequence, const unsigned long nMsgID[], bool bDirect,
+     const char *szDesc, const char *szFile, unsigned long nFileSize);
+  LICQ_DEPRECATED unsigned long icqOpenSecureChannel(unsigned long nUin);
+  LICQ_DEPRECATED unsigned long icqCloseSecureChannel(unsigned long nUin);
+  LICQ_DEPRECATED void icqOpenSecureChannelCancel(unsigned long nUin, unsigned short nSequence);
+  LICQ_DEPRECATED unsigned long icqFetchAutoResponseServer(unsigned long);
+  LICQ_DEPRECATED unsigned long icqUserBasicInfo(unsigned long);
+  LICQ_DEPRECATED unsigned long icqUserExtendedInfo(unsigned long);
+  LICQ_DEPRECATED unsigned long icqRequestMetaInfo(unsigned long);
+  LICQ_DEPRECATED unsigned long icqAuthorizeGrant(unsigned long nUin, const char *szMessage);
+  LICQ_DEPRECATED unsigned long icqAuthorizeRefuse(unsigned long nUin, const char *szMessage);
+  LICQ_DEPRECATED void icqRequestAuth(unsigned long _nUin, const char *_szMessage);
+  LICQ_DEPRECATED void icqAlertUser(unsigned long _nUin);
+  LICQ_DEPRECATED void icqAddUser(unsigned long _nUin, bool _bAuthReq = false, unsigned short groupId = 0);
+  LICQ_DEPRECATED void icqAddUserServer(unsigned long _nUin, bool _bAuthReq, unsigned short groupId = 0);
+  LICQ_DEPRECATED void icqRemoveUser(unsigned long _nUin);
+  LICQ_DEPRECATED void icqChangeGroup(unsigned long _nUin, unsigned short _nNewGroup,
+                      unsigned short _nOldGSID, unsigned short _nNewType,
+                      unsigned short _nOldType);
+  LICQ_DEPRECATED void icqRenameUser(unsigned long _nUin);
+  LICQ_DEPRECATED bool AddUserToList(unsigned long _nUin, bool bNotify = true,
+                     bool bTempUser = false, unsigned short groupId = 0);
+  LICQ_DEPRECATED void RemoveUserFromList(unsigned long _nUin);
+  LICQ_DEPRECATED unsigned long icqSendSms(const char *szNumber, const char *szMessage,
+                           unsigned long nUin);
 
 protected:
@@ -816 +830 @@
   void ChangeUserStatus(ICQUser *u, unsigned long s);
   bool AddUserEvent(ICQUser *, CUserEvent *);
-  void RejectEvent(unsigned long, CUserEvent *);
   void RejectEvent(const char* id, CUserEvent* e);
   ICQUser *FindUserForInfoUpdate(const char *szId, ICQEvent *e, const char *);
   std::string FindUserByCellular(const char* cellular);
-  unsigned long FindUinByCellular(const char *_szCellular);
 
   void icqRegisterFinish();
@@ -830 +842 @@
   ICQEvent *icqSendThroughServer(const char *szId, unsigned char format, char *_sMessage,
     CUserEvent *, unsigned short = 0, size_t = 0);
-  ICQEvent* icqSendThroughServer(unsigned long nUin, unsigned char format, char *_sMessage, CUserEvent *, unsigned short = 0);
   void SaveUserList();
 
@@ -852 +863 @@
   bool SendEvent(INetSocket *, CPacket &, bool);
   void SendEvent_Server(CPacket *packet);
-  ICQEvent *SendExpectEvent_Server(unsigned long nUin, CPacket *, CUserEvent *, bool = false);
   ICQEvent *SendExpectEvent_Server(const char *, unsigned long, CPacket *, CUserEvent *, bool = false);
 
@@ -910 +920 @@
   // Helpers
   void addToModifyUsers(unsigned long unique_id, const std::string data);
+
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED void RejectEvent(unsigned long nUin, CUserEvent* e);
+  LICQ_DEPRECATED unsigned long FindUinByCellular(const char *_szCellular);
+  LICQ_DEPRECATED ICQEvent* icqSendThroughServer(unsigned long nUin,
+      unsigned char format, char *_sMessage, CUserEvent *, unsigned short = 0);
+  LICQ_DEPRECATED ICQEvent *SendExpectEvent_Server(unsigned long nUin,
+      CPacket *, CUserEvent *, bool = false);
 
   // Declare all our thread functions as friends

trunk/licq/src/icqd-chat.cpp

@@ -52 +52 @@
   m_nPort = _nLocalPort;
   m_szId = strdup(gUserManager.OwnerId(LICQ_PPID).c_str());
-  m_nUin = atol(m_szId);
+  unsigned long m_nUin = atol(m_szId);
   m_nPPID = LICQ_PPID;
   m_nColorForeRed = nColorForeRed;
@@ -87 +87 @@
   b.UnpackUnsignedLong();
   b.UnpackUnsignedLong();
-  m_nUin = b.UnpackUnsignedLong();
+  unsigned long m_nUin = b.UnpackUnsignedLong();
   char szUin[24];
   sprintf(szUin, "%lu", m_nUin);
@@ -115 +115 @@
 CChatClient::CChatClient()
 {
-  m_nVersion = m_nUin = m_nPPID = m_nIp = m_nIntIp = m_nPort = m_nMode
+  m_nVersion = m_nPPID = m_nIp = m_nIntIp = m_nPort = m_nMode
      = m_nSession = m_nHandshake = 0;
   m_szId = NULL;
@@ -125 +125 @@
   m_nVersion = u->Version();
   m_szId = strdup(u->IdString());
-  m_nUin = strtoul(m_szId, NULL, 10);
   m_nPPID = u->PPID();
   m_nIp = u->Ip();
@@ -161 +160 @@
     m_nVersion = p.m_nVersion;
     m_nPort = p.m_nPort;
-    m_nUin = p.m_nUin;
     m_nPPID = p.m_nPPID;
     m_nIp = p.m_nIp;
@@ -180 +178 @@
   m_nPort = b.UnpackUnsignedShort();
   b.UnpackUnsignedShort();
-  m_nUin = b.UnpackUnsignedLong();
+  unsigned long m_nUin = b.UnpackUnsignedLong();
   char szUin[24];
   sprintf(szUin, "%lu", m_nUin);
@@ -204 +202 @@
   m_nVersion = b.UnpackUnsignedLong();
   b.UnpackUnsignedLong();
-  m_nUin = b.UnpackUnsignedLong();
+  unsigned long m_nUin = b.UnpackUnsignedLong();
   char szUin[24];
   sprintf(szUin, "%lu", m_nUin);
@@ -230 +228 @@
   m_nVersion = b.UnpackUnsignedLong();
   b.UnpackUnsignedLong();
-  m_nUin = b.UnpackUnsignedLong();
+  unsigned long m_nUin = b.UnpackUnsignedLong();
   char szUin[24];
   sprintf(szUin, "%lu", m_nUin);
@@ -253 +251 @@
 
   m_nVersion = hand.VersionMajor();
-  m_nUin = hand.SourceUin();
+  unsigned long m_nUin = hand.SourceUin();
   char szUin[24];
   sprintf(szUin, "%lu", m_nUin);
@@ -276 +274 @@
 
   m_nVersion = hand.VersionMajor();
-  m_nUin = hand.SourceUin();
+  unsigned long m_nUin = hand.SourceUin();
   char szUin[24];
   sprintf(szUin, "%lu", m_nUin);
@@ -306 +304 @@
   m_nPort = nLocalPort;
   m_szId = strdup(gUserManager.OwnerId(LICQ_PPID).c_str());
-  m_nUin = atol(m_szId);
+  unsigned long m_nUin = atol(m_szId);
   m_nPPID = LICQ_PPID;
   m_nColorForeRed = nColorForeRed;
@@ -358 +356 @@
     buffer->PackUnsignedLong((*iter)->m_nVersion);
     buffer->PackUnsignedLong((*iter)->m_nPort);
-    buffer->PackUnsignedLong((*iter)->m_nUin);
+    buffer->PackUnsignedLong(strtoul((*iter)->m_szId, NULL, 10));
     buffer->PackUnsignedLong((*iter)->m_nIp);
     buffer->PackUnsignedLong((*iter)->m_nIntIp);
@@ -374 +372 @@
 
   b.UnpackUnsignedLong();
-  m_nUin = b.UnpackUnsignedLong();
+  unsigned long m_nUin = b.UnpackUnsignedLong();
   char szUin[24];
   sprintf(szUin, "%lu", m_nUin);
@@ -618 +616 @@
 CChatUser::CChatUser()
 {
-  uin = 0;
   szId = 0;
   nPPID = 0;
@@ -677 +674 @@
   pipe(pipe_events);
 
-  m_nUin = nUin;
   char szUin[24];
-  sprintf(szUin, "%lu", m_nUin);
+  sprintf(szUin, "%lu", nUin);
   m_szId = strdup(szUin);
   m_nPPID = LICQ_PPID;
@@ -786 +782 @@
   u->m_pClient = c;
   u->m_pClient->m_nSession = m_nSession;
-  u->uin = c->m_nUin;
   u->szId = strdup(c->m_szId);
   u->nPPID = c->m_nPPID;
@@ -884 +879 @@
   u->m_pClient->m_nVersion = s->Version();
   u->m_pClient->m_szId = strdup(s->OwnerId());
-  u->m_pClient->m_nUin = strtoul(u->m_pClient->m_szId, NULL, 10);
   u->m_pClient->m_nPPID = s->OwnerPPID();
   u->m_pClient->m_nIp = s->RemoteIp();
@@ -895 +889 @@
   u->m_pClient->m_nSession = 0;
 
-  u->uin = u->m_pClient->m_nUin;
   u->szId = strdup(u->m_pClient->m_szId);
   u->nPPID = u->m_pClient->m_nPPID;
@@ -973 +966 @@
       gLog.Info(tr("%sChat: Received handshake from %s [v%ld].\n"), L_TCPxSTR,
          u->m_pClient->m_szId, u->sock.Version());
-      u->uin = u->m_pClient->m_nUin;
       if (u->szId)  free(u->szId);
       u->szId = strdup(u->m_pClient->m_szId);
@@ -1091 +1083 @@
       CPChat_ColorFont pin(u->sock.RecvBuffer());
       u->szId = strdup(pin.Id());
-      u->uin = strtoul(u->szId, NULL, 10);
       u->nPPID = pin.PPID();
 //      m_nSession = pin.Session();