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

Timestamp:

05/06/08 04:50:29 (7 months ago)

Author:

flynd

Message:

Moved eventSent signal from mainwin to licqgui.

Location:

trunk/qt4-gui/src/userevents

Files:

• usersendcommon.cpp (modified) (2 diffs)
• usersendcommon.h (modified) (1 diff)
• userviewevent.cpp (modified) (5 diffs)
• userviewevent.h (modified) (1 diff)

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

@@ -404 +404 @@
     gUserManager.DropUser(u);
 
-    connect(gMainWindow, SIGNAL(signal_sentevent(ICQEvent*)),
-        myHistoryView, SLOT(addMsg(ICQEvent*)));
+    connect(LicqGui::instance(), SIGNAL(eventSent(const ICQEvent*)),
+        myHistoryView, SLOT(addMsg(const ICQEvent*)));
     //myViewSplitter->setResizeMode(myHistoryView, QSplitter::FollowSizeHint);
   }
@@ -1200 +1200 @@
     if (sendDone(e))
     {
-      emit gMainWindow->signal_sentevent(e);
+      emit eventSent(e);
       if (Config::Chat::instance()->msgChatView() && myHistoryView != NULL)
       {

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

@@ -61 +61 @@
   void updateUser(CICQSignal* sig);
   void msgTypeChanged(UserSendCommon* from, UserSendCommon* to);
+
+  /**
+   * Since daemon doesn't notify us when an event is sent we'll have to handle
+   * it ourselfs. This signal is sent to notify other windows about the event
+   * that was sent.
+   *
+   * @param event Event object that was sent
+   */
+  void eventSent(const ICQEvent* event);
 
 public slots:

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

@@ -23 +23 @@
 #include "config.h"
 
+#include <QAction>
 #include <QApplication>
 #include <QCheckBox>
@@ -48 +49 @@
 #include "core/gui-defines.h"
 #include "core/licqgui.h"
-#include "core/mainwin.h"
 #include "core/messagebox.h"
 #include "core/signalmanager.h"
@@ -90 +90 @@
   connect(myMessageList, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
       SLOT(printMessage(QTreeWidgetItem*)));
-  connect(gMainWindow, SIGNAL(signal_sentevent(ICQEvent*)),
-      SLOT(sentEvent(ICQEvent*)));
+  connect(LicqGui::instance(), SIGNAL(eventSent(const ICQEvent*)),
+      SLOT(sentEvent(const ICQEvent*)));
 
   myActionsBox = new QGroupBox();
@@ -779 +779 @@
 }
 
-void UserViewEvent::sentEvent(ICQEvent* e)
+void UserViewEvent::sentEvent(const ICQEvent* e)
 {
   if (e->PPID() != myPpid || strcmp(myUsers.front().c_str(), e->Id()) != 0)
@@ -785 +785 @@
 
   if (!Config::Chat::instance()->msgChatView())
-    new MessageListItem(e->GrabUserEvent(), myCodec, myMessageList);
+    new MessageListItem(e->UserEvent(), myCodec, myMessageList);
 }
 

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

@@ -82 +82 @@
   void msgTypeChanged(UserSendCommon* from, UserSendCommon* to);
   void printMessage(QTreeWidgetItem* item);
-  void sentEvent(ICQEvent* e);
+  void sentEvent(const ICQEvent* e);
   void setEncoding();
 };