-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 ) { | |||
11 | (text.find("ping") != -1 && text.find( tab->server()->nick() != -1)); | 11 | (text.find("ping") != -1 && text.find( tab->server()->nick() != -1)); |
12 | } | 12 | } |
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>"); |
22 | m_textview = new QTextView(this); | 22 | m_textview = new QTextView(this); |
23 | m_textview->setHScrollBarMode(QScrollView::AlwaysOff); | 23 | 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 @@ | |||
1 | 1 | ||
2 | #include "ircsession.h" | 2 | #include "ircsession.h" |
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 | } |
15 | 16 | ||
16 | IRCSession::~IRCSession() { | 17 | 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; | |||
36 | IRC server connections from within the same program */ | 36 | IRC server connections from within the same program */ |
37 | 37 | ||
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); |
47 | void quit(); | 47 | void quit(); |
48 | void raw(QString message); | 48 | void raw(QString message); |
@@ -87,9 +87,10 @@ protected: | |||
87 | IRCConnection *m_connection; | 87 | IRCConnection *m_connection; |
88 | IRCMessageParser *m_parser; | 88 | IRCMessageParser *m_parser; |
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 */ |