author | skyhusker <skyhusker> | 2005-02-02 13:40:47 (UTC) |
---|---|---|
committer | skyhusker <skyhusker> | 2005-02-02 13:40:47 (UTC) |
commit | 1a5dc271114432e0e598af499c076bfbf69ff972 (patch) (unidiff) | |
tree | f7f9b272949c51f818fbcfe4009f745c6a42fca5 /noncore/net | |
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 | |||
@@ -13,9 +13,9 @@ bool IRCServerTab::containsPing( const QString& text, IRCServerTab* tab ) { | |||
13 | 13 | ||
14 | 14 | ||
15 | IRCServerTab::IRCServerTab(IRCServer server, MainWindow *mainWindow, QWidget *parent, const char *name, WFlags f) : IRCTab(parent, name, f) { | 15 | IRCServerTab::IRCServerTab(IRCServer server, MainWindow *mainWindow, QWidget *parent, const char *name, WFlags f) : IRCTab(parent, name, f) { |
16 | m_server = server; | 16 | m_server = server; |
17 | m_session = new IRCSession(&m_server); | 17 | m_session = new IRCSession(this, &m_server); |
18 | m_mainWindow = mainWindow; | 18 | m_mainWindow = mainWindow; |
19 | m_close = FALSE; | 19 | m_close = FALSE; |
20 | m_lines = 0; | 20 | m_lines = 0; |
21 | m_description->setText(tr("Connecting to")+" <b>" + server.hostname() + ":" + QString::number(server.port()) + "</b>"); | 21 | m_description->setText(tr("Connecting to")+" <b>" + server.hostname() + ":" + QString::number(server.port()) + "</b>"); |
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 | |||
@@ -3,12 +3,13 @@ | |||
3 | #include "ircmessageparser.h" | 3 | #include "ircmessageparser.h" |
4 | #include "ircchannelperson.h" | 4 | #include "ircchannelperson.h" |
5 | #include "ircversion.h" | 5 | #include "ircversion.h" |
6 | 6 | ||
7 | IRCSession::IRCSession(IRCServer *server) { | 7 | IRCSession::IRCSession(QWidget *parent, IRCServer *server) { |
8 | m_server = server; | 8 | m_server = server; |
9 | m_connection = new IRCConnection(m_server); | 9 | m_connection = new IRCConnection(m_server); |
10 | m_parser = new IRCMessageParser(this); | 10 | m_parser = new IRCMessageParser(this); |
11 | m_parent = parent; | ||
11 | connect(m_connection, SIGNAL(messageArrived(IRCMessage*)), this, SLOT(handleMessage(IRCMessage*))); | 12 | connect(m_connection, SIGNAL(messageArrived(IRCMessage*)), this, SLOT(handleMessage(IRCMessage*))); |
12 | connect(m_parser, SIGNAL(outputReady(IRCOutput)), this, SIGNAL(outputReady(IRCOutput))); | 13 | connect(m_parser, SIGNAL(outputReady(IRCOutput)), this, SIGNAL(outputReady(IRCOutput))); |
13 | connect(m_connection, SIGNAL(outputReady(IRCOutput)), this, SIGNAL(outputReady(IRCOutput))); | 14 | connect(m_connection, SIGNAL(outputReady(IRCOutput)), this, SIGNAL(outputReady(IRCOutput))); |
14 | } | 15 | } |
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 | |||
@@ -38,9 +38,9 @@ class IRCMessageParser; | |||
38 | class IRCSession : public QObject { | 38 | class IRCSession : public QObject { |
39 | friend class IRCMessageParser; | 39 | friend class IRCMessageParser; |
40 | Q_OBJECT | 40 | Q_OBJECT |
41 | public: | 41 | public: |
42 | IRCSession(IRCServer *server); | 42 | IRCSession(QWidget *parent, IRCServer *server); |
43 | ~IRCSession(); | 43 | ~IRCSession(); |
44 | 44 | ||
45 | void join(QString channel); | 45 | void join(QString channel); |
46 | void quit(QString message); | 46 | void quit(QString message); |
@@ -89,7 +89,8 @@ protected: | |||
89 | QList<IRCChannel> m_channels; | 89 | QList<IRCChannel> m_channels; |
90 | QList<IRCPerson> m_people; | 90 | QList<IRCPerson> m_people; |
91 | QString m_validUsermodes; | 91 | QString m_validUsermodes; |
92 | QString m_validChannelmodes; | 92 | QString m_validChannelmodes; |
93 | QWidget *m_parent; | ||
93 | }; | 94 | }; |
94 | 95 | ||
95 | #endif /* __IRCSESSION_H */ | 96 | #endif /* __IRCSESSION_H */ |