Changeset 6419 for trunk/licq/include/licq_chat.h

Timestamp:

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

Author:

flynd

Message:

Marked deprecated functions in icqd and chat.

Files:

• trunk/licq/include/licq_chat.h (modified) (10 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;