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

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

Files:

• contactlist.cpp (modified) (4 diffs)
• contactlist.h (modified) (2 diffs)
• contactuserdata.cpp (modified) (7 diffs)
• contactuserdata.h (modified) (4 diffs)

trunk/qt4-gui/src/contactlist/contactlist.cpp

@@ -91 +91 @@
     case LIST_CONTACT_ADDED:
     {
-      ICQUser* u = gUserManager.FetchUser(sig->Id(), sig->PPID(), LOCK_R);
+      const ICQUser* u = gUserManager.FetchUser(sig->Id(), sig->PPID(), LOCK_R);
       if (u == NULL)
       {
@@ -196 +196 @@
     return;
 
-  ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
   if (u == NULL)
     return;
@@ -339 +339 @@
 }
 
-void ContactListModel::addUser(ICQUser* licqUser)
+void ContactListModel::addUser(const ICQUser* licqUser)
 {
   ContactUserData* newUser = new ContactUserData(licqUser, this);
   connect(newUser, SIGNAL(dataChanged(const ContactUserData*)),
       SLOT(userDataChanged(const ContactUserData*)));
-  connect(newUser, SIGNAL(updateUserGroups(ContactUserData*, ICQUser*)),
-      SLOT(updateUserGroups(ContactUserData*, ICQUser*)));
+  connect(newUser, SIGNAL(updateUserGroups(ContactUserData*, const ICQUser*)),
+      SLOT(updateUserGroups(ContactUserData*, const ICQUser*)));
 
   myUsers.append(newUser);
@@ -351 +351 @@
 }
 
-void ContactListModel::updateUserGroups(ContactUserData* user, ICQUser* licqUser)
+void ContactListModel::updateUserGroups(ContactUserData* user, const ICQUser* licqUser)
 {
   // Check which user groups the user should be member of

trunk/qt4-gui/src/contactlist/contactlist.h

@@ -210 +210 @@
    * @param licqUser The user to add
    */
-  void addUser(ICQUser* licqUser);
+  void addUser(const ICQUser* licqUser);
 
   /**
@@ -412 +412 @@
    * @param licqUser The daemon user to get group membership from
    */
-  void updateUserGroups(ContactUserData* user, ICQUser* licqUser);
+  void updateUserGroups(ContactUserData* user, const ICQUser* licqUser);
 
 private:

trunk/qt4-gui/src/contactlist/contactuserdata.cpp

@@ -58 +58 @@
 
 
-ContactUserData::ContactUserData(ICQUser* licqUser, QObject* parent)
+ContactUserData::ContactUserData(const ICQUser* licqUser, QObject* parent)
   : myStatus(ICQ_STATUS_OFFLINE),
     myEvents(0),
@@ -144 +144 @@
 
 
-  ICQUser* u = gUserManager.FetchUser(sig->Id(), sig->PPID(), LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(sig->Id(), sig->PPID(), LOCK_R);
   if (u != NULL)
   {
@@ -157 +157 @@
 }
 
-void ContactUserData::updateAll(ICQUser* u)
+void ContactUserData::updateAll(const ICQUser* u)
 {
   myStatus = u->Status();
@@ -396 +396 @@
 }
 
-bool ContactUserData::updateText(ICQUser* licqUser)
+bool ContactUserData::updateText(const ICQUser* licqUser)
 {
   bool hasChanged = false;
@@ -425 +425 @@
 void ContactUserData::configUpdated()
 {
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
   if (u == NULL)
     return;
@@ -499 +499 @@
   // Here we update any content that may be dynamic, for example timestamps
 
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
   if (u == NULL)
     return;
@@ -669 +669 @@
 QString ContactUserData::tooltip() const
 {
-  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/contactlist/contactuserdata.h

@@ -54 +54 @@
    * @param parent Object to use as parent for those objects that needs it
    */
-  ContactUserData(ICQUser* licqUser, QObject* parent);
+  ContactUserData(const ICQUser* licqUser, QObject* parent);
 
   /**
@@ -73 +73 @@
    * @param licqUser Licq user to read information from
    */
-  void updateAll(ICQUser* licqUser);
+  void updateAll(const ICQUser* licqUser);
 
   /**
@@ -168 +168 @@
    * Signal emitted when the user group memberships (may) have changed
    */
-  void updateUserGroups(ContactUserData* user, ICQUser* licqUser);
+  void updateUserGroups(ContactUserData* user, const ICQUser* licqUser);
 
 private:
@@ -192 +192 @@
    * @return True if any data was actually changed
    */
-  bool updateText(ICQUser* licqUser);
+  bool updateText(const ICQUser* licqUser);
 
   /**