Changeset 6305 for trunk/qt-gui

Timestamp:

06/14/08 17:14:17 (6 months ago)

Author:

flynd

Message:

Changed some calls to daemon to not use uin version of functions.

Location:

trunk/qt-gui/src

Files:

• keyrequestdlg.cpp (modified) (1 diff)
• licqkimiface.cpp (modified) (1 diff)
• mainwin.cpp (modified) (2 diffs)
• searchuserdlg.cpp (modified) (5 diffs)
• searchuserdlg.h (modified) (1 diff)
• sigman.cpp (modified) (1 diff)
• usereventdlg.cpp (modified) (4 diffs)
• userinfodlg.cpp (modified) (1 diff)
• userselectdlg.cpp (modified) (1 diff)

trunk/qt-gui/src/keyrequestdlg.cpp

@@ -156 +156 @@
 void KeyRequestDlg::openConnection()
 {
-  //TODO fix this in daemon
-  char *p;
-  unsigned long uin = strtoul(m_szId, &p,10);
-  if( (p == 0 || (p && !*p)) && m_nPPID == LICQ_PPID )
-    icqEventTag = gLicqDaemon->icqOpenSecureChannel(uin);
+  if (m_nPPID == LICQ_PPID )
+    icqEventTag = gLicqDaemon->icqOpenSecureChannel(m_szId);
 }
 
 void KeyRequestDlg::closeConnection()
 {
-  //TODO fix this in daemon
-  char *p;
-  unsigned long uin = strtoul(m_szId, &p,10);
-  if( (p == 0 || (p && !*p)) && m_nPPID == LICQ_PPID )
-    icqEventTag = gLicqDaemon->icqCloseSecureChannel(uin);
+  if (m_nPPID == LICQ_PPID )
+    icqEventTag = gLicqDaemon->icqCloseSecureChannel(m_szId);
 }
 

trunk/qt-gui/src/licqkimiface.cpp

@@ -297 +297 @@
 
     FOR_EACH_PROTO_USER_START(PPID, LOCK_R)
-    QString uin = pUser->UinString();
+    QString uin = pUser->IdString();
     if (!uin.isEmpty() && uin == contactId)
     {

trunk/qt-gui/src/mainwin.cpp

@@ -3581 +3581 @@
   // We might have no owner
   QString m_Alias = (o == 0) ? QString(tr("(Error! No owner set)")) : QString::fromUtf8(o->GetAlias());
-  unsigned long m_Uin = (o == 0) ? 0 : o->Uin();
+  QString id = (o == 0) ? "" : o->IdString();
   
   QString about(tr("Licq version %1%8.\n"
@@ -3595 +3595 @@
                    "%5 contacts.").arg(licqDaemon->Version())
                    .arg(VERSION).arg(m_Alias)
-                   .arg(m_Uin).arg(gUserManager.NumUsers())
+                   .arg(id).arg(gUserManager.NumUsers())
 #ifdef USE_KDE
                    .arg(tr("(with KDE support)\n"))

trunk/qt-gui/src/searchuserdlg.cpp

@@ -79 +79 @@
   QString qsAge;
   QString qsAuth;
-  
-  uinVal = s->Uin();
+
+  myId = s->Id();
+  myPpid = s->PPID();
   QTextCodec *codec = QTextCodec::codecForName(encoding);
   if (codec == 0)
     codec = QTextCodec::codecForLocale();
   setText(0, codec->toUnicode(s->Alias()));
-  setText(1, QString::number(s->Uin()));
+  setText(1, s->Id());
   setText(2, codec->toUnicode(s->FirstName()) + QString(" ") + codec->toUnicode(s->LastName()));
   setText(3, s->Email());
@@ -120 +121 @@
   setText(6, qsAuth);
 }
-
-
-unsigned long SearchItem::uin()
-{
-  return (uinVal);
-}
-
 
 // -----------------------------------------------------------------------------
@@ -513 +507 @@
     if (current->isSelected())
     {
-      //XXX Convert this to a string
-      char szId[64];
-      snprintf(szId, 64, "%lu", current->uin());
-      ICQUser *u = gUserManager.FetchUser(szId, LICQ_PPID, LOCK_R);
+      ICQUser* u = gUserManager.FetchUser(current->id().latin1(), current->ppid(), LOCK_R);
       if (!u)
-        server->AddUserToList(szId, LICQ_PPID, false, true);
+        server->AddUserToList(current->id().latin1(), current->ppid(), false, true);
       else
         gUserManager.DropUser(u);
-      
-      mainwin->callInfoTab(mnuUserGeneral, szId, LICQ_PPID, false, true);
+
+      mainwin->callInfoTab(mnuUserGeneral, current->id().latin1(), current->ppid(), false, true);
       break;
     }
@@ -537 +528 @@
     if (current->isSelected())
     {
-      ICQUser* user = gUserManager.FetchUser(current->uin(), LOCK_R);
+      ICQUser* user = gUserManager.FetchUser(current->id().latin1(), current->ppid(), LOCK_R);
 
       if (user)
@@ -544 +535 @@
         gUserManager.DropUser(user);
         if (tempUser)
-          gUserManager.RemoveUser(current->uin());
+          gUserManager.RemoveUser(current->id().latin1(), current->ppid());
       }
 
-      if (server->AddUserToList(current->uin()) &&
+      if (server->AddUserToList(current->id().latin1(), current->ppid()) &&
           qcbAlertUser->isChecked()) // alert the user they were added
-        server->icqAlertUser(current->uin());
+        server->icqAlertUser(current->id().latin1(), current->ppid());
     }
     current = static_cast<SearchItem*>(current->nextSibling());

trunk/qt-gui/src/searchuserdlg.h

@@ -58 +58 @@
 public:
   SearchItem(const CSearchAck* s, const QString& encoding, QListView* parent);
-   unsigned long uin();
+
+  QString id() const { return myId; }
+  unsigned long ppid() const { return myPpid; }
+
 protected:
-   unsigned long uinVal;
+   QString myId;
+   unsigned long myPpid;
 };
 

trunk/qt-gui/src/sigman.cpp

@@ -120 +120 @@
   case SIGNAL_ADDxSERVERxLIST:
   //TODO
-    licqDaemon->icqRenameUser(s->Uin());
+    licqDaemon->icqRenameUser(s->Id());
     break;
   case SIGNAL_NEWxPROTO_PLUGIN:

trunk/qt-gui/src/usereventdlg.cpp

@@ -1292 +1292 @@
       {
         //TODO in CICQDaemon
-        server->icqFileTransferAccept(strtoul(m_lUsers.front().c_str(), (char **)NULL, 10),
+        server->icqFileTransferAccept(m_lUsers.front().c_str(),
           fileDlg->LocalPort(), f->Sequence(), f->MessageID(), f->IsDirect(),
           f->FileDescription(), f->Filename(), f->FileSize());
@@ -1356 +1356 @@
 
         //TODO
-        server->icqFileTransferRefuse(strtoul(m_lUsers.front().c_str(), (char **)NULL, 10),
+        server->icqFileTransferRefuse(m_lUsers.front().c_str(),
           codec->fromUnicode(r->RefuseMessage()),
           m_xCurrentReadEvent->Sequence(), f->MessageID(), f->IsDirect());
@@ -2579 +2579 @@
       ConstFileList filelist(ue->FileList());
       //TODO in the daemon
-      icqEventTag = server->icqFileTransfer(strtoul(m_lUsers.front().c_str(), (char **)NULL, 10),
+      icqEventTag = server->icqFileTransfer(m_lUsers.front().c_str(),
         ue->Filename(), ue->FileDescription(), filelist, nLevel, !bOnline);
 
@@ -3152 +3152 @@
   unsigned long icqEventTag;
   //TODO in daemon
-  icqEventTag = server->icqFileTransfer(strtoul(m_lUsers.front().c_str(), (char **)NULL, 10),
+  icqEventTag = server->icqFileTransfer(m_lUsers.front().c_str(),
      codec->fromUnicode(edtItem->text()),
      codec->fromUnicode(mleSend->text()), m_lFileList,

trunk/qt-gui/src/userinfodlg.cpp

@@ -744 +744 @@
   {
     QString url;
-    url.sprintf("(http://%lu.homepage.icq.com/)", u->Uin());
+    url.sprintf("(http://%s.homepage.icq.com/)", u->IdString());
     lblICQHomepage->setText(tr("User has an ICQ Homepage ") + url);
   }

trunk/qt-gui/src/userselectdlg.cpp

@@ -88 +88 @@
     return;
   }
-    cmbUser->insertItem(QString("%1 (%2)").arg(o->GetAlias()).arg(o->Uin()));
+    cmbUser->insertItem(QString("%1 (%2)").arg(o->GetAlias()).arg(o->IdString()));
     edtPassword->setText(o->Password());
     gUserManager.DropOwner();