Changeset 3488 for branches/protocol_plugin_1_3_0

Timestamp:

05/03/03 09:14:22 (6 years ago)

Author:

emostar

Message:

Removing unnecessary code

Location:

branches/protocol_plugin_1_3_0/qt-gui/src

Files:

• filedlg.cpp (modified) (2 diffs)
• reqauthdlg.cpp (modified) (1 diff)
• userbox.cpp (modified) (4 diffs)
• userbox.h (modified) (1 diff)
• usercodec.cpp (modified) (2 diffs)
• usercodec.h (modified) (1 diff)

branches/protocol_plugin_1_3_0/qt-gui/src/filedlg.cpp

@@ -348 +348 @@
   read(ftman->Pipe(), buf, 32);
 
-  //TODO Fix this
-  QTextCodec *codec = UserCodec::codecForUIN(strtoul(m_szId, (char **)NULL, 10));
+  QTextCodec *codec = UserCodec::codecForProtoUser(m_szId, m_nPPID);
 
   CFileTransferEvent *e = NULL;
@@ -528 +527 @@
   bool bValid = false;
 
-  QTextCodec *codec = UserCodec::codecForUIN(m_nUin);
+  QTextCodec *codec = UserCodec::codecForProtoUser(m_szId, m_nPPID);
   
   // Get the local filename and open it, loop until valid or cancel

branches/protocol_plugin_1_3_0/qt-gui/src/reqauthdlg.cpp

@@ -143 +143 @@
 void ReqAuthDlg::ok()
 {
-  unsigned long nUin = edtUin->text().toULong();
+  char *szId = (char *)edtUin->text().ascii();
 
-  if (nUin != 0)
+  if (szId)
   {
-    QTextCodec *codec = UserCodec::codecForUIN(nUin);
-    server->icqRequestAuth(nUin, codec->fromUnicode(mleRequest->text()));
+    //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()));
     close(true);
   }

branches/protocol_plugin_1_3_0/qt-gui/src/userbox.cpp

@@ -63 +63 @@
   if(listView()->parent() == NULL)
     listView()->setCaption(CUserView::tr("%1 Floaty (%2)")
-                           .arg(_cUser->GetAlias()).arg(_cUser->Uin()));
+                           .arg(_cUser->GetAlias()).arg(_cUser->IdString()));
 
   m_nUin = _cUser->Uin();
@@ -168 +168 @@
   CUserView *v = (CUserView *)listView();
 
-  if (v == NULL || m_nUin == 0) return;
+  if (v == NULL || m_szId == 0) return;
 
   if (m_szId)
@@ -395 +395 @@
   p->setFont(newFont);
 
-  bool onlBlink = (listView()->onlTimerId && listView()->onlUin &&
-                   listView()->onlUin == m_nUin && listView()->onlCounter & 1);
+  bool onlBlink = (listView()->onlTimerId && listView()->onlId &&
+                   strcmp(listView()->onlId, m_szId) == 0 &&
+                   listView()->onlPPID == m_nPPID && listView()->onlCounter & 1);
 
   QColorGroup cg(cgdefault.foreground(), cgdefault.background(),
@@ -851 +852 @@
 }
 
-
-CUserView *CUserView::FindFloaty(unsigned long nUin)
-{
-  unsigned int i = 0;
-  for (; i<floaties->size(); i++)
-  {
-    if (static_cast<CUserViewItem*>(floaties->at(i)->firstChild())->ItemUin()== nUin)
-        break;
-  }
-  if(i<floaties->size()) return floaties->at(i);
-
-  return NULL;
-}
-
 CUserView *CUserView::FindFloaty(const char *szId, unsigned long nPPID)
 {

branches/protocol_plugin_1_3_0/qt-gui/src/userbox.h

@@ -134 +134 @@
 
   static UserFloatyList* floaties;
-  static CUserView *FindFloaty(unsigned long);
   static CUserView *FindFloaty(const char *, unsigned long);
   static void UpdateFloaties();

branches/protocol_plugin_1_3_0/qt-gui/src/usercodec.cpp

@@ -92 +92 @@
 }
 
-QTextCodec* UserCodec::codecForUIN(uint uin)
-{
-  QTextCodec *codec = QTextCodec::codecForLocale();
-  
-  ICQUser *u = gUserManager.FetchUser(uin, LOCK_R);
-  if (u != NULL)
-  {
-     codec = UserCodec::codecForICQUser(u);
-     gUserManager.DropUser(u);
-  }
-  
-  return codec;
-}
-
 QTextCodec *UserCodec::codecForProtoUser(const char *szId, unsigned long nPPID)
 {
@@ -126 +112 @@
 
   // return default encoding
-  return codecForUIN(u->Uin());
+  return codecForProtoUser(u->Id(), u->PPID());
 }
 

branches/protocol_plugin_1_3_0/qt-gui/src/usercodec.h

@@ -40 +40 @@
   // Retrieves the codec for an CChatUser object
   static QTextCodec * codecForCChatUser(CChatUser *u);
-  // Helper function to retrieve the codec for an UIN
-  static QTextCodec * codecForUIN(uint uin);
   // Retrieves the codec for a proto user
   static QTextCodec * codecForProtoUser(const char *, unsigned long);