Changeset 6294

Timestamp:

06/14/08 06:24:08 (4 months ago)

Author:

flynd

Message:

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

Location:

trunk/qt4-gui/src

Files:

• core/signalmanager.cpp (modified) (1 diff)
• dialogs/keyrequestdlg.cpp (modified) (1 diff)
• dialogs/userinfodlg.cpp (modified) (1 diff)
• dialogs/userselectdlg.cpp (modified) (1 diff)
• userevents/usersendcommon.cpp (modified) (1 diff)
• userevents/usersendfileevent.cpp (modified) (1 diff)
• userevents/userviewevent.cpp (modified) (2 diffs)

trunk/qt4-gui/src/core/signalmanager.cpp

@@ -82 +82 @@
     case SIGNAL_ADDxSERVERxLIST:
       //TODO
-      gLicqDaemon->icqRenameUser(sig->Uin());
+      gLicqDaemon->icqRenameUser(sig->Id());
       break;
 

trunk/qt4-gui/src/dialogs/keyrequestdlg.cpp

@@ -148 +148 @@
 void KeyRequestDlg::openConnection()
 {
-  //TODO fix this in daemon
-  bool ok;
-  unsigned long uin = myId.toULong(&ok);
-  if (ok && myPpid == LICQ_PPID)
-    myIcqEventTag = gLicqDaemon->icqOpenSecureChannel(uin);
+  if (myPpid == LICQ_PPID)
+    myIcqEventTag = gLicqDaemon->icqOpenSecureChannel(myId.toLatin1().data());
 }
 
 void KeyRequestDlg::closeConnection()
 {
-  //TODO fix this in daemon
-  bool ok;
-  unsigned long uin = myId.toULong(&ok);
-  if (ok && myPpid == LICQ_PPID)
-    myIcqEventTag = gLicqDaemon->icqCloseSecureChannel(uin);
+  if (myPpid == LICQ_PPID)
+    myIcqEventTag = gLicqDaemon->icqCloseSecureChannel(myId.toLatin1().data());
 }
 

trunk/qt4-gui/src/dialogs/userinfodlg.cpp

@@ -717 +717 @@
   {
     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/qt4-gui/src/dialogs/userselectdlg.cpp

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

trunk/qt4-gui/src/userevents/usersendcommon.cpp

@@ -885 +885 @@
 
       //TODO in the daemon
-      icqEventTag = gLicqDaemon->icqFileTransfer(strtoul(myUsers.front().c_str(), NULL, 10),
+      icqEventTag = gLicqDaemon->icqFileTransfer(myUsers.front().c_str(),
           ue->Filename(), ue->FileDescription(), filelist, level, !online);
 

trunk/qt4-gui/src/userevents/usersendfileevent.cpp

@@ -224 +224 @@
   //TODO in daemon
   icqEventTag = gLicqDaemon->icqFileTransfer(
-      strtoul(myUsers.front().c_str(), NULL, 10),
+      myUsers.front().c_str(),
       myCodec->fromUnicode(myFileEdit->text()),
       myCodec->fromUnicode(myMessageEdit->toPlainText()),

trunk/qt4-gui/src/userevents/userviewevent.cpp

@@ -461 +461 @@
         // FIXME: must have been done in CICQDaemon
         gLicqDaemon->icqFileTransferAccept(
-            strtoul(myUsers.front().c_str(), NULL, 10),
+            myUsers.front().c_str(),
             fileDlg->LocalPort(), f->Sequence(), f->MessageID(), f->IsDirect(),
             f->FileDescription(), f->Filename(), f->FileSize());
@@ -525 +525 @@
         // FIXME: must have been done in CICQDaemon
         gLicqDaemon->icqFileTransferRefuse(
-            strtoul(myUsers.front().c_str(), NULL, 10),
+            myUsers.front().c_str(),
             myCodec->fromUnicode(r->RefuseMessage()), myCurrentEvent->Sequence(),
             f->MessageID(), f->IsDirect());