Changeset 6463 for trunk/qt4-gui/src/dialogs

Timestamp:

07/24/08 04:08:58 (4 months ago)

Author:

flynd

Message:

Use a const pointer for user objects that are only fetched for read access. Fixed some places where we changed the user even though we just had a read lock.

Location:

trunk/qt4-gui/src/dialogs

Files:

• adduserdlg.cpp (modified) (2 diffs)
• authuserdlg.cpp (modified) (1 diff)
• customautorespdlg.cpp (modified) (1 diff)
• forwarddlg.cpp (modified) (1 diff)
• gpgkeymanager.cpp (modified) (4 diffs)
• gpgkeymanager.h (modified) (2 diffs)
• gpgkeyselect.cpp (modified) (3 diffs)
• gpgkeyselect.h (modified) (1 diff)
• historydlg.cpp (modified) (2 diffs)
• keyrequestdlg.cpp (modified) (1 diff)
• mmsenddlg.cpp (modified) (3 diffs)
• refusedlg.cpp (modified) (1 diff)
• showawaymsgdlg.cpp (modified) (2 diffs)
• userinfodlg.cpp (modified) (17 diffs)
• userinfodlg.h (modified) (1 diff)

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

@@ -99 +99 @@
   if (!id.isEmpty())
   {
-    ICQUser* u = gUserManager.FetchUser(id, ppid, LOCK_R);
+    const ICQUser* u = gUserManager.FetchUser(id, ppid, LOCK_R);
 
     if (u == NULL)
@@ -105 +105 @@
     else
     {
-      if (u->NotInList())
+      bool notInList = u->NotInList();
+      gUserManager.DropUser(u);
+
+      if (notInList)
       {
-        u->Unlock();
         gUserManager.SetUserInGroup(id, ppid, GROUPS_USER, group, true, true);
-        u->Lock(LOCK_W);
-        u->SetPermanent();
+        ICQUser* user = gUserManager.FetchUser(id, ppid, LOCK_W);
+        user->SetPermanent();
+        gUserManager.DropUser(user);
         added = true;
       }
-      gUserManager.DropUser(u);
     }
   }

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

@@ -70 +70 @@
     toplay->addWidget(lblUin);
     QString userName = myId;
-    ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
+    const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
     if (u != NULL)
     {

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

@@ -73 +73 @@
   lay->addWidget(buttons);
 
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
 
   if (u == NULL)

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

@@ -164 +164 @@
   m_nPPID = nPPID;
 
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
   if (u == NULL)
     return;

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

@@ -193 +193 @@
   if (!found)
   {
-    ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
+    const ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
     if (u == NULL)
       return;
@@ -266 +266 @@
 
 // KEYLISTITEM
-KeyListItem::KeyListItem(QTreeWidget* parent, ICQUser* u)
+KeyListItem::KeyListItem(QTreeWidget* parent, const ICQUser* u)
   : QTreeWidgetItem(parent),
     szId(u->IdString()),
@@ -275 +275 @@
 }
 
-void KeyListItem::updateText(ICQUser* u)
+void KeyListItem::updateText(const ICQUser* u)
 {
   setText(0, QString::fromUtf8(u->GetAlias()));
@@ -293 +293 @@
 void KeyListItem::slot_done()
 {
-  ICQUser* u = gUserManager.FetchUser(szId.toLatin1(), nPPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(szId.toLatin1(), nPPID, LOCK_R);
   keySelect = NULL;
 

trunk/qt4-gui/src/dialogs/gpgkeymanager.h

@@ -71 +71 @@
 
 public:
-  KeyListItem(QTreeWidget* parent, ICQUser* u);
+  KeyListItem(QTreeWidget* parent, const ICQUser* u);
 
   void edit();
@@ -83 +83 @@
   unsigned long nPPID;
   GPGKeySelect* keySelect;
-  void updateText(ICQUser* u);
+  void updateText(const ICQUser* u);
 
 private slots:

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

@@ -56 +56 @@
   Support::setWidgetProps(this, "GPGKeySelectDialog");
 
-  ICQUser* u = gUserManager.FetchUser(szId.toLatin1(), nPPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(szId.toLatin1(), nPPID, LOCK_R);
   if (u == NULL)
     return;
@@ -224 +224 @@
 }
 
-void KeyView::testViewItem(QTreeWidgetItem* item, ICQUser* u)
+void KeyView::testViewItem(QTreeWidgetItem* item, const ICQUser* u)
 {
   int val = 0;
@@ -253 +253 @@
   gpgme_new(&mCtx);
 
-  ICQUser* u = gUserManager.FetchUser(szId.toLatin1(), nPPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(szId.toLatin1(), nPPID, LOCK_R);
   maxItemVal = -1;
   maxItem = NULL;

trunk/qt4-gui/src/dialogs/gpgkeyselect.h

@@ -42 +42 @@
   QString szId;
   unsigned long nPPID;
-  void testViewItem(QTreeWidgetItem* item, ICQUser* u);
+  void testViewItem(QTreeWidgetItem* item, const ICQUser* u);
   int maxItemVal;
   QTreeWidgetItem* maxItem;

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

@@ -161 +161 @@
   show();
 
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
 
   QString name = tr("INVALID USER");
@@ -277 +277 @@
   if (signal->SubSignal() == USER_EVENTS)
   {
-    ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
+    const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
     if (u == NULL)
       return;

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

@@ -49 +49 @@
   setAttribute(Qt::WA_DeleteOnClose, true);
 
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
   setWindowTitle(tr("Licq - Secure Channel with %1")
       .arg(QString::fromUtf8(u->GetAlias())));

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

@@ -168 +168 @@
     case ICQ_CMDxSUB_MSG:
     {
-      ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
+      const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
       if (u == NULL) return;
       QTextCodec* codec = UserCodec::codecForICQUser(u);
@@ -239 +239 @@
     case ICQ_CMDxSUB_URL:
     {
-      ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
+      const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
       if (u == NULL) return;
       grpSending->setTitle(tr("Sending mass URL to %1...").arg(QString::fromUtf8(u->GetAlias())));
@@ -252 +252 @@
     case ICQ_CMDxSUB_CONTACTxLIST:
     {
-      ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
+      const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
       if (u == NULL) return;
       grpSending->setTitle(tr("Sending mass list to %1...").arg(QString::fromUtf8(u->GetAlias())));

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

@@ -45 +45 @@
   QVBoxLayout* lay = new QVBoxLayout(this);
 
-  ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
   QLabel* lbl = new QLabel(tr("Refusal message for %1 with ").arg(t) + QString::fromUtf8(u->GetAlias()) + ":");
   lay->addWidget(lbl);

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

@@ -81 +81 @@
   lay->addWidget(buttons);
 
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
   QTextCodec* codec = UserCodec::codecForICQUser(u);
   chkShowAgain->setChecked(u->ShowAwayMsg());
@@ -165 +165 @@
        e->SNAC() == MAKESNAC(ICQ_SNACxFAM_LOCATION, ICQ_SNACxLOC_INFOxREQ)))
   {
-    ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
+    const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
     QTextCodec* codec = UserCodec::codecForICQUser(u);
     const char* szAutoResp =

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

@@ -179 +179 @@
   lay->addLayout(l);
 
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
   if (u == NULL)
   {
@@ -348 +348 @@
 }
 
-void UserInfoDlg::SetGeneralInfo(ICQUser* u)
+void UserInfoDlg::SetGeneralInfo(const ICQUser* u)
 {
   tabList[GeneralInfo].loaded = true;
@@ -587 +587 @@
 }
 
-void UserInfoDlg::SetMoreInfo(ICQUser* u)
+void UserInfoDlg::SetMoreInfo(const ICQUser* u)
 {
   tabList[MoreInfo].loaded = true;
@@ -848 +848 @@
 }
 
-void UserInfoDlg::SetMore2Info(ICQUser* u)
-{
-  ICQUserCategory* cat;
+void UserInfoDlg::SetMore2Info(const ICQUser* u)
+{
+  const ICQUserCategory* cat;
   bool drop = false;
   int i;
@@ -896 +896 @@
 }
 
-void UserInfoDlg::UpdateMore2Info(QTextCodec* codec, ICQUserCategory* cat)
+void UserInfoDlg::UpdateMore2Info(QTextCodec* codec, const ICQUserCategory* cat)
 {
   QTreeWidgetItem* lvi = NULL;
@@ -1073 +1073 @@
 }
 
-void UserInfoDlg::SetWorkInfo(ICQUser* u)
+void UserInfoDlg::SetWorkInfo(const ICQUser* u)
 {
   tabList[WorkInfo].loaded = true;
@@ -1183 +1183 @@
 }
 
-void UserInfoDlg::SetAbout(ICQUser* u)
+void UserInfoDlg::SetAbout(const ICQUser* u)
 {
   tabList[AboutInfo].loaded = true;
@@ -1264 +1264 @@
 }
 
-void UserInfoDlg::SetPhoneBook(ICQUser* u)
+void UserInfoDlg::SetPhoneBook(const ICQUser* u)
 {
   tabList[PhoneInfo].loaded = true;
@@ -1444 +1444 @@
 }
 
-void UserInfoDlg::SetPicture(ICQUser* u)
+void UserInfoDlg::SetPicture(const ICQUser* u)
 {
   if (!m_bOwner || !tabList[PictureInfo].loaded)
@@ -1556 +1556 @@
 }
 
-void UserInfoDlg::SetLastCountersInfo(ICQUser* u)
+void UserInfoDlg::SetLastCountersInfo(const ICQUser* u)
 {
   tabList[LastCountersInfo].loaded = true;
@@ -1612 +1612 @@
 }
 
-void UserInfoDlg::SetKABCInfo(ICQUser* u)
+void UserInfoDlg::SetKABCInfo(const ICQUser* u)
 {
 #ifdef USE_KABC
@@ -1721 +1721 @@
   }
 
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
   if (u == NULL)
     return;
@@ -1732 +1732 @@
 void UserInfoDlg::PhoneBookUpdated(struct PhoneBookEntry pbe, int entryNum)
 {
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
   if (u == NULL)
     return;
@@ -1776 +1776 @@
   m_PhoneBook->SetActive(index - 1);
 
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
   if (u == NULL)
     return;
@@ -1971 +1971 @@
       // save current status of "chkKeepAliasOnUpdate"
       // and the alias
-      ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
+      ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_W);
       if (u == NULL) return;
       u->SetEnableSave(false);
@@ -1997 +1997 @@
     case PhoneInfo:
     {
-      ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
+      const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
       if (u == NULL) return;
       bool bSendServer = (u->SocketDesc(ICQ_CHNxINFO) < 0);
@@ -2225 +2225 @@
   if (m_nPPID != sig->PPID() || myId != sig->Id()) return;
 
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
   if (u == NULL) return;
 

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

@@ -192 +192 @@
   QString m_kabcID;
 
-  void SetGeneralInfo(ICQUser*);
-  void SetMoreInfo(ICQUser*);
-  void SetMore2Info(ICQUser*);
-  void UpdateMore2Info(QTextCodec*, ICQUserCategory*);
-  void SetWorkInfo(ICQUser*);
-  void SetAbout(ICQUser*);
-  void SetPhoneBook(ICQUser*);
-  void UpdatePhoneBook(QTextCodec*);
-  void SetPicture(ICQUser*);
-  void SetLastCountersInfo(ICQUser*);
-  void SetKABCInfo(ICQUser*);
+  void SetGeneralInfo(const ICQUser* u);
+  void SetMoreInfo(const ICQUser* u);
+  void SetMore2Info(const ICQUser* u);
+  void UpdateMore2Info(QTextCodec* codec, const ICQUserCategory* cat);
+  void SetWorkInfo(const ICQUser* u);
+  void SetAbout(const ICQUser* u);
+  void SetPhoneBook(const ICQUser* u);
+  void UpdatePhoneBook(QTextCodec* u);
+  void SetPicture(const ICQUser* u);
+  void SetLastCountersInfo(const ICQUser* u);
+  void SetKABCInfo(const ICQUser* u);
   void UpdateKABCInfo();
   void SaveGeneralInfo();