projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finished logical separation of core and GUI. Monolithic build should work as expected.
[quassel.git]
/
gui
/
channelwidget.cpp
diff --git
a/gui/channelwidget.cpp
b/gui/channelwidget.cpp
index
71a4075
..
7ff4537
100644
(file)
--- a/
gui/channelwidget.cpp
+++ b/
gui/channelwidget.cpp
@@
-41,14
+41,16
@@
ChannelWidget::ChannelWidget(QWidget *parent) : QWidget(parent) {
*/
//connect(&core, SIGNAL(outputLine( const QString& )), ui.textBrowser, SLOT(insertPlainText(const QString &)));
//connect(ui.lineEdit, SIGNAL(
*/
//connect(&core, SIGNAL(outputLine( const QString& )), ui.textBrowser, SLOT(insertPlainText(const QString &)));
//connect(ui.lineEdit, SIGNAL(
- connect(&core, SIGNAL(outputLine( const QString& )), this, SLOT(lineReceived(const QString &)));
+
//
connect(&core, SIGNAL(outputLine( const QString& )), this, SLOT(lineReceived(const QString &)));
connect(ui.lineEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed()));
connect(ui.lineEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed()));
- connect(this, SIGNAL(inputLine( const QString& )), &core, SLOT(inputLine( const QString& )));
+
//
connect(this, SIGNAL(inputLine( const QString& )), &core, SLOT(inputLine( const QString& )));
connect(this, SIGNAL(inputLine(QString)), guiProxy, SLOT(gsUserInput(QString)));
connect(this, SIGNAL(inputLine(QString)), guiProxy, SLOT(gsUserInput(QString)));
+ connect(this, SIGNAL(requestConnect(QString, quint16)), guiProxy, SLOT(gsRequestConnect(QString, quint16)));
+ connect(guiProxy, SIGNAL(csCoreMessage(QString)), this, SLOT(lineReceived(QString)));
-
core.start(
);
-
core.connectToIrc("irc.moep.net
", 6668);
+
//emit requestConnect("irc.scortum.moep.net", 6668
);
+
emit requestConnect("irc.quakenet.org
", 6668);
}
void ChannelWidget::enterPressed() {
}
void ChannelWidget::enterPressed() {