Changeset 6418 for trunk/licq/src/message.cpp

Timestamp:

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

Author:

flynd

Message:

Marked deprecated functions in messages and utilities.

Files:

• trunk/licq/src/message.cpp (modified) (11 diffs)

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;
 }