Changeset 6366 for trunk/qt-gui

Timestamp:

07/01/08 03:50:37 (5 months ago)

Author:

flynd

Message:

Removed some uin calls in qt-gui.

Location:

trunk/qt-gui/src

Files:

• mmlistview.cpp (modified) (5 diffs)
• mmlistview.h (modified) (3 diffs)
• usereventdlg.cpp (modified) (2 diffs)

trunk/qt-gui/src/mmlistview.cpp

@@ -47 +47 @@
   char *sTemp;
 
-  m_nUin = u->Uin();
   m_szId = u->IdString() ? strdup(u->IdString()) : 0;
   m_nPPID = u->PPID();
@@ -93 +92 @@
 //-----UserList::constructor-----------------------------------------------------------------------
 CMMUserView::CMMUserView (ColumnInfos &_colInfo, bool bHeader,
-   char *szId, unsigned long nPPID, CMainWindow *pMainwin,
+    const char* szId, unsigned long nPPID, CMainWindow *pMainwin,
    QWidget *parent)
    : QListView(parent, "MMUserView")
@@ -125 +124 @@
 }
 
-
-CMMUserView::CMMUserView (ColumnInfos &_colInfo, bool bHeader,
-   unsigned long nUin, CMainWindow *pMainwin,
-   QWidget *parent)
-   : QListView(parent, "MMUserView")
-{
-  mnuMM = new QPopupMenu(NULL);
-  mnuMM->insertItem(tr("Remove"), mnuMM_remove);
-  mnuMM->insertItem(tr("Crop"), mnuMM_crop);
-  mnuMM->insertItem(tr("Clear"), mnuMM_clear);
-  mnuMM->insertSeparator();
-  mnuMM->insertItem(tr("Add Group"), mnuMM_addgroup);
-  mnuMM->insertItem(tr("Add All"), mnuMM_addall);
-  connect(mnuMM, SIGNAL(activated(int)), SLOT(slot_menu(int)));
-
-  colInfo = _colInfo;
-  m_szId = 0;
-  m_nUin = nUin;
-  mainwin = pMainwin;
-
-  for (unsigned short i = 0; i < colInfo.size(); i++)
-  {
-    addColumn(colInfo[i]->m_sTitle, colInfo[i]->m_nWidth);
-    setColumnAlignment(i, 1<<colInfo[i]->m_nAlign);
-  }
-
-  setAllColumnsShowFocus (true);
-  setSelectionMode(Extended);
-  setSorting(0);
-  bHeader ? header()->show() : header()->hide();
-
-  setAcceptDrops(true);
-}
-
-
 CMMUserView::~CMMUserView()
 {
@@ -267 +231 @@
   gUserManager.DropUser(u);
 }
-
-void CMMUserView::AddUser(unsigned long nUin)
-{
-  if (nUin == 0 || nUin == m_nUin) return;
-
-  CMMUserViewItem *i = (CMMUserViewItem *)firstChild();
-  while (i != NULL && i->Uin() != nUin)
-    i = (CMMUserViewItem *)i->nextSibling();
-  if (i != NULL) return;
-
-
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
-  if (u == NULL) return;
-  (void) new CMMUserViewItem(u, this);
-  gUserManager.DropUser(u);
-}
-
-
 
 //-----CUserList::mousePressEvent---------------------------------------------
@@ -350 +296 @@
       item = firstChild();
       if (item == NULL) return;
-      if (((CMMUserViewItem *)item)->Uin() == 0)
+      if (((CMMUserViewItem *)item)->Id() == NULL)
         item = item->nextSibling();
       setCurrentItem(item);

trunk/qt-gui/src/mmlistview.h

@@ -39 +39 @@
   CMMUserViewItem (ICQUser *, QListView *);
   virtual ~CMMUserViewItem();
-  unsigned long Uin()  { return m_nUin; }
   char *Id()  { return m_szId; }
   unsigned long PPID()  { return m_nPPID; }
 
 protected:
-  unsigned long m_nUin;
   char *m_szId;
   unsigned long m_nPPID;
@@ -57 +55 @@
   Q_OBJECT
 public:
-  CMMUserView (ColumnInfos &_colInfo, bool, unsigned long, CMainWindow *,
-     QWidget *parent = 0);
-  CMMUserView(ColumnInfos &_colInfo, bool, char *, unsigned long,
+  CMMUserView(ColumnInfos &_colInfo, bool, const char*, unsigned long,
      CMainWindow *, QWidget *parent = 0);
   virtual ~CMMUserView();
@@ -69 +65 @@
   QPopupMenu *mnuMM;
   ColumnInfos colInfo;
-  unsigned long m_nUin;
   char *m_szId;
   unsigned long m_nPPID;

trunk/qt-gui/src/usereventdlg.cpp

@@ -2191 +2191 @@
       //TODO in CMMUserView
       lstMultipleRecipients = new CMMUserView(mainwin->colInfo, mainwin->m_bShowHeader,
-                                  strtoul(m_lUsers.front().c_str(), (char **)NULL, 10), mainwin, grpMR);
+          m_lUsers.front().c_str(), LICQ_PPID, mainwin, grpMR);
       lstMultipleRecipients->setFixedWidth(mainwin->UserView()->width());
     }
@@ -2545 +2545 @@
       CEventContactList* ue = (CEventContactList *) e->UserEvent();
       const ContactList& clist = ue->Contacts();
-      UinList uins;
-
+      UserStringList users;
+
+      // ContactList is const but string list holds "char*" so we have to copy each string
       for(ContactList::const_iterator i = clist.begin(); i != clist.end(); i++)
-        uins.push_back((*i)->Uin());
-
-      if(uins.size() == 0)
+        users.push_back(strdup((*i)->IdString()));
+
+      if(users.size() == 0)
         break;
 
-      icqEventTag = server->icqSendContactList(strtoul(m_lUsers.front().c_str(), (char **)NULL, 10),
-        uins, bOnline, nLevel, false, &icqColor);
+      icqEventTag = server->icqSendContactList(m_lUsers.front().c_str(),
+          users, bOnline, nLevel, false, &icqColor);
+
+      // Free the strings in the list
+      for (UserStringList::iterator i = users.begin(); i != users.end(); ++i)
+        free(*i);
 
       break;