Changeset 6406 for trunk/qt-gui

Timestamp:

07/03/08 22:20:05 (5 months ago)

Author:

flynd

Message:

More uin removed from the plugins.

Location:

trunk/qt-gui/src

Files:

• chatdlg.cpp (modified) (1 diff)
• reqauthdlg.cpp (modified) (1 diff)
• usereventdlg.cpp (modified) (9 diffs)

trunk/qt-gui/src/chatdlg.cpp

@@ -748 +748 @@
         QString n = UserCodec::codecForCChatUser(u)->toUnicode(u->Name());
 
-        if (n.isEmpty()) n.setNum(u->Uin());
+        if (n.isEmpty())
+          n = u->Id();
         chatClose(u);
         InformUser(this, tr("%1 closed connection.").arg(n));

trunk/qt-gui/src/reqauthdlg.cpp

@@ -97 +97 @@
     //TODO add a drop down list for protocol
     QTextCodec *codec = UserCodec::codecForProtoUser(szId, LICQ_PPID);
-    server->icqRequestAuth(strtoul(szId, (char **)NULL, 10),
-      codec->fromUnicode(mleRequest->text()));
+    server->icqRequestAuth(szId, codec->fromUnicode(mleRequest->text()));
     close(true);
   }

trunk/qt-gui/src/usereventdlg.cpp

@@ -1265 +1265 @@
         {
           //TODO in CICQDaemon
-          server->icqChatRequestAccept(strtoul(m_lUsers.front().c_str(), (char **)NULL, 10), 0,
+          server->icqChatRequestAccept(m_lUsers.front().c_str(), 0,
             c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
         }
@@ -1274 +1274 @@
         {
           //TODO in CICQDaemon
-          server->icqChatRequestAccept(strtoul(m_lUsers.front().c_str(), (char **)NULL, 10),
+          server->icqChatRequestAccept(m_lUsers.front().c_str(),
             chatDlg->LocalPort(), c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
         }
@@ -1336 +1336 @@
 
         //TODO in CICQDaemon
-        server->icqChatRequestRefuse(strtoul(m_lUsers.front().c_str(), (char **)NULL, 10),
+        server->icqChatRequestRefuse(m_lUsers.front().c_str(),
           codec->fromUnicode(r->RefuseMessage()),
           m_xCurrentReadEvent->Sequence(), c->MessageID(), c->IsDirect());
@@ -1391 +1391 @@
         //TODO
         if (chatDlg->StartAsClient(c->Port()))
-          server->icqChatRequestAccept(strtoul(m_lUsers.front().c_str(), (char **)NULL, 10), 0, c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
+          server->icqChatRequestAccept(m_lUsers.front().c_str(), 0, c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
       }
       else  // single party (other side connects to us)
@@ -1399 +1399 @@
         if (j->exec() && (chatDlg = j->JoinedChat()) != NULL)
           //TODO
-          server->icqChatRequestAccept(strtoul(m_lUsers.front().c_str(), (char **)NULL, 10), chatDlg->LocalPort(), c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
+          server->icqChatRequestAccept(m_lUsers.front().c_str(), chatDlg->LocalPort(), c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
         delete j;
       }
@@ -2569 +2569 @@
       if (ue->Clients() == NULL)
         //TODO in the daemon
-        icqEventTag = server->icqChatRequest(strtoul(m_lUsers.front().c_str(), (char **)NULL, 10),
+        icqEventTag = server->icqChatRequest(m_lUsers.front().c_str(),
           ue->Reason(), nLevel, !bOnline);
       else
         //TODO in the daemon
         icqEventTag = server->icqMultiPartyChatRequest(
-              strtoul(m_lUsers.front().c_str(), (char **)NULL, 10), ue->Reason(), ue->Clients(),
+            m_lUsers.front().c_str(), ue->Reason(), ue->Clients(),
               ue->Port(), nLevel, !bOnline);
 
@@ -2593 +2593 @@
       CEventSms *ue = (CEventSms *)e->UserEvent();
       //TODO in the daemon
-      icqEventTag = server->icqSendSms(ue->Number(), ue->Message(),
-        strtoul(m_lUsers.front().c_str(), (char **)NULL, 0));
+      icqEventTag = server->icqSendSms(m_lUsers.front().c_str(), LICQ_PPID,
+        ue->Number(), ue->Message());
 
       break;
@@ -3304 +3304 @@
   if (m_nMPChatPort == 0)
     //TODO in daemon
-    icqEventTag = server->icqChatRequest(strtoul(m_lUsers.front().c_str(), (char **)NULL, 10),
+    icqEventTag = server->icqChatRequest(m_lUsers.front().c_str(),
                                          codec->fromUnicode(mleSend->text()),
                                          chkUrgent->isChecked() ? ICQ_TCPxMSG_URGENT : ICQ_TCPxMSG_NORMAL,
                                          chkSendServer->isChecked());
   else
-    icqEventTag = server->icqMultiPartyChatRequest(strtoul(m_lUsers.front().c_str(), (char **)NULL, 10),
+    icqEventTag = server->icqMultiPartyChatRequest(m_lUsers.front().c_str(),
                                                    codec->fromUnicode(mleSend->text()),
                                                    codec->fromUnicode(m_szMPChatClients),
@@ -3548 +3548 @@
 
   //TODO in daemon
-  icqEventTag = server->icqSendSms(nfoNumber->text().latin1(), mleSend->text().utf8().data(),
-    strtoul(m_lUsers.front().c_str(), (char **)NULL, 10));
+  icqEventTag = server->icqSendSms(m_lUsers.front().c_str(), LICQ_PPID,
+      nfoNumber->text().latin1(), mleSend->text().utf8().data());
   m_lnEventTag.push_back(icqEventTag);