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

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

Files:

• licqgui.cpp (modified) (2 diffs)
• licqgui.h (modified) (2 diffs)
• mainwin.h (modified) (2 diffs)

trunk/qt4-gui/src/core/licqgui.cpp

@@ -994 +994 @@
   }
 
+  // Since daemon doesn't notify us when an event is sent we need to take care of it ourselfs
+  // Get signals from event dialog and forward it to anyone who needs it
+  connect(e, SIGNAL(eventSent(const ICQEvent*)), SIGNAL(eventSent(const ICQEvent*)));
+
   // there might be more than one send window open
   // make sure we only remember one, or it will get complicated
@@ -1007 +1011 @@
     disconnect(oldDialog, SIGNAL(finished(QString, unsigned long)), this, SLOT(sendEventFinished(QString, unsigned long)));
     sendEventFinished(id, ppid);
+  connect(newDialog, SIGNAL(eventSent(const ICQEvent*)), SIGNAL(eventSent(const ICQEvent*)));
     connect(newDialog, SIGNAL(finished(QString, unsigned long)), SLOT(sendEventFinished(QString, unsigned long)));
     myUserSendList.append(newDialog);

trunk/qt4-gui/src/core/licqgui.h

@@ -37 +37 @@
 class CICQDaemon;
 class CICQSignal;
+class ICQEvent;
 
 namespace LicqQtGui
@@ -230 +231 @@
   void sendChatRequest(QString id, unsigned long ppid);
 
+signals:
+  /**
+   * Since daemon doesn't notify us when an event is sent we'll have to handle
+   * it ourselfs. This is used by event dialog to notify other dialogs when a
+   * message has been sent.
+   *
+   * @param event Event object that was sent
+   */
+  void eventSent(const ICQEvent* event);
+
 private slots:
 #ifdef Q_WS_X11

trunk/qt4-gui/src/core/mainwin.h

@@ -97 +97 @@
   virtual void closeEvent(QCloseEvent*);
 
-signals:
-  void signal_sentevent(ICQEvent* e);
-
 public slots:
   void slot_shutdown();
@@ -159 +156 @@
   void callUserFunction(QAction* action);
   void checkUserAutoResponse();
-
-  friend class UserSendCommon;
 };