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

Timestamp:

03/15/08 06:59:03 (9 months ago)

Author:

flynd

Message:

Now that LicqGui::showEventDialog changes existing event dialogs to requested message type we don't need this code in userviewbase anymore.

Files:

• trunk/qt4-gui/src/views/userviewbase.cpp (modified) (5 diffs)

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

@@ -44 +44 @@
 using namespace LicqQtGui;
 
-/**
- * Get a pointer to a dialog for sending events with the given @a type, to the contact
- * @a id over the protocol @a ppid. If the dialog is already open, the dialog is
- * converted to the correct type before being returned.
- *
- * @returns a pointer to a send event dialog of type @a T, or NULL on error.
- */
-template<typename T>
-static T* getSendEventDialog(EventType type, QString id, unsigned long ppid)
-{
-  UserEventCommon* common = LicqGui::instance()->showEventDialog(type, id, ppid);
-  if (!common)
-    return NULL;
-
-  T* dialog = dynamic_cast<T*>(common);
-  if (!dialog)
-  {
-    UserSendCommon* base = dynamic_cast<UserSendCommon*>(common);
-    if (!base)
-      return NULL;
-
-    base->changeEventType(type);
-    dialog = dynamic_cast<T*>(LicqGui::instance()->showEventDialog(type, id, ppid));
-    if (!dialog)
-      return NULL;
-  }
-
-  return dialog;
-}
-
-/// Convenient, wrapper functions for getSendEventDialog.
-static inline UserSendContactEvent* getSendContactEventDialog(QString id, unsigned long ppid)
-{
-  return getSendEventDialog<UserSendContactEvent>(ContactEvent, id, ppid);
-}
-
-static inline UserSendFileEvent* getSendFileEventDialog(QString id, unsigned long ppid)
-{
-  return getSendEventDialog<UserSendFileEvent>(FileEvent, id, ppid);
-}
-
-static inline UserSendMsgEvent* getSendMsgEventDialog(QString id, unsigned long ppid)
-{
-  return getSendEventDialog<UserSendMsgEvent>(MessageEvent, id, ppid);
-}
-
-static inline UserSendUrlEvent* getSendUrlEventDialog(QString id, unsigned long ppid)
-{
-  return getSendEventDialog<UserSendUrlEvent>(UrlEvent, id, ppid);
-}
-
 UserViewBase::UserViewBase(ContactListModel* contactList, UserMenu* mnuUser, QWidget* parent)
   : QTreeView(parent),
@@ -229 +178 @@
         if (!(text = firstUrl.toLocalFile()).isEmpty())
         {
-          UserSendFileEvent* sendFile = getSendFileEventDialog(id, ppid);
+          UserSendFileEvent* sendFile = dynamic_cast<UserSendFileEvent*>(
+              LicqGui::instance()->showEventDialog(FileEvent, id, ppid));
           if (!sendFile)
             return;
@@ -246 +196 @@
         else
         {
-          UserSendUrlEvent* sendUrl = getSendUrlEventDialog(id, ppid);
+          UserSendUrlEvent* sendUrl = dynamic_cast<UserSendUrlEvent*>(
+              LicqGui::instance()->showEventDialog(UrlEvent, id, ppid));
           if (!sendUrl)
             return;
@@ -275 +226 @@
             return;
 
-          UserSendContactEvent* sendContact = getSendContactEventDialog(id, ppid);
+          UserSendContactEvent* sendContact = dynamic_cast<UserSendContactEvent*>(
+              LicqGui::instance()->showEventDialog(ContactEvent, id, ppid));
           if (!sendContact)
             return;
@@ -284 +236 @@
         else
         {
-          UserSendMsgEvent* sendMsg = getSendMsgEventDialog(id, ppid);
+          UserSendMsgEvent* sendMsg = dynamic_cast<UserSendMsgEvent*>(
+              LicqGui::instance()->showEventDialog(MessageEvent, id, ppid));
           if (!sendMsg)
             return;