Changeset 6406 for trunk/qt4-gui/src

Timestamp:

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

Author:

flynd

Message:

More uin removed from the plugins.

Location:

trunk/qt4-gui/src

Files:

• dialogs/chatdlg.cpp (modified) (1 diff)
• dialogs/reqauthdlg.cpp (modified) (1 diff)
• userevents/usersendchatevent.cpp (modified) (2 diffs)
• userevents/usersendcommon.cpp (modified) (2 diffs)
• userevents/usersendsmsevent.cpp (modified) (1 diff)
• userevents/userviewevent.cpp (modified) (5 diffs)

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

@@ -733 +733 @@
         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/qt4-gui/src/dialogs/reqauthdlg.cpp

@@ -102 +102 @@
     //TODO add a drop down list for protocol
     QTextCodec* codec = UserCodec::codecForProtoUser(id, LICQ_PPID);
-    gLicqDaemon->icqRequestAuth(id.toULong(),
+    gLicqDaemon->icqRequestAuth(id.toLatin1().data(),
       codec->fromUnicode(mleRequest->toPlainText()));
     close();

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

@@ -163 +163 @@
     //TODO in daemon
     icqEventTag = gLicqDaemon->icqChatRequest(
-        strtoul(myUsers.front().c_str(), NULL, 10),
+        myUsers.front().c_str(),
         myCodec->fromUnicode(myMessageEdit->toPlainText()),
         myUrgentCheck->isChecked() ? ICQ_TCPxMSG_URGENT : ICQ_TCPxMSG_NORMAL,
@@ -169 +169 @@
   else
     icqEventTag = gLicqDaemon->icqMultiPartyChatRequest(
-        strtoul(myUsers.front().c_str(), NULL, 10),
+        myUsers.front().c_str(),
         myCodec->fromUnicode(myMessageEdit->toPlainText()),
         myCodec->fromUnicode(myChatClients),

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

@@ -874 +874 @@
       if (ue->Clients() == NULL)
         //TODO in the daemon
-        icqEventTag = gLicqDaemon->icqChatRequest(strtoul(myUsers.front().c_str(), NULL, 10),
+        icqEventTag = gLicqDaemon->icqChatRequest(myUsers.front().c_str(),
             ue->Reason(), level, !online);
       else
         //TODO in the daemon
-        icqEventTag = gLicqDaemon->icqMultiPartyChatRequest(strtoul(myUsers.front().c_str(), NULL, 10),
+        icqEventTag = gLicqDaemon->icqMultiPartyChatRequest(myUsers.front().c_str(),
             ue->Reason(), ue->Clients(), ue->Port(), level, !online);
 
@@ -901 +901 @@
 
       //TODO in the daemon
-      icqEventTag = gLicqDaemon->icqSendSms(ue->Number(), ue->Message(),
-          strtoul(myUsers.front().c_str(), NULL, 0));
-
+      icqEventTag = gLicqDaemon->icqSendSms(myUsers.front().c_str(), LICQ_PPID,
+          ue->Number(), ue->Message());
       break;
     }

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

@@ -135 +135 @@
 
   //TODO in daemon
-  icqEventTag = gLicqDaemon->icqSendSms(
+  icqEventTag = gLicqDaemon->icqSendSms(myUsers.front().c_str(), LICQ_PPID,
       myNumberField->text().toLatin1(),
-      myMessageEdit->toPlainText().toUtf8().data(),
-      strtoul(myUsers.front().c_str(), NULL, 10));
+      myMessageEdit->toPlainText().toUtf8().data());
   myEventTag.push_back(icqEventTag);
 

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

@@ -434 +434 @@
         if (chatDlg->StartAsClient(c->Port()))
           gLicqDaemon->icqChatRequestAccept(
-              strtoul(myUsers.front().c_str(), NULL, 10),
+              myUsers.front().c_str(),
               0, c->Clients(), c->Sequence(),
               c->MessageID(), c->IsDirect());
@@ -443 +443 @@
         if (chatDlg->StartAsServer())
           gLicqDaemon->icqChatRequestAccept(
-              strtoul(myUsers.front().c_str(), NULL, 10),
+              myUsers.front().c_str(),
               chatDlg->LocalPort(), c->Clients(), c->Sequence(),
               c->MessageID(), c->IsDirect());
@@ -504 +504 @@
         // FIXME: must have been done in CICQDaemon
         gLicqDaemon->icqChatRequestRefuse(
-            strtoul(myUsers.front().c_str(), NULL, 10),
+            myUsers.front().c_str(),
             myCodec->fromUnicode(r->RefuseMessage()), myCurrentEvent->Sequence(),
             c->MessageID(), c->IsDirect());
@@ -562 +562 @@
         if (chatDlg->StartAsClient(c->Port()))
           gLicqDaemon->icqChatRequestAccept(
-              strtoul(myUsers.front().c_str(), NULL, 10),
+              myUsers.front().c_str(),
               0, c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
       }
@@ -572 +572 @@
         if (j->exec() && (chatDlg = j->JoinedChat()) != NULL)
           gLicqDaemon->icqChatRequestAccept(
-              strtoul(myUsers.front().c_str(), NULL, 10),
+              myUsers.front().c_str(),
               chatDlg->LocalPort(), c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
         delete j;