Changeset 6418

Timestamp:

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

Author:

flynd

Message:

Marked deprecated functions in messages and utilities.

Location:

trunk/licq

Files:

• include/licq_message.h (modified) (7 diffs)
• include/licq_utility.h (modified) (3 diffs)
• src/message.cpp (modified) (11 diffs)
• src/user.cpp (modified) (1 diff)
• src/utility.cpp (modified) (1 diff)

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;

trunk/licq/include/licq_utility.h

@@ -6 +6 @@
 
 class ICQUser;
+
+// 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
 
 
@@ -61 +72 @@
   EWinType WinType()  { return m_eWinType; }
 
-  bool SetFields(unsigned long _nUin);
   bool SetFields(const char *szId, unsigned long nPPID);
   void SetUserFields(const std::vector<const char *> &_vszUserFields);
@@ -71 +81 @@
 
   bool Exception()  { return bException; }
+
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED bool SetFields(unsigned long _nUin);
 
 protected:

trunk/licq/src/message.cpp

@@ -414 +414 @@
   m_szEmail = strdup(_szEmail);
   m_nPPID =_nPPID;
-  if (_nPPID == LICQ_PPID)
-    m_nUin = strtoul(_szId, (char **)NULL, 10);
-  else
-    m_nUin = 0;
 }
 
@@ -430 +426 @@
   m_szLastName = strdup(_szLastName);
   m_szEmail = strdup(_szEmail);
-  m_nUin = _nUin;
 
   char szUin[24];
@@ -499 +494 @@
    m_szReason = strdup(_szReason);
    m_nPPID = _nPPID;
-   if (_nPPID == LICQ_PPID)
-    m_nUin = strtoul(_szId, (char **)NULL, 10);
-   else
-    m_nUin = 0;
 }
 
@@ -522 +513 @@
    m_szId = strdup(szUin);
    m_nPPID = LICQ_PPID;
-   m_nUin = _nUin;
 }
 
@@ -532 +522 @@
                       + strlen(m_szLastName) + strlen(m_szEmail)
                       + strlen(m_szReason) + strlen(m_szId) + strlen(p) + 256];
-  //sprintf(m_szText, "%s (%s %s, %s), uin %lu, requests authorization to add you to their contact list:\n%s\n",
-  //        m_szAlias, m_szFirstName, m_szLastName, m_szEmail, m_nUin, m_szReason);
+  //sprintf(m_szText, "%s (%s %s, %s), uin %s, requests authorization to add you to their contact list:\n%s\n",
+  //        m_szAlias, m_szFirstName, m_szLastName, m_szEmail, m_szId, m_szReason);
   int pos = sprintf(m_szText, tr("Alias: %s\nUser: %s (%s)\nName: %s %s\nEmail: %s\n"),
      m_szAlias, m_szId, p, m_szFirstName, m_szLastName, m_szEmail);
@@ -590 +580 @@
   m_szId = strdup(_szId);
   m_nPPID = _nPPID;
-  if (_nPPID == LICQ_PPID)
-    m_nUin = strtoul(_szId, (char **)NULL, 10);
-  else
-    m_nUin = 0;
 }
 
@@ -607 +593 @@
   m_szId = strdup(szUin);
   m_nPPID = LICQ_PPID;
-  m_nUin = _nUin;
 }
 
@@ -664 +649 @@
   m_szId = strdup(_szId);
   m_nPPID = _nPPID;
-  if (_nPPID == LICQ_PPID)
-    m_nUin = strtoul(_szId, (char **)NULL, 10);
-  else
-    m_nUin = 0;
 }
 
@@ -676 +657 @@
 {
   m_szMessage = _szMessage == NULL ? strdup("") : strdup(_szMessage);
-  m_nUin = _nUin;
 
   char szUin[24];
@@ -828 +808 @@
   m_szId = strdup(s);
   m_szAlias = strdup(a);
-  m_nUin = strtoul(s, (char**)NULL, 10);
-}
-
-CContact::CContact(unsigned long n, const char *a) : m_nUin(n), m_nPPID(0)
+}
+
+CContact::CContact(unsigned long n, const char *a) : m_nPPID(0)
 {
   std::ostringstream ss;
@@ -1160 +1139 @@
 {
   m_szMsg = _szMsg == NULL ? strdup("") : strdup(_szMsg);
-  m_szId = m_szId == NULL ? NULL : strdup(m_szId);
+  m_szId = idString == NULL ? NULL : strdup(idString);
   m_nPPID = ppid;
 }

trunk/licq/src/user.cpp

@@ -2376 +2376 @@
 unsigned long ICQUser::Uin() const
 {
-  return strtoul(m_szId, NULL, 0);
+  return strtoul(m_szId, NULL, 10);
 }
 

trunk/licq/src/utility.cpp

@@ -200 +200 @@
 bool CUtility::SetFields(unsigned long _nUin)
 {
-  ICQUser *u = gUserManager.FetchUser(_nUin, LOCK_R);
-  if (u == NULL) return false;
-  if (m_szFullCommand != NULL) delete [] m_szFullCommand;
-  char *szTmp;
-  szTmp = u->usprintf(m_szCommand, USPRINTF_NOFW|USPRINTF_LINEISCMD);
-  m_szFullCommand = new char[MAX_CMD_LEN];
-  strncpy(m_szFullCommand, szTmp, MAX_CMD_LEN);
-  m_szFullCommand[MAX_CMD_LEN - 1] = '\0';
-  free(szTmp);
-  vector<CUtilityUserField *>::iterator iter;
-  for (iter = m_vxUserField.begin(); iter != m_vxUserField.end(); ++iter)
-    (*iter)->SetFields(u);
-  gUserManager.DropUser(u);
-  return true;
+  char id[16];
+  snprintf(id, 16, "%lu", _nUin);
+  return SetFields(id, LICQ_PPID);
 }