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

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

Files:

• usereventcommon.cpp (modified) (3 diffs)
• usereventcommon.h (modified) (1 diff)
• usereventtabdlg.cpp (modified) (5 diffs)
• usereventtabdlg.h (modified) (1 diff)
• usersendchatevent.cpp (modified) (1 diff)
• usersendcommon.cpp (modified) (12 diffs)
• usersendcommon.h (modified) (1 diff)
• usersendcontactevent.cpp (modified) (2 diffs)
• usersendfileevent.cpp (modified) (1 diff)
• usersendmsgevent.cpp (modified) (2 diffs)
• usersendurlevent.cpp (modified) (1 diff)
• userviewevent.cpp (modified) (9 diffs)

trunk/qt4-gui/src/userevents/usereventcommon.cpp

@@ -155 +155 @@
   myTypingTimer = NULL;
 
-  ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
   if (u != NULL)
   {
@@ -283 +283 @@
 }
 
-void UserEventCommon::updateWidgetInfo(ICQUser* u)
+void UserEventCommon::updateWidgetInfo(const ICQUser* u)
 {
   QTextCodec* codec = UserCodec::codecForICQUser(u);
@@ -467 +467 @@
   }
 
-  ICQUser* u = gUserManager.FetchUser(sig->Id(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(sig->Id(), myPpid, LOCK_R);
   if (u == NULL)
     return;

trunk/qt4-gui/src/userevents/usereventcommon.h

@@ -98 +98 @@
 
   void flashTaskbar();
-  void updateWidgetInfo(ICQUser* u);
+  void updateWidgetInfo(const ICQUser* u);
   void pushToolTip(QAction* action, QString tooltip);
 

trunk/qt4-gui/src/userevents/usereventtabdlg.cpp

@@ -75 +75 @@
 void UserEventTabDlg::addTab(UserEventCommon* tab, int index)
 {
-  ICQUser* u = gUserManager.FetchUser(tab->id().toLatin1(), tab->ppid(), LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(tab->id().toLatin1(), tab->ppid(), LOCK_R);
   if (u == NULL)
     return;
@@ -115 +115 @@
   for (it = users.begin(); it != users.end(); ++it)
   {
-    ICQUser* u = gUserManager.FetchUser((*it).c_str(), tab->ppid(), LOCK_R);
+    const ICQUser* u = gUserManager.FetchUser((*it).c_str(), tab->ppid(), LOCK_R);
 
     if (!newLabel.isEmpty())
@@ -132 +132 @@
 }
 
-void UserEventTabDlg::updateTabLabel(ICQUser* u)
+void UserEventTabDlg::updateTabLabel(const ICQUser* u)
 {
   if (u == NULL)
@@ -147 +147 @@
 }
 
-void UserEventTabDlg::updateTabLabel(UserEventCommon* tab, ICQUser* u)
+void UserEventTabDlg::updateTabLabel(UserEventCommon* tab, const ICQUser* u)
 {
   if (tab == NULL)
@@ -215 +215 @@
 }
 
-void UserEventTabDlg::setTyping(ICQUser* u, int convoId)
+void UserEventTabDlg::setTyping(const ICQUser* u, int convoId)
 {
   for (int index = 0; index < myTabs->count(); index++)

trunk/qt4-gui/src/userevents/usereventtabdlg.h

@@ -47 +47 @@
   bool tabExists(QWidget* tab);
   void updateConvoLabel(UserEventCommon* tab);
-  void updateTabLabel(ICQUser* u);
-  void updateTabLabel(UserEventCommon* tab, ICQUser* u = NULL);
-  void setTyping(ICQUser* u, int convoId);
+  void updateTabLabel(const ICQUser* u);
+  void updateTabLabel(UserEventCommon* tab, const ICQUser* u = NULL);
+  void setTyping(const ICQUser* u, int convoId);
 
 #ifdef USE_KDE

trunk/qt4-gui/src/userevents/usersendchatevent.cpp

@@ -92 +92 @@
   if (!e->ExtendedAck() || !e->ExtendedAck()->Accepted())
   {
-    ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
+    const ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
     QString s = !e->ExtendedAck() ?
       tr("No reason provided") :

trunk/qt4-gui/src/userevents/usersendcommon.cpp

@@ -91 +91 @@
 const size_t SHOW_RECENT_NUM = 5;
 
-typedef pair<CUserEvent*, char*> messagePair;
+typedef pair<const CUserEvent*, char*> messagePair;
 
 bool orderMessagePairs(const messagePair& mp1, const messagePair& mp2)
@@ -166 +166 @@
   bool canSendDirect = (mySendFuncs & PP_SEND_DIRECT);
 
-  ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
 
   if (u != NULL)
@@ -313 +313 @@
       for (unsigned short i = 0; i < u->NewMessages(); i++)
       {
-        CUserEvent* e = u->EventPeek(i);
+        const CUserEvent* e = u->EventPeek(i);
         // Get the convo id now
         unsigned long convoId = e->ConvoId();
@@ -498 +498 @@
 }
 
-void UserSendCommon::updatePicture(ICQUser* u)
+void UserSendCommon::updatePicture(const ICQUser* u)
 {
   bool fetched = false;
@@ -581 +581 @@
   if (Config::Chat::instance()->msgChatView())
   {
-    ICQUser* u = gUserManager.FetchUser(id.toLatin1(), myPpid, LOCK_R);
+    const ICQUser* u = gUserManager.FetchUser(id.toLatin1(), myPpid, LOCK_R);
     QString userName;
     if (u != 0)
@@ -618 +618 @@
   if (Config::Chat::instance()->msgChatView())
   {
-    ICQUser* u = gUserManager.FetchUser(id.toLatin1(), myPpid, LOCK_R);
+    ICQUser* u = gUserManager.FetchUser(id.toLatin1(), myPpid, LOCK_W);
     QString userName;
     if (u != 0)
@@ -760 +760 @@
     case ICQ_CMDxSUB_MSG:
     {
-      ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
+      const ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
       bool userOffline = true;
       if (u != 0)
@@ -918 +918 @@
 void UserSendCommon::userUpdated(CICQSignal* sig, QString id, unsigned long ppid)
 {
-  ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
+  ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_W);
 
   if (u == NULL)
@@ -943 +943 @@
     case USER_EVENTS:
     {
-      CUserEvent* e = u->EventPeekId(sig->Argument());
+      const CUserEvent* e = u->EventPeekId(sig->Argument());
 
       if (e != NULL && myHighestEventId < sig->Argument() &&
@@ -981 +981 @@
 bool UserSendCommon::checkSecure()
 {
-  ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
 
   if (u == NULL)
@@ -998 +998 @@
     else
     {
-      ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
+      ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_W);
       if (u != NULL)
       {
@@ -1463 +1463 @@
 void UserSendCommon::sendTrySecure()
 {
-  ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
 
   bool autoSecure = false;

trunk/qt4-gui/src/userevents/usersendcommon.h

@@ -95 +95 @@
   void retrySend(ICQEvent* e, bool online, unsigned short level);
   virtual void userUpdated(CICQSignal* sig, QString id = QString::null, unsigned long ppid = 0);
-  void updatePicture(ICQUser* u = NULL);
+  void updatePicture(const ICQUser* u = NULL);
   bool checkSecure();
 

trunk/qt4-gui/src/userevents/usersendcontactevent.cpp

@@ -91 +91 @@
 void UserSendContactEvent::setContact(QString id, unsigned long ppid)
 {
-  ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
 
   if (u != NULL)
@@ -106 +106 @@
 
   bool showAwayDlg = false;
-  ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
   if (u != NULL)
   {

trunk/qt4-gui/src/userevents/usersendfileevent.cpp

@@ -124 +124 @@
   if (!e->ExtendedAck() || !e->ExtendedAck()->Accepted())
   {
-    ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
+    const ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
     QString s = !e->ExtendedAck() ?
       tr("No reason provided") :

trunk/qt4-gui/src/userevents/usersendmsgevent.cpp

@@ -76 +76 @@
 
   bool showAwayDlg = false;
-  ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
   if (u != NULL)
   {
@@ -127 +127 @@
     return;
 
-  ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
   bool userOffline = true;
   if (u != NULL)

trunk/qt4-gui/src/userevents/usersendurlevent.cpp

@@ -112 +112 @@
 
   bool showAwayDlg = false;
-  ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
   if (u != NULL)
   {

trunk/qt4-gui/src/userevents/userviewevent.cpp

@@ -144 +144 @@
   setTabOrder(myReadNextButton, myCloseButton);
 
-  ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
   if (u != NULL && u->NewMessages() > 0)
   {
@@ -169 +169 @@
     for (i++; i < u->NewMessages(); i++)
     {
-      CUserEvent* event = u->EventPeek(i);
+      const CUserEvent* event = u->EventPeek(i);
       if (!Config::Chat::instance()->msgChatView() ||
           (event->SubCommand() != ICQ_CMDxSUB_MSG &&
@@ -261 +261 @@
 void UserViewEvent::userUpdated(CICQSignal* sig, QString id, unsigned long ppid)
 {
-  ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
 
   if (u == 0)
@@ -271 +271 @@
     {
       int eventId = sig->Argument();
-      CUserEvent* e = u->EventPeekId(eventId);
+      const CUserEvent* e = u->EventPeekId(eventId);
       // Making sure we didn't handle this message already.
       if (e != NULL && myHighestEventId < eventId &&
@@ -296 +296 @@
     return;
 
-  ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
 
   bool doclose = false;
@@ -597 +597 @@
 #undef GETINFO
 
-      ICQUser* u = gUserManager.FetchUser(id, ppid, LOCK_R);
+      const ICQUser* u = gUserManager.FetchUser(id, ppid, LOCK_R);
       if (u == NULL)
         gLicqDaemon->AddUserToList(id, ppid, false, true);
@@ -737 +737 @@
         myRead2Button->setText(tr("&Refuse"));
         CEventAuthRequest* pAuthReq = dynamic_cast<CEventAuthRequest*>(m);
-        ICQUser* u = gUserManager.FetchUser(pAuthReq->IdString(), pAuthReq->PPID(), LOCK_R);
+        const ICQUser* u = gUserManager.FetchUser(pAuthReq->IdString(), pAuthReq->PPID(), LOCK_R);
         if (u == NULL)
           myRead3Button->setText(tr("A&dd User"));
@@ -749 +749 @@
       {
         CEventAuthGranted* pAuth = dynamic_cast<CEventAuthGranted*>(m);
-        ICQUser* u = gUserManager.FetchUser(pAuth->IdString(), pAuth->PPID(), LOCK_R);
+        const ICQUser* u = gUserManager.FetchUser(pAuth->IdString(), pAuth->PPID(), LOCK_R);
         if (u == NULL)
           myRead1Button->setText(tr("A&dd User"));
@@ -761 +761 @@
       {
         CEventAdded* pAdd = dynamic_cast<CEventAdded*>(m);
-        ICQUser* u = gUserManager.FetchUser(pAdd->IdString(), pAdd->PPID(), LOCK_R);
+        const ICQUser* u = gUserManager.FetchUser(pAdd->IdString(), pAdd->PPID(), LOCK_R);
         if (u == NULL)
           myRead1Button->setText(tr("A&dd User"));