Changeset 6461 for trunk/qt-gui

Timestamp:

07/24/08 03:58:36 (4 months ago)

Author:

flynd

Message:

Fixed some cases where we kept a pointer to the alias string in the daemon user object. Added a few const.

Location:

trunk/qt-gui/src

Files:

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

trunk/qt-gui/src/gpgkeymanager.cpp

@@ -35 +35 @@
 struct luser
 {
-  char *szId;
+  QString szId;
   unsigned long nPPID;
   const char *alias;
@@ -169 +169 @@
   if ( !tmp ) return;
 
-  ICQUser *u = gUserManager.FetchUser(tmp->szId, tmp->nPPID, LOCK_R);
+  ICQUser* u = gUserManager.FetchUser(tmp->szId.latin1(), tmp->nPPID, LOCK_R);
   if ( u )
   {

trunk/qt-gui/src/userbox.cpp

@@ -139 +139 @@
 {
   m_szId = 0;
-  m_szAlias = 0;
   m_nPPID =0;
   m_pIcon = NULL;
@@ -588 +587 @@
       }
     } // isGroupItem
-    else if (m_szAlias                                        // this row contains a user 
+    else if (!m_szAlias.isNull()                          // this row contains a user
              && text(column).ascii()                          // ...+ it is not empty 
-             && strcmp(m_szAlias, text(column).ascii()) == 0  // ...+ this col contains the users alias 
+             && m_szAlias == text(column).ascii()       // ...+ this col contains the users alias
              && gMainWindow->m_bShowExtendedIcons)            // ...+ extended icons are enabled
     {

trunk/qt-gui/src/userbox.h

@@ -97 +97 @@
 
   char *m_szId;
-  char *m_szAlias;
+  QString m_szAlias;
   unsigned long m_nPPID;
   unsigned short m_nStatus;

trunk/qt-gui/src/usercodec.cpp

@@ -94 +94 @@
 QTextCodec* UserCodec::codecForICQUser(ICQUser *u)
 {
-  char *preferred_encoding = u->UserEncoding();
+  const char* preferred_encoding = u->UserEncoding();
 
   if ( preferred_encoding && *preferred_encoding ) {