author | skyhusker <skyhusker> | 2005-02-02 13:40:47 (UTC) |
---|---|---|
committer | skyhusker <skyhusker> | 2005-02-02 13:40:47 (UTC) |
commit | 1a5dc271114432e0e598af499c076bfbf69ff972 (patch) (side-by-side diff) | |
tree | f7f9b272949c51f818fbcfe4009f745c6a42fca5 /noncore | |
parent | 737b0b5ce3e5db15bf11f696b070c9b475f92b61 (diff) | |
download | opie-1a5dc271114432e0e598af499c076bfbf69ff972.zip opie-1a5dc271114432e0e598af499c076bfbf69ff972.tar.gz opie-1a5dc271114432e0e598af499c076bfbf69ff972.tar.bz2 |
Added a pointer to the mainwindow because it's needed by the dcc confirmation dialog
-rw-r--r-- | noncore/net/opieirc/ircservertab.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opieirc/ircsession.cpp | 3 | ||||
-rw-r--r-- | noncore/net/opieirc/ircsession.h | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/noncore/net/opieirc/ircservertab.cpp b/noncore/net/opieirc/ircservertab.cpp index bddc37e..62a06e8 100644 --- a/noncore/net/opieirc/ircservertab.cpp +++ b/noncore/net/opieirc/ircservertab.cpp @@ -11,13 +11,13 @@ bool IRCServerTab::containsPing( const QString& text, IRCServerTab* tab ) { (text.find("ping") != -1 && text.find( tab->server()->nick() != -1)); } IRCServerTab::IRCServerTab(IRCServer server, MainWindow *mainWindow, QWidget *parent, const char *name, WFlags f) : IRCTab(parent, name, f) { m_server = server; - m_session = new IRCSession(&m_server); + m_session = new IRCSession(this, &m_server); m_mainWindow = mainWindow; m_close = FALSE; m_lines = 0; m_description->setText(tr("Connecting to")+" <b>" + server.hostname() + ":" + QString::number(server.port()) + "</b>"); m_textview = new QTextView(this); m_textview->setHScrollBarMode(QScrollView::AlwaysOff); diff --git a/noncore/net/opieirc/ircsession.cpp b/noncore/net/opieirc/ircsession.cpp index 80a327a..fd8ba72 100644 --- a/noncore/net/opieirc/ircsession.cpp +++ b/noncore/net/opieirc/ircsession.cpp @@ -1,16 +1,17 @@ #include "ircsession.h" #include "ircmessageparser.h" #include "ircchannelperson.h" #include "ircversion.h" -IRCSession::IRCSession(IRCServer *server) { +IRCSession::IRCSession(QWidget *parent, IRCServer *server) { m_server = server; m_connection = new IRCConnection(m_server); m_parser = new IRCMessageParser(this); + m_parent = parent; connect(m_connection, SIGNAL(messageArrived(IRCMessage*)), this, SLOT(handleMessage(IRCMessage*))); connect(m_parser, SIGNAL(outputReady(IRCOutput)), this, SIGNAL(outputReady(IRCOutput))); connect(m_connection, SIGNAL(outputReady(IRCOutput)), this, SIGNAL(outputReady(IRCOutput))); } IRCSession::~IRCSession() { diff --git a/noncore/net/opieirc/ircsession.h b/noncore/net/opieirc/ircsession.h index 3859b68..7c91893 100644 --- a/noncore/net/opieirc/ircsession.h +++ b/noncore/net/opieirc/ircsession.h @@ -36,13 +36,13 @@ class IRCMessageParser; IRC server connections from within the same program */ class IRCSession : public QObject { friend class IRCMessageParser; Q_OBJECT public: - IRCSession(IRCServer *server); + IRCSession(QWidget *parent, IRCServer *server); ~IRCSession(); void join(QString channel); void quit(QString message); void quit(); void raw(QString message); @@ -87,9 +87,10 @@ protected: IRCConnection *m_connection; IRCMessageParser *m_parser; QList<IRCChannel> m_channels; QList<IRCPerson> m_people; QString m_validUsermodes; QString m_validChannelmodes; + QWidget *m_parent; }; #endif /* __IRCSESSION_H */ |