Changeset 6418 for trunk/licq/include/licq_message.h

Timestamp:

07/04/08 06:05:11 (5 months ago)

Author:

flynd

Message:

Marked deprecated functions in messages and utilities.

Files:

• trunk/licq/include/licq_message.h (modified) (7 diffs)

trunk/licq/include/licq_message.h

@@ -2 +2 @@
 #define MESSAGE_H
 
+#include <cstdlib>
 #include <ctime>
 #include <list>
@@ -7 +8 @@
 #include "licq_constants.h"
 #include "licq_color.h"
+
+// 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
+
 
 typedef std::list<const char *> ConstFileList;
@@ -201 +214 @@
                const char *_szFirstName, const char *_szLastName, const char *_szEmail,
                unsigned short _nCommand, time_t _tTime, unsigned long _nFlags);
-   CEventAdded(unsigned long _nUin, const char *_szAlias, const char *_szFirstName,
+   virtual ~CEventAdded();
+  virtual CEventAdded* Copy() const;
+  virtual void AddToHistory(ICQUser* u, unsigned long _nPPID, direction _nDir) const;
+  const char* IdString() const { return m_szId; }
+  unsigned long PPID() const { return m_nPPID; }
+
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED CEventAdded(unsigned long _nUin, const char *_szAlias, const char *_szFirstName,
                const char *_szLastName, const char *_szEmail,
                unsigned short _nCommand, time_t _tTime, unsigned long _nFlags);
-   virtual ~CEventAdded();
-  virtual CEventAdded* Copy() const;
-  virtual void AddToHistory(ICQUser* u, unsigned long _nPPID, direction _nDir) const;
-  unsigned long Uin() const { return m_nUin; };
-  const char* IdString() const { return m_szId; }
-  unsigned long PPID() const { return m_nPPID; }
-protected:
-  void CreateDescription() const;
-   unsigned long m_nUin;
+  LICQ_DEPRECATED unsigned long Uin() const { return strtoul(m_szId, NULL, 10); };
+
+protected:
+  void CreateDescription() const;
    char *m_szId;
    unsigned long m_nPPID;
@@ -231 +246 @@
                      const char *_szReason, unsigned short _nCommand, time_t _tTime,
                      unsigned long _nFlags);
-   CEventAuthRequest(unsigned long _nUin, const char *_szAlias, const char *_szFirstName,
+   virtual ~CEventAuthRequest();
+  virtual CEventAuthRequest* Copy() const;
+  virtual void AddToHistory(ICQUser* u, unsigned long _nPPID, direction _nDir) const;
+  const char* IdString() const { return m_szId; }
+  unsigned long PPID() const { return m_nPPID; }
+
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED CEventAuthRequest(unsigned long _nUin, const char *_szAlias, const char *_szFirstName,
                  const char *_szLastName, const char *_szEmail, const char *_szReason,
                  unsigned short _nCommand, time_t _tTime, unsigned long _nFlags);
-   virtual ~CEventAuthRequest();
-  virtual CEventAuthRequest* Copy() const;
-  virtual void AddToHistory(ICQUser* u, unsigned long _nPPID, direction _nDir) const;
-  unsigned long Uin() const { return m_nUin; };
-  const char* IdString() const { return m_szId; }
-  unsigned long PPID() const { return m_nPPID; }
-protected:
-  void CreateDescription() const;
-   unsigned long m_nUin;
+  LICQ_DEPRECATED unsigned long Uin() const { return strtoul(m_szId, NULL, 10); };
+
+protected:
+  void CreateDescription() const;
    char *m_szId;
    unsigned long m_nPPID;
@@ -259 +276 @@
    CEventAuthGranted(const char *_szId, unsigned long _nPPID, const char *_szMsg,
                      unsigned short _nCommand, time_t _tTime, unsigned long _nFlags);
-   CEventAuthGranted(unsigned long _nUin, const char *_szMessage,
-              unsigned short _nCommand, time_t _tTime, unsigned long _nFlags);
    virtual ~CEventAuthGranted();
   virtual CEventAuthGranted* Copy() const;
   virtual void AddToHistory(ICQUser* u, unsigned long _nPPID, direction _nDir) const;
-  unsigned long Uin() const { return m_nUin; };
   const char* IdString() const { return m_szId; }
   unsigned long PPID() const { return m_nPPID; }
-protected:
-  void CreateDescription() const;
-   unsigned long m_nUin;
+
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED CEventAuthGranted(unsigned long _nUin, const char *_szMessage,
+              unsigned short _nCommand, time_t _tTime, unsigned long _nFlags);
+  LICQ_DEPRECATED unsigned long Uin() const { return strtoul(m_szId, NULL, 10); };
+
+protected:
+  void CreateDescription() const;
    char *m_szId;
    unsigned long m_nPPID;
@@ -282 +301 @@
    CEventAuthRefused(const char *_szId, unsigned long _nPPID, const char *_szMsg,
                      unsigned short _nCommand, time_t _tTime, unsigned long _nFlags);
-   CEventAuthRefused(unsigned long _nUin, const char *_szMessage,
-              unsigned short _nCommand, time_t _tTime, unsigned long _nFlags);
    virtual ~CEventAuthRefused();
   virtual CEventAuthRefused* Copy() const;
   virtual void AddToHistory(ICQUser* u, unsigned long _nPPID, direction _nDir) const;
-  unsigned long Uin() const { return m_nUin; };
   const char* IdString() const { return m_szId; }
   unsigned long PPID() const { return m_nPPID; }
-protected:
-  void CreateDescription() const;
-   unsigned long m_nUin;
+
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED CEventAuthRefused(unsigned long _nUin, const char *_szMessage,
+              unsigned short _nCommand, time_t _tTime, unsigned long _nFlags);
+  LICQ_DEPRECATED unsigned long Uin() const { return strtoul(m_szId, NULL, 10); };
+
+protected:
+  void CreateDescription() const;
    char *m_szId;
    unsigned long m_nPPID;
@@ -338 +359 @@
 public:
   CContact(const char *s, unsigned long n, const char *a);
-  CContact(unsigned long n, const char *a);
   ~CContact();
 
-  unsigned long Uin() const { return m_nUin; }
   const char* Alias() const { return m_szAlias; }
   const char* IdString() const { return m_szId; }
   unsigned long PPID() const { return m_nPPID; }
-protected:
-  unsigned long m_nUin;
+
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED CContact(unsigned long n, const char *a);
+  LICQ_DEPRECATED unsigned long Uin() const { return strtoul(m_szId, NULL, 10); }
+
+protected:
   char *m_szAlias;
   char *m_szId;