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

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/core

Files:

• licqgui.cpp (modified) (7 diffs)
• licqkimiface.cpp (modified) (2 diffs)
• mainwin.cpp (modified) (1 diff)
• usermenu.cpp (modified) (2 diffs)

trunk/qt4-gui/src/core/licqgui.cpp

@@ -725 +725 @@
     parent = myMainWindow;
 
-  ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
   if (u == NULL)
     return true;
@@ -1065 +1065 @@
     return;
 
-  ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
 
   if (u == NULL)
@@ -1221 +1221 @@
     if (Config::Chat::instance()->msgChatView())
     {
-      ICQUser* u = NULL;
+      const ICQUser* u = NULL;
       if (ppid == 0)
       {
@@ -1311 +1311 @@
   if (id.isEmpty() || ppid == 0)
     return;
-  ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
   if (u == NULL)
     return;
@@ -1403 +1403 @@
   unsigned long ppid = sig->PPID();
 
-  ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
   if (u == NULL)
   {
@@ -1454 +1454 @@
         if (Config::Chat::instance()->autoPopup() >= popCheck)
         {
-          ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
+          const ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
           if (u != NULL)
           {
@@ -1500 +1500 @@
     case USER_TYPING:
     {
-      ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
+      const ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
       if (u == NULL)
         break;

trunk/qt4-gui/src/core/licqkimiface.cpp

@@ -406 +406 @@
 
     // check if user exists
-    ICQUser* pUser = gUserManager.FetchUser(contactId.latin1(), PPID, LOCK_R);
+    const ICQUser* pUser = gUserManager.FetchUser(contactId.latin1(), PPID, LOCK_R);
     if (pUser != 0)
     {
@@ -489 +489 @@
 
     // check if user already exists
-    ICQUser* pUser = gUserManager.FetchUser(contactId.latin1(), PPID, LOCK_R);
+    const ICQUser* pUser = gUserManager.FetchUser(contactId.latin1(), PPID, LOCK_R);
     if (pUser != 0)
     {

trunk/qt4-gui/src/core/mainwin.cpp

@@ -633 +633 @@
       }
 
-      ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
+      const ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
       if (u == NULL)
       {

trunk/qt4-gui/src/core/usermenu.cpp

@@ -227 +227 @@
 void UserMenu::aboutToShowMenu()
 {
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
 
   int status = (u == NULL ? ICQ_STATUS_OFFLINE : u->Status());
@@ -568 +568 @@
   if (gid == GROUP_IGNORE_LIST && !action->isChecked())
   {
-    ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
+    const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
     if (u == NULL)
       return;