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

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

Files:

• licqstrings.cpp (modified) (2 diffs)
• licqstrings.h (modified) (1 diff)
• usercodec.cpp (modified) (2 diffs)
• usercodec.h (modified) (1 diff)

trunk/qt4-gui/src/helpers/licqstrings.cpp

@@ -56 +56 @@
 }
 
-QString LicqStrings::getStatus(ICQUser* user, bool useInvisible)
+QString LicqStrings::getStatus(const ICQUser* user, bool useInvisible)
 {
   if (user == NULL)
@@ -93 +93 @@
 }
 
-QString LicqStrings::getShortStatus(ICQUser* user, bool useInvisible)
+QString LicqStrings::getShortStatus(const ICQUser* user, bool useInvisible)
 {
   if (user == NULL)

trunk/qt4-gui/src/helpers/licqstrings.h

@@ -32 +32 @@
 public:
   static QString getStatus(unsigned short status, bool invisible);
-  static QString getStatus(ICQUser* user, bool useInvisible = true);
+  static QString getStatus(const ICQUser* user, bool useInvisible = true);
 
   static QString getShortStatus(unsigned short status, bool invisible);
-  static QString getShortStatus(ICQUser* user, bool useInvisible = true);
+  static QString getShortStatus(const ICQUser* user, bool useInvisible = true);
 
   static QString getSystemGroupName(unsigned long group);

trunk/qt4-gui/src/helpers/usercodec.cpp

@@ -91 +91 @@
 }
 
-QTextCodec* UserCodec::codecForICQUser(ICQUser* u)
+QTextCodec* UserCodec::codecForICQUser(const ICQUser* u)
 {
-  char* preferred_encoding = u->UserEncoding();
+  const char* preferred_encoding = u->UserEncoding();
 
   if (preferred_encoding && *preferred_encoding)
@@ -110 +110 @@
   QTextCodec* codec = defaultEncoding();
 
-  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/helpers/usercodec.h

@@ -47 +47 @@
   static QTextCodec* defaultEncoding();
   // Retrieves the codec for an ICQUser object
-  static QTextCodec* codecForICQUser(ICQUser* u);
+  static QTextCodec* codecForICQUser(const ICQUser* u);
   // Retrieves the codec for an CChatUser object
   static QTextCodec* codecForCChatUser(CChatUser* u);