Changeset 6151 for trunk/qt4-gui/src/views

Timestamp:

04/15/08 03:53:20 (8 months ago)

Author:

flynd

Message:

No need to pass user menu pointer to views as it can be accessed through LicqGui::instance anyway.

Location:

trunk/qt4-gui/src/views

Files:

• floatyview.cpp (modified) (1 diff)
• floatyview.h (modified) (1 diff)
• mmuserview.cpp (modified) (1 diff)
• userview.cpp (modified) (2 diffs)
• userview.h (modified) (2 diffs)
• userviewbase.cpp (modified) (3 diffs)
• userviewbase.h (modified) (4 diffs)

trunk/qt4-gui/src/views/floatyview.cpp

@@ -39 +39 @@
 UserFloatyList FloatyView::floaties;
 
-FloatyView::FloatyView(ContactListModel* contactList, ICQUser* licqUser, UserMenu* userMenu, QWidget* parent)
-  : UserViewBase(contactList, userMenu, parent),
+FloatyView::FloatyView(ContactListModel* contactList, ICQUser* licqUser,  QWidget* parent)
+  : UserViewBase(contactList, parent),
   myPpid(licqUser->PPID())
 {

trunk/qt4-gui/src/views/floatyview.h

@@ -45 +45 @@
    * @param contactList The contact list instance
    * @param licqUser The daemon contact to create floaty for
-   * @param userMenu User menu instance
    * @param parent Parent object
    */
-  FloatyView(ContactListModel* contactList, ICQUser* licqUser, UserMenu* userMenu, QWidget* parent = 0);
+  FloatyView(ContactListModel* contactList, ICQUser* licqUser, QWidget* parent = 0);
 
   /**

trunk/qt4-gui/src/views/mmuserview.cpp

@@ -50 +50 @@
 
 MMUserView::MMUserView(QString id, unsigned long ppid, ContactListModel* contactList, QWidget* parent)
-  : UserViewBase(contactList, NULL, parent),
+  : UserViewBase(contactList, parent),
     myId(id),
     myPpid(ppid)

trunk/qt4-gui/src/views/userview.cpp

@@ -33 +33 @@
 #include "contactlist/maincontactlistproxy.h"
 
-#include "core/usermenu.h"
-
 using namespace LicqQtGui;
 
-UserView::UserView(ContactListModel* contactList, UserMenu* mnuUser, QWidget* parent)
-  : UserViewBase(contactList, mnuUser, parent)
+UserView::UserView(ContactListModel* contactList, QWidget* parent)
+  : UserViewBase(contactList, parent)
 {
   // Use a proxy model for sorting and filtering
@@ -238 +236 @@
         setExpanded(currentIndex(), !isExpanded(currentIndex()));
       }
-      else if (itemType == ContactListModel::UserItem)
+      else
       {
-        QString id = currentIndex().data(ContactListModel::UserIdRole).toString();
-        unsigned long ppid = currentIndex().data(ContactListModel::PpidRole).toUInt();
-
-        myUserMenu->popup(viewport()->mapToGlobal(QPoint(40, visualRect(currentIndex()).y())), id, ppid);
+        popupMenu(viewport()->mapToGlobal(QPoint(40, visualRect(currentIndex()).y())), currentIndex());
       }
       return;

trunk/qt4-gui/src/views/userview.h

@@ -28 +28 @@
 namespace LicqQtGui
 {
-class UserMenu;
 
 /**
@@ -42 +41 @@
    *
    * @param contactList The contact list instance
-   * @param userMenu User menu instance
    * @param parent Parent object
    */
-  UserView(ContactListModel* contactList, UserMenu* userMenu, QWidget* parent = 0);
+  UserView(ContactListModel* contactList, QWidget* parent = 0);
 
   /**

trunk/qt4-gui/src/views/userviewbase.cpp

@@ -44 +44 @@
 using namespace LicqQtGui;
 
-UserViewBase::UserViewBase(ContactListModel* contactList, UserMenu* mnuUser, QWidget* parent)
+UserViewBase::UserViewBase(ContactListModel* contactList, QWidget* parent)
   : QTreeView(parent),
-    myContactList(contactList),
-    myUserMenu(mnuUser)
+    myContactList(contactList)
 {
   setItemDelegate(new ContactDelegate(this, this));
@@ -124 +123 @@
 void UserViewBase::contextMenuEvent(QContextMenuEvent* event)
 {
-  if (myUserMenu == NULL)
-    return;
-
   QModelIndex clickedItem = indexAt(event->pos());
   if (clickedItem.isValid())
@@ -132 +128 @@
     setCurrentIndex(clickedItem);
 
-    if (static_cast<ContactListModel::ItemType>
-        (clickedItem.data(ContactListModel::ItemTypeRole).toInt()) == ContactListModel::UserItem)
-    {
-      QString id = clickedItem.data(ContactListModel::UserIdRole).toString();
-      unsigned long ppid = clickedItem.data(ContactListModel::PpidRole).toUInt();
-
-      myUserMenu->popup(viewport()->mapToGlobal(event->pos()), id, ppid);
-    }
+    popupMenu(viewport()->mapToGlobal(event->pos()), clickedItem);
+  }
+}
+
+void UserViewBase::popupMenu(QPoint point, QModelIndex item)
+{
+  ContactListModel::ItemType itemType = static_cast<ContactListModel::ItemType>
+    (item.data(ContactListModel::ItemTypeRole).toInt());
+
+  if (itemType == ContactListModel::UserItem)
+  {
+    QString id = item.data(ContactListModel::UserIdRole).toString();
+    unsigned long ppid = item.data(ContactListModel::PpidRole).toUInt();
+
+    LicqGui::instance()->userMenu()->popup(point, id, ppid);
   }
 }

trunk/qt4-gui/src/views/userviewbase.h

@@ -30 +30 @@
 
 class ContactListModel;
-class UserMenu;
 
 /**
@@ -46 +45 @@
    *
    * @param contactList The contact list instance
-   * @param mnuUser User menu instance
    * @param parent Parent object
    */
-  UserViewBase(ContactListModel* contactList, UserMenu* mnuUser, QWidget* parent = 0);
+  UserViewBase(ContactListModel* contactList, QWidget* parent = 0);
 
   /**
@@ -101 +99 @@
 
   /**
+   * Show popup menu for an item
+   *
+   * @param point Coordinate to show menu from
+   * @param item Index to show menu for
+   */
+  void popupMenu(QPoint point, QModelIndex item);
+
+  /**
    * Item is being dragged
    *
@@ -123 +129 @@
   ContactListModel* myContactList;
   QAbstractProxyModel* myListProxy;
-  UserMenu* myUserMenu;
   QPoint myMousePressPos;