Show
Ignore:
Timestamp:
07/04/08 06:16:26 (5 months ago)
Author:
flynd
Message:

Marked deprecated functions in icqd and chat.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/licq/src/icqd-chat.cpp

    r6405 r6419  
    5252  m_nPort = _nLocalPort; 
    5353  m_szId = strdup(gUserManager.OwnerId(LICQ_PPID).c_str()); 
    54   m_nUin = atol(m_szId); 
     54  unsigned long m_nUin = atol(m_szId); 
    5555  m_nPPID = LICQ_PPID; 
    5656  m_nColorForeRed = nColorForeRed; 
    … …  
    8787  b.UnpackUnsignedLong(); 
    8888  b.UnpackUnsignedLong(); 
    89   m_nUin = b.UnpackUnsignedLong(); 
     89  unsigned long m_nUin = b.UnpackUnsignedLong(); 
    9090  char szUin[24]; 
    9191  sprintf(szUin, "%lu", m_nUin); 
    … …  
    115115CChatClient::CChatClient() 
    116116{ 
    117   m_nVersion = m_nUin = m_nPPID = m_nIp = m_nIntIp = m_nPort = m_nMode 
     117  m_nVersion = m_nPPID = m_nIp = m_nIntIp = m_nPort = m_nMode 
    118118     = m_nSession = m_nHandshake = 0; 
    119119  m_szId = NULL; 
    … …  
    125125  m_nVersion = u->Version(); 
    126126  m_szId = strdup(u->IdString()); 
    127   m_nUin = strtoul(m_szId, NULL, 10); 
    128127  m_nPPID = u->PPID(); 
    129128  m_nIp = u->Ip(); 
    … …  
    161160    m_nVersion = p.m_nVersion; 
    162161    m_nPort = p.m_nPort; 
    163     m_nUin = p.m_nUin; 
    164162    m_nPPID = p.m_nPPID; 
    165163    m_nIp = p.m_nIp; 
    … …  
    180178  m_nPort = b.UnpackUnsignedShort(); 
    181179  b.UnpackUnsignedShort(); 
    182   m_nUin = b.UnpackUnsignedLong(); 
     180  unsigned long m_nUin = b.UnpackUnsignedLong(); 
    183181  char szUin[24]; 
    184182  sprintf(szUin, "%lu", m_nUin); 
    … …  
    204202  m_nVersion = b.UnpackUnsignedLong(); 
    205203  b.UnpackUnsignedLong(); 
    206   m_nUin = b.UnpackUnsignedLong(); 
     204  unsigned long m_nUin = b.UnpackUnsignedLong(); 
    207205  char szUin[24]; 
    208206  sprintf(szUin, "%lu", m_nUin); 
    … …  
    230228  m_nVersion = b.UnpackUnsignedLong(); 
    231229  b.UnpackUnsignedLong(); 
    232   m_nUin = b.UnpackUnsignedLong(); 
     230  unsigned long m_nUin = b.UnpackUnsignedLong(); 
    233231  char szUin[24]; 
    234232  sprintf(szUin, "%lu", m_nUin); 
    … …  
    253251 
    254252  m_nVersion = hand.VersionMajor(); 
    255   m_nUin = hand.SourceUin(); 
     253  unsigned long m_nUin = hand.SourceUin(); 
    256254  char szUin[24]; 
    257255  sprintf(szUin, "%lu", m_nUin); 
    … …  
    276274 
    277275  m_nVersion = hand.VersionMajor(); 
    278   m_nUin = hand.SourceUin(); 
     276  unsigned long m_nUin = hand.SourceUin(); 
    279277  char szUin[24]; 
    280278  sprintf(szUin, "%lu", m_nUin); 
    … …  
    306304  m_nPort = nLocalPort; 
    307305  m_szId = strdup(gUserManager.OwnerId(LICQ_PPID).c_str()); 
    308   m_nUin = atol(m_szId); 
     306  unsigned long m_nUin = atol(m_szId); 
    309307  m_nPPID = LICQ_PPID; 
    310308  m_nColorForeRed = nColorForeRed; 
    … …  
    358356    buffer->PackUnsignedLong((*iter)->m_nVersion); 
    359357    buffer->PackUnsignedLong((*iter)->m_nPort); 
    360     buffer->PackUnsignedLong((*iter)->m_nUin); 
     358    buffer->PackUnsignedLong(strtoul((*iter)->m_szId, NULL, 10)); 
    361359    buffer->PackUnsignedLong((*iter)->m_nIp); 
    362360    buffer->PackUnsignedLong((*iter)->m_nIntIp); 
    … …  
    374372 
    375373  b.UnpackUnsignedLong(); 
    376   m_nUin = b.UnpackUnsignedLong(); 
     374  unsigned long m_nUin = b.UnpackUnsignedLong(); 
    377375  char szUin[24]; 
    378376  sprintf(szUin, "%lu", m_nUin); 
    … …  
    618616CChatUser::CChatUser() 
    619617{ 
    620   uin = 0; 
    621618  szId = 0; 
    622619  nPPID = 0; 
    … …  
    677674  pipe(pipe_events); 
    678675 
    679   m_nUin = nUin; 
    680676  char szUin[24]; 
    681   sprintf(szUin, "%lu", m_nUin); 
     677  sprintf(szUin, "%lu", nUin); 
    682678  m_szId = strdup(szUin); 
    683679  m_nPPID = LICQ_PPID; 
    … …  
    786782  u->m_pClient = c; 
    787783  u->m_pClient->m_nSession = m_nSession; 
    788   u->uin = c->m_nUin; 
    789784  u->szId = strdup(c->m_szId); 
    790785  u->nPPID = c->m_nPPID; 
    … …  
    884879  u->m_pClient->m_nVersion = s->Version(); 
    885880  u->m_pClient->m_szId = strdup(s->OwnerId()); 
    886   u->m_pClient->m_nUin = strtoul(u->m_pClient->m_szId, NULL, 10); 
    887881  u->m_pClient->m_nPPID = s->OwnerPPID(); 
    888882  u->m_pClient->m_nIp = s->RemoteIp(); 
    … …  
    895889  u->m_pClient->m_nSession = 0; 
    896890 
    897   u->uin = u->m_pClient->m_nUin; 
    898891  u->szId = strdup(u->m_pClient->m_szId); 
    899892  u->nPPID = u->m_pClient->m_nPPID; 
    … …  
    973966      gLog.Info(tr("%sChat: Received handshake from %s [v%ld].\n"), L_TCPxSTR, 
    974967         u->m_pClient->m_szId, u->sock.Version()); 
    975       u->uin = u->m_pClient->m_nUin; 
    976968      if (u->szId)  free(u->szId); 
    977969      u->szId = strdup(u->m_pClient->m_szId); 
    … …  
    10911083      CPChat_ColorFont pin(u->sock.RecvBuffer()); 
    10921084      u->szId = strdup(pin.Id()); 
    1093       u->uin = strtoul(u->szId, NULL, 10); 
    10941085      u->nPPID = pin.PPID(); 
    10951086//      m_nSession = pin.Session();